WPS updates by Ioannis Koutoulakis

iCatcher/UniCatcher:
- Better drawn bitmaps for iPod5G/Gigabeat
- Better drawn shuffle icon for other colour targets, as well
- Wavpack codec icon now shows "WV" instead of "WVPC"
iCatcher:
- iPod5G/Gigabeat versions now use nimbus-19 font. It's better now and more consistent to other versions that use nimbus font as well


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12191 a1c6a512-1295-4272-9138-f99709370657

107 files changed, 32 insertions, 34 deletions

diff --git a/wps/UniCatcher/ani1-b.bmp b/wps/UniCatcher/ani1-b.bmp
index 8b7984b4c9..913b4856ee 100644
--- a/wps/UniCatcher/ani1-b.bmp
+++ b/wps/UniCatcher/ani1-b.bmp
diff --git a/wps/UniCatcher/ani2-b.bmp b/wps/UniCatcher/ani2-b.bmp
index 6f1b1ae901..102bc20258 100644
--- a/wps/UniCatcher/ani2-b.bmp
+++ b/wps/UniCatcher/ani2-b.bmp
diff --git a/wps/UniCatcher/ani3-b.bmp b/wps/UniCatcher/ani3-b.bmp
index 55f6781a44..a553ce75bb 100644
--- a/wps/UniCatcher/ani3-b.bmp
+++ b/wps/UniCatcher/ani3-b.bmp
diff --git a/wps/UniCatcher/ani4-b.bmp b/wps/UniCatcher/ani4-b.bmp
index 645a9a7db7..c1a539dee5 100644
--- a/wps/UniCatcher/ani4-b.bmp
+++ b/wps/UniCatcher/ani4-b.bmp
diff --git a/wps/UniCatcher/ani5-b.bmp b/wps/UniCatcher/ani5-b.bmp
index 223d646008..39f447beb7 100644
--- a/wps/UniCatcher/ani5-b.bmp
+++ b/wps/UniCatcher/ani5-b.bmp
diff --git a/wps/UniCatcher/ani6-b.bmp b/wps/UniCatcher/ani6-b.bmp
index 1081861f06..26b0295a27 100644
--- a/wps/UniCatcher/ani6-b.bmp
+++ b/wps/UniCatcher/ani6-b.bmp
diff --git a/wps/UniCatcher/ani7-b.bmp b/wps/UniCatcher/ani7-b.bmp
index b7cd0bbe23..cc28e09d8a 100644
--- a/wps/UniCatcher/ani7-b.bmp
+++ b/wps/UniCatcher/ani7-b.bmp
diff --git a/wps/UniCatcher/ani8-b.bmp b/wps/UniCatcher/ani8-b.bmp
index 0ed3d5c579..34bf59f461 100644
--- a/wps/UniCatcher/ani8-b.bmp
+++ b/wps/UniCatcher/ani8-b.bmp
diff --git a/wps/UniCatcher/codec-aac-b.bmp b/wps/UniCatcher/codec-aac-b.bmp
index 6a250916e6..476810b0a5 100644
--- a/wps/UniCatcher/codec-aac-b.bmp
+++ b/wps/UniCatcher/codec-aac-b.bmp
diff --git a/wps/UniCatcher/codec-ac3-b.bmp b/wps/UniCatcher/codec-ac3-b.bmp
index eca2d61b3a..9406fc6cda 100644
--- a/wps/UniCatcher/codec-ac3-b.bmp
+++ b/wps/UniCatcher/codec-ac3-b.bmp
diff --git a/wps/UniCatcher/codec-aiff-b.bmp b/wps/UniCatcher/codec-aiff-b.bmp
index 08a907c2d3..ddc11f8403 100644
--- a/wps/UniCatcher/codec-aiff-b.bmp
+++ b/wps/UniCatcher/codec-aiff-b.bmp
diff --git a/wps/UniCatcher/codec-alac-b.bmp b/wps/UniCatcher/codec-alac-b.bmp
index 58932b6e2e..5bdc6f0501 100644
--- a/wps/UniCatcher/codec-alac-b.bmp
+++ b/wps/UniCatcher/codec-alac-b.bmp
diff --git a/wps/UniCatcher/codec-flac-b.bmp b/wps/UniCatcher/codec-flac-b.bmp
index 22dbda54e5..2d909df56e 100644
--- a/wps/UniCatcher/codec-flac-b.bmp
+++ b/wps/UniCatcher/codec-flac-b.bmp
diff --git a/wps/UniCatcher/codec-mp1-b.bmp b/wps/UniCatcher/codec-mp1-b.bmp
index 40ae3dab3e..05f521d832 100644
--- a/wps/UniCatcher/codec-mp1-b.bmp
+++ b/wps/UniCatcher/codec-mp1-b.bmp
diff --git a/wps/UniCatcher/codec-mp2-b.bmp b/wps/UniCatcher/codec-mp2-b.bmp
index 42d613ecba..94db238441 100644
--- a/wps/UniCatcher/codec-mp2-b.bmp
+++ b/wps/UniCatcher/codec-mp2-b.bmp
diff --git a/wps/UniCatcher/codec-mp3-b.bmp b/wps/UniCatcher/codec-mp3-b.bmp
index 6ce82911ca..e2ebc4f17d 100644
--- a/wps/UniCatcher/codec-mp3-b.bmp
+++ b/wps/UniCatcher/codec-mp3-b.bmp
diff --git a/wps/UniCatcher/codec-mpc-b.bmp b/wps/UniCatcher/codec-mpc-b.bmp
index 881689ef8e..82eddf6dbc 100644
--- a/wps/UniCatcher/codec-mpc-b.bmp
+++ b/wps/UniCatcher/codec-mpc-b.bmp
diff --git a/wps/UniCatcher/codec-ogg-b.bmp b/wps/UniCatcher/codec-ogg-b.bmp
index 57db67a4b3..c8f731ef57 100644
--- a/wps/UniCatcher/codec-ogg-b.bmp
+++ b/wps/UniCatcher/codec-ogg-b.bmp
diff --git a/wps/UniCatcher/codec-shorten-b.bmp b/wps/UniCatcher/codec-shorten-b.bmp
index a435c87764..1ce5cc386f 100644
--- a/wps/UniCatcher/codec-shorten-b.bmp
+++ b/wps/UniCatcher/codec-shorten-b.bmp
diff --git a/wps/UniCatcher/codec-unknown-b.bmp b/wps/UniCatcher/codec-unknown-b.bmp
index 0f028551e0..a1baa50400 100644
--- a/wps/UniCatcher/codec-unknown-b.bmp
+++ b/wps/UniCatcher/codec-unknown-b.bmp
diff --git a/wps/UniCatcher/codec-wav-b.bmp b/wps/UniCatcher/codec-wav-b.bmp
index 7c2e442582..0d9e675967 100644
--- a/wps/UniCatcher/codec-wav-b.bmp
+++ b/wps/UniCatcher/codec-wav-b.bmp
diff --git a/wps/UniCatcher/codec-wavpack-b.bmp b/wps/UniCatcher/codec-wavpack-b.bmp
index 29ca87d78f..515e2150fc 100644
--- a/wps/UniCatcher/codec-wavpack-b.bmp
+++ b/wps/UniCatcher/codec-wavpack-b.bmp
diff --git a/wps/UniCatcher/codec-wavpack-g.bmp b/wps/UniCatcher/codec-wavpack-g.bmp
index 9989d0aa46..ace139f079 100644
--- a/wps/UniCatcher/codec-wavpack-g.bmp
+++ b/wps/UniCatcher/codec-wavpack-g.bmp
diff --git a/wps/UniCatcher/codec-wavpack-sc.bmp b/wps/UniCatcher/codec-wavpack-sc.bmp
new file mode 100644
index 0000000000..96180e48ad
--- /dev/null
+++ b/wps/UniCatcher/codec-wavpack-sc.bmp
diff --git a/wps/UniCatcher/codec-wavpack.bmp b/wps/UniCatcher/codec-wavpack.bmp
index 9d057f62f9..bf20a1a71f 100644
--- a/wps/UniCatcher/codec-wavpack.bmp
+++ b/wps/UniCatcher/codec-wavpack.bmp
diff --git a/wps/UniCatcher/hold0-b.bmp b/wps/UniCatcher/hold0-b.bmp
index bb1700407a..f4663acc4c 100644
--- a/wps/UniCatcher/hold0-b.bmp
+++ b/wps/UniCatcher/hold0-b.bmp
diff --git a/wps/UniCatcher/holdboth-b.bmp b/wps/UniCatcher/holdboth-b.bmp
index b6e56c0335..12c8b536fa 100644
--- a/wps/UniCatcher/holdboth-b.bmp
+++ b/wps/UniCatcher/holdboth-b.bmp
diff --git a/wps/UniCatcher/holdmain-b.bmp b/wps/UniCatcher/holdmain-b.bmp
index 949101abee..7cc056c5cb 100644
--- a/wps/UniCatcher/holdmain-b.bmp
+++ b/wps/UniCatcher/holdmain-b.bmp
diff --git a/wps/UniCatcher/holdremote-b.bmp b/wps/UniCatcher/holdremote-b.bmp
index 65c4d136b2..0364024eee 100644
--- a/wps/UniCatcher/holdremote-b.bmp
+++ b/wps/UniCatcher/holdremote-b.bmp
diff --git a/wps/UniCatcher/pb-fforward-b.bmp b/wps/UniCatcher/pb-fforward-b.bmp
index 07240c04b8..ccddcf2db1 100644
--- a/wps/UniCatcher/pb-fforward-b.bmp
+++ b/wps/UniCatcher/pb-fforward-b.bmp
diff --git a/wps/UniCatcher/pb-pause-b.bmp b/wps/UniCatcher/pb-pause-b.bmp
index 21f94ed24f..2344361229 100644
--- a/wps/UniCatcher/pb-pause-b.bmp
+++ b/wps/UniCatcher/pb-pause-b.bmp
diff --git a/wps/UniCatcher/pb-play-b.bmp b/wps/UniCatcher/pb-play-b.bmp
index eaef902ead..8c1d2f78d3 100644
--- a/wps/UniCatcher/pb-play-b.bmp
+++ b/wps/UniCatcher/pb-play-b.bmp
diff --git a/wps/UniCatcher/pb-rewind-b.bmp b/wps/UniCatcher/pb-rewind-b.bmp
index 6139a6aac8..6c1293b067 100644
--- a/wps/UniCatcher/pb-rewind-b.bmp
+++ b/wps/UniCatcher/pb-rewind-b.bmp
diff --git a/wps/UniCatcher/repeat0-b.bmp b/wps/UniCatcher/repeat0-b.bmp
index 7015c1d103..1914e6a0dc 100644
--- a/wps/UniCatcher/repeat0-b.bmp
+++ b/wps/UniCatcher/repeat0-b.bmp
diff --git a/wps/UniCatcher/repeata-b-b.bmp b/wps/UniCatcher/repeata-b-b.bmp
index 377ad74e1c..d9a5f5a598 100644
--- a/wps/UniCatcher/repeata-b-b.bmp
+++ b/wps/UniCatcher/repeata-b-b.bmp
diff --git a/wps/UniCatcher/repeatall-b.bmp b/wps/UniCatcher/repeatall-b.bmp
index 454991b5ab..c7cb4efdf6 100644
--- a/wps/UniCatcher/repeatall-b.bmp
+++ b/wps/UniCatcher/repeatall-b.bmp
diff --git a/wps/UniCatcher/repeatone-b.bmp b/wps/UniCatcher/repeatone-b.bmp
index 1b06b2328c..09dd2d6f33 100644
--- a/wps/UniCatcher/repeatone-b.bmp
+++ b/wps/UniCatcher/repeatone-b.bmp
diff --git a/wps/UniCatcher/repeatshuffle-b.bmp b/wps/UniCatcher/repeatshuffle-b.bmp
index 3be79ba844..05a24551b4 100644
--- a/wps/UniCatcher/repeatshuffle-b.bmp
+++ b/wps/UniCatcher/repeatshuffle-b.bmp
diff --git a/wps/UniCatcher/shuffle0-b.bmp b/wps/UniCatcher/shuffle0-b.bmp
index e5236ec8ba..f1f7cac88c 100644
--- a/wps/UniCatcher/shuffle0-b.bmp
+++ b/wps/UniCatcher/shuffle0-b.bmp
diff --git a/wps/UniCatcher/shuffle0.bmp b/wps/UniCatcher/shuffle0.bmp
index 4a31c70234..d2493eda50 100644
--- a/wps/UniCatcher/shuffle0.bmp
+++ b/wps/UniCatcher/shuffle0.bmp
diff --git a/wps/UniCatcher/shuffle1-b.bmp b/wps/UniCatcher/shuffle1-b.bmp
index 967407dd9e..765c5e360f 100644
--- a/wps/UniCatcher/shuffle1-b.bmp
+++ b/wps/UniCatcher/shuffle1-b.bmp
diff --git a/wps/UniCatcher/shuffle1.bmp b/wps/UniCatcher/shuffle1.bmp
index f2e1fa19e8..90e6a4f086 100644
--- a/wps/UniCatcher/shuffle1.bmp
+++ b/wps/UniCatcher/shuffle1.bmp
diff --git a/wps/UniCatcher/vol0-b.bmp b/wps/UniCatcher/vol0-b.bmp
index ed3e8db969..5a7834e585 100644
--- a/wps/UniCatcher/vol0-b.bmp
+++ b/wps/UniCatcher/vol0-b.bmp
diff --git a/wps/UniCatcher/vol1-b.bmp b/wps/UniCatcher/vol1-b.bmp
index d3c86fab7f..9a7f044c2f 100644
--- a/wps/UniCatcher/vol1-b.bmp
+++ b/wps/UniCatcher/vol1-b.bmp
diff --git a/wps/UniCatcher/vol2-b.bmp b/wps/UniCatcher/vol2-b.bmp
index b56d4224de..dd317325c9 100644
--- a/wps/UniCatcher/vol2-b.bmp
+++ b/wps/UniCatcher/vol2-b.bmp
diff --git a/wps/UniCatcher/vol3-b.bmp b/wps/UniCatcher/vol3-b.bmp
index e723f4387e..37d542fc31 100644
--- a/wps/UniCatcher/vol3-b.bmp
+++ b/wps/UniCatcher/vol3-b.bmp
diff --git a/wps/UniCatcher/vol4-b.bmp b/wps/UniCatcher/vol4-b.bmp
index 4becfe2bc8..8d8f4dedd7 100644
--- a/wps/UniCatcher/vol4-b.bmp
+++ b/wps/UniCatcher/vol4-b.bmp
diff --git a/wps/UniCatcher/vol5-b.bmp b/wps/UniCatcher/vol5-b.bmp
index e3581cd3d4..d1e4ac9675 100644
--- a/wps/UniCatcher/vol5-b.bmp
+++ b/wps/UniCatcher/vol5-b.bmp
diff --git a/wps/UniCatcher/vol6-b.bmp b/wps/UniCatcher/vol6-b.bmp
index 94ef4a9a70..c77a044ab6 100644
--- a/wps/UniCatcher/vol6-b.bmp
+++ b/wps/UniCatcher/vol6-b.bmp
diff --git a/wps/UniCatcher/vol7-b.bmp b/wps/UniCatcher/vol7-b.bmp
index 6fc4e28fce..d931993da9 100644
--- a/wps/UniCatcher/vol7-b.bmp
+++ b/wps/UniCatcher/vol7-b.bmp
diff --git a/wps/UniCatcher/vol8-b.bmp b/wps/UniCatcher/vol8-b.bmp
index 29c4f3de24..7c91b5f713 100644
--- a/wps/UniCatcher/vol8-b.bmp
+++ b/wps/UniCatcher/vol8-b.bmp
diff --git a/wps/WPSLIST b/wps/WPSLIST
index bac03dea51..b833a41b30 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -142,8 +142,8 @@ Font.160x128x16: nedore-9.fnt
 Font.176x132x16: nedore-9.fnt
 Font.176x220x16: nimbus-12.fnt
 Font.220x176x16: nimbus-14.fnt
-Font.240x320x16: courB14.fnt
-Font.320x240x16: courB14.fnt
+Font.240x320x16: nimbus-19.fnt
+Font.320x240x16: nimbus-19.fnt
 Statusbar: on
 </wps>
 
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
index ab60d5df75..c68e8de920 100644
--- a/wps/iCatcher.240x320x16.wps
+++ b/wps/iCatcher.240x320x16.wps
@@ -3,8 +3,7 @@
 
 
 %t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al  %bl%%%ar%pp/%pe 
-
+%al   %bl%%%ar%pp/%pe 
 
 
 %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
@@ -61,18 +60,18 @@
 %xl|p|ani7-b.bmp|34|5|
 %xl|q|ani8-b.bmp|34|5|
 %t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdj|%xdj|%xdj>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdk|%xdk|%xdk>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdl|%xdl|%xdl>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdm|%xdm|%xdm>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdn|%xdn|%xdn>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdo|%xdo|%xdo>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdp|%xdp|%xdp>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdq|%xdq|%xdq>
-%xl|r|codec-mp1-b.bmp|168|232|
-%xl|s|codec-mp2-b.bmp|168|232|
-%xl|t|codec-mp3-b.bmp|168|232|
-%xl|u|codec-aiff-b.bmp|168|232|
-%xl|v|codec-wav-b.bmp|168|232|
-%xl|w|codec-ogg-b.bmp|168|232|
-%xl|x|codec-flac-b.bmp|168|232|
-%xl|y|codec-mpc-b.bmp|168|232|
-%xl|z|codec-ac3-b.bmp|168|232|
-%xl|V|codec-wavpack-b.bmp|168|232|
-%xl|W|codec-alac-b.bmp|168|232|
-%xl|X|codec-aac-b.bmp|168|232|
-%xl|Y|codec-shorten-b.bmp|168|232|
-%xl|Z|codec-unknown-b.bmp|168|232|
+%xl|r|codec-mp1-b.bmp|168|229|
+%xl|s|codec-mp2-b.bmp|168|229|
+%xl|t|codec-mp3-b.bmp|168|229|
+%xl|u|codec-aiff-b.bmp|168|229|
+%xl|v|codec-wav-b.bmp|168|229|
+%xl|w|codec-ogg-b.bmp|168|229|
+%xl|x|codec-flac-b.bmp|168|229|
+%xl|y|codec-mpc-b.bmp|168|229|
+%xl|z|codec-ac3-b.bmp|168|229|
+%xl|V|codec-wavpack-b.bmp|168|229|
+%xl|W|codec-alac-b.bmp|168|229|
+%xl|X|codec-aac-b.bmp|168|229|
+%xl|Y|codec-shorten-b.bmp|168|229|
+%xl|Z|codec-unknown-b.bmp|168|229|
 %?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
index 387b461a71..30c71adb25 100644
--- a/wps/iCatcher.320x240x16.wps
+++ b/wps/iCatcher.320x240x16.wps
@@ -3,8 +3,7 @@
 
 
 %t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al  %bl%%%ar%pp/%pe 
-
+%al   %bl%%%ar%pp/%pe 
 %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
 %s%ac%?id<%id|%?d1<%d1|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
@@ -57,18 +56,18 @@
 %xl|p|ani7-b.bmp|34|5|
 %xl|q|ani8-b.bmp|34|5|
 %t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdj|%xdj|%xdj>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdk|%xdk|%xdk>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdl|%xdl|%xdl>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdm|%xdm|%xdm>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdn|%xdn|%xdn>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdo|%xdo|%xdo>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdp|%xdp|%xdp>;%t0.1 %?mp<%xda|%?pv<%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdq|%xdq|%xdq>
-%xl|r|codec-mp1-b.bmp|248|160|
-%xl|s|codec-mp2-b.bmp|248|160|
-%xl|t|codec-mp3-b.bmp|248|160|
-%xl|u|codec-aiff-b.bmp|248|160|
-%xl|v|codec-wav-b.bmp|248|160|
-%xl|w|codec-ogg-b.bmp|248|160|
-%xl|x|codec-flac-b.bmp|248|160|
-%xl|y|codec-mpc-b.bmp|248|160|
-%xl|z|codec-ac3-b.bmp|248|160|
-%xl|V|codec-wavpack-b.bmp|248|160|
-%xl|W|codec-alac-b.bmp|248|160|
-%xl|X|codec-aac-b.bmp|248|160|
-%xl|Y|codec-shorten-b.bmp|248|160|
-%xl|Z|codec-unknown-b.bmp|248|160|
+%xl|r|codec-mp1-b.bmp|248|153|
+%xl|s|codec-mp2-b.bmp|248|153|
+%xl|t|codec-mp3-b.bmp|248|153|
+%xl|u|codec-aiff-b.bmp|248|153|
+%xl|v|codec-wav-b.bmp|248|153|
+%xl|w|codec-ogg-b.bmp|248|153|
+%xl|x|codec-flac-b.bmp|248|153|
+%xl|y|codec-mpc-b.bmp|248|153|
+%xl|z|codec-ac3-b.bmp|248|153|
+%xl|V|codec-wavpack-b.bmp|248|153|
+%xl|W|codec-alac-b.bmp|248|153|
+%xl|X|codec-aac-b.bmp|248|153|
+%xl|Y|codec-shorten-b.bmp|248|153|
+%xl|Z|codec-unknown-b.bmp|248|153|
 %?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
diff --git a/wps/iCatcher/ani1-b.bmp b/wps/iCatcher/ani1-b.bmp
index 8b7984b4c9..913b4856ee 100644
--- a/wps/iCatcher/ani1-b.bmp
+++ b/wps/iCatcher/ani1-b.bmp
diff --git a/wps/iCatcher/ani2-b.bmp b/wps/iCatcher/ani2-b.bmp
index 6f1b1ae901..102bc20258 100644
--- a/wps/iCatcher/ani2-b.bmp
+++ b/wps/iCatcher/ani2-b.bmp
diff --git a/wps/iCatcher/ani3-b.bmp b/wps/iCatcher/ani3-b.bmp
index 55f6781a44..a553ce75bb 100644
--- a/wps/iCatcher/ani3-b.bmp
+++ b/wps/iCatcher/ani3-b.bmp
diff --git a/wps/iCatcher/ani4-b.bmp b/wps/iCatcher/ani4-b.bmp
index 645a9a7db7..c1a539dee5 100644
--- a/wps/iCatcher/ani4-b.bmp
+++ b/wps/iCatcher/ani4-b.bmp
diff --git a/wps/iCatcher/ani5-b.bmp b/wps/iCatcher/ani5-b.bmp
index 223d646008..39f447beb7 100644
--- a/wps/iCatcher/ani5-b.bmp
+++ b/wps/iCatcher/ani5-b.bmp
diff --git a/wps/iCatcher/ani6-b.bmp b/wps/iCatcher/ani6-b.bmp
index 1081861f06..26b0295a27 100644
--- a/wps/iCatcher/ani6-b.bmp
+++ b/wps/iCatcher/ani6-b.bmp
diff --git a/wps/iCatcher/ani7-b.bmp b/wps/iCatcher/ani7-b.bmp
index b7cd0bbe23..cc28e09d8a 100644
--- a/wps/iCatcher/ani7-b.bmp
+++ b/wps/iCatcher/ani7-b.bmp
diff --git a/wps/iCatcher/ani8-b.bmp b/wps/iCatcher/ani8-b.bmp
index 0ed3d5c579..34bf59f461 100644
--- a/wps/iCatcher/ani8-b.bmp
+++ b/wps/iCatcher/ani8-b.bmp
diff --git a/wps/iCatcher/bg-240x320x16.bmp b/wps/iCatcher/bg-240x320x16.bmp
index a53acbc2ca..bd1a6241d7 100644
--- a/wps/iCatcher/bg-240x320x16.bmp
+++ b/wps/iCatcher/bg-240x320x16.bmp
diff --git a/wps/iCatcher/bg-320x240x16.bmp b/wps/iCatcher/bg-320x240x16.bmp
index 081487566c..53a37fe1c1 100644
--- a/wps/iCatcher/bg-320x240x16.bmp
+++ b/wps/iCatcher/bg-320x240x16.bmp
diff --git a/wps/iCatcher/codec-aac-b.bmp b/wps/iCatcher/codec-aac-b.bmp
index 6a250916e6..476810b0a5 100644
--- a/wps/iCatcher/codec-aac-b.bmp
+++ b/wps/iCatcher/codec-aac-b.bmp
diff --git a/wps/iCatcher/codec-ac3-b.bmp b/wps/iCatcher/codec-ac3-b.bmp
index eca2d61b3a..9406fc6cda 100644
--- a/wps/iCatcher/codec-ac3-b.bmp
+++ b/wps/iCatcher/codec-ac3-b.bmp
diff --git a/wps/iCatcher/codec-aiff-b.bmp b/wps/iCatcher/codec-aiff-b.bmp
index 08a907c2d3..ddc11f8403 100644
--- a/wps/iCatcher/codec-aiff-b.bmp
+++ b/wps/iCatcher/codec-aiff-b.bmp
diff --git a/wps/iCatcher/codec-alac-b.bmp b/wps/iCatcher/codec-alac-b.bmp
index 58932b6e2e..5bdc6f0501 100644
--- a/wps/iCatcher/codec-alac-b.bmp
+++ b/wps/iCatcher/codec-alac-b.bmp
diff --git a/wps/iCatcher/codec-flac-b.bmp b/wps/iCatcher/codec-flac-b.bmp
index 22dbda54e5..2d909df56e 100644
--- a/wps/iCatcher/codec-flac-b.bmp
+++ b/wps/iCatcher/codec-flac-b.bmp
diff --git a/wps/iCatcher/codec-mp1-b.bmp b/wps/iCatcher/codec-mp1-b.bmp
index 40ae3dab3e..05f521d832 100644
--- a/wps/iCatcher/codec-mp1-b.bmp
+++ b/wps/iCatcher/codec-mp1-b.bmp
diff --git a/wps/iCatcher/codec-mp2-b.bmp b/wps/iCatcher/codec-mp2-b.bmp
index 42d613ecba..94db238441 100644
--- a/wps/iCatcher/codec-mp2-b.bmp
+++ b/wps/iCatcher/codec-mp2-b.bmp
diff --git a/wps/iCatcher/codec-mp3-b.bmp b/wps/iCatcher/codec-mp3-b.bmp
index 6ce82911ca..e2ebc4f17d 100644
--- a/wps/iCatcher/codec-mp3-b.bmp
+++ b/wps/iCatcher/codec-mp3-b.bmp
diff --git a/wps/iCatcher/codec-mpc-b.bmp b/wps/iCatcher/codec-mpc-b.bmp
index 881689ef8e..82eddf6dbc 100644
--- a/wps/iCatcher/codec-mpc-b.bmp
+++ b/wps/iCatcher/codec-mpc-b.bmp
diff --git a/wps/iCatcher/codec-ogg-b.bmp b/wps/iCatcher/codec-ogg-b.bmp
index 57db67a4b3..c8f731ef57 100644
--- a/wps/iCatcher/codec-ogg-b.bmp
+++ b/wps/iCatcher/codec-ogg-b.bmp
diff --git a/wps/iCatcher/codec-shorten-b.bmp b/wps/iCatcher/codec-shorten-b.bmp
index a435c87764..1ce5cc386f 100644
--- a/wps/iCatcher/codec-shorten-b.bmp
+++ b/wps/iCatcher/codec-shorten-b.bmp
diff --git a/wps/iCatcher/codec-unknown-b.bmp b/wps/iCatcher/codec-unknown-b.bmp
index 0f028551e0..a1baa50400 100644
--- a/wps/iCatcher/codec-unknown-b.bmp
+++ b/wps/iCatcher/codec-unknown-b.bmp
diff --git a/wps/iCatcher/codec-wav-b.bmp b/wps/iCatcher/codec-wav-b.bmp
index 7c2e442582..0d9e675967 100644
--- a/wps/iCatcher/codec-wav-b.bmp
+++ b/wps/iCatcher/codec-wav-b.bmp
diff --git a/wps/iCatcher/codec-wavpack-b.bmp b/wps/iCatcher/codec-wavpack-b.bmp
index 29ca87d78f..515e2150fc 100644
--- a/wps/iCatcher/codec-wavpack-b.bmp
+++ b/wps/iCatcher/codec-wavpack-b.bmp
diff --git a/wps/iCatcher/codec-wavpack-g.bmp b/wps/iCatcher/codec-wavpack-g.bmp
index 9989d0aa46..ace139f079 100644
--- a/wps/iCatcher/codec-wavpack-g.bmp
+++ b/wps/iCatcher/codec-wavpack-g.bmp
diff --git a/wps/iCatcher/codec-wavpack-sc.bmp b/wps/iCatcher/codec-wavpack-sc.bmp
index b825e170aa..96180e48ad 100644
--- a/wps/iCatcher/codec-wavpack-sc.bmp
+++ b/wps/iCatcher/codec-wavpack-sc.bmp
diff --git a/wps/iCatcher/codec-wavpack.bmp b/wps/iCatcher/codec-wavpack.bmp
index 9d057f62f9..bf20a1a71f 100644
--- a/wps/iCatcher/codec-wavpack.bmp
+++ b/wps/iCatcher/codec-wavpack.bmp
diff --git a/wps/iCatcher/hold0-b.bmp b/wps/iCatcher/hold0-b.bmp
index bb1700407a..f4663acc4c 100644
--- a/wps/iCatcher/hold0-b.bmp
+++ b/wps/iCatcher/hold0-b.bmp
diff --git a/wps/iCatcher/holdboth-b.bmp b/wps/iCatcher/holdboth-b.bmp
index b6e56c0335..12c8b536fa 100644
--- a/wps/iCatcher/holdboth-b.bmp
+++ b/wps/iCatcher/holdboth-b.bmp
diff --git a/wps/iCatcher/holdmain-b.bmp b/wps/iCatcher/holdmain-b.bmp
index 949101abee..7cc056c5cb 100644
--- a/wps/iCatcher/holdmain-b.bmp
+++ b/wps/iCatcher/holdmain-b.bmp
diff --git a/wps/iCatcher/holdremote-b.bmp b/wps/iCatcher/holdremote-b.bmp
index 65c4d136b2..0364024eee 100644
--- a/wps/iCatcher/holdremote-b.bmp
+++ b/wps/iCatcher/holdremote-b.bmp
diff --git a/wps/iCatcher/pb-fforward-b.bmp b/wps/iCatcher/pb-fforward-b.bmp
index 07240c04b8..ccddcf2db1 100644
--- a/wps/iCatcher/pb-fforward-b.bmp
+++ b/wps/iCatcher/pb-fforward-b.bmp
diff --git a/wps/iCatcher/pb-pause-b.bmp b/wps/iCatcher/pb-pause-b.bmp
index 21f94ed24f..2344361229 100644
--- a/wps/iCatcher/pb-pause-b.bmp
+++ b/wps/iCatcher/pb-pause-b.bmp
diff --git a/wps/iCatcher/pb-play-b.bmp b/wps/iCatcher/pb-play-b.bmp
index eaef902ead..8c1d2f78d3 100644
--- a/wps/iCatcher/pb-play-b.bmp
+++ b/wps/iCatcher/pb-play-b.bmp
diff --git a/wps/iCatcher/pb-rewind-b.bmp b/wps/iCatcher/pb-rewind-b.bmp
index 6139a6aac8..6c1293b067 100644
--- a/wps/iCatcher/pb-rewind-b.bmp
+++ b/wps/iCatcher/pb-rewind-b.bmp
diff --git a/wps/iCatcher/repeat0-b.bmp b/wps/iCatcher/repeat0-b.bmp
index 7015c1d103..1914e6a0dc 100644
--- a/wps/iCatcher/repeat0-b.bmp
+++ b/wps/iCatcher/repeat0-b.bmp
diff --git a/wps/iCatcher/repeata-b-b.bmp b/wps/iCatcher/repeata-b-b.bmp
index 377ad74e1c..d9a5f5a598 100644
--- a/wps/iCatcher/repeata-b-b.bmp
+++ b/wps/iCatcher/repeata-b-b.bmp
diff --git a/wps/iCatcher/repeatall-b.bmp b/wps/iCatcher/repeatall-b.bmp
index 454991b5ab..c7cb4efdf6 100644
--- a/wps/iCatcher/repeatall-b.bmp
+++ b/wps/iCatcher/repeatall-b.bmp
diff --git a/wps/iCatcher/repeatone-b.bmp b/wps/iCatcher/repeatone-b.bmp
index 1b06b2328c..09dd2d6f33 100644
--- a/wps/iCatcher/repeatone-b.bmp
+++ b/wps/iCatcher/repeatone-b.bmp
diff --git a/wps/iCatcher/repeatshuffle-b.bmp b/wps/iCatcher/repeatshuffle-b.bmp
index 3be79ba844..05a24551b4 100644
--- a/wps/iCatcher/repeatshuffle-b.bmp
+++ b/wps/iCatcher/repeatshuffle-b.bmp
diff --git a/wps/iCatcher/shuffle0-b.bmp b/wps/iCatcher/shuffle0-b.bmp
index e5236ec8ba..f1f7cac88c 100644
--- a/wps/iCatcher/shuffle0-b.bmp
+++ b/wps/iCatcher/shuffle0-b.bmp
diff --git a/wps/iCatcher/shuffle0.bmp b/wps/iCatcher/shuffle0.bmp
index 4a31c70234..d2493eda50 100644
--- a/wps/iCatcher/shuffle0.bmp
+++ b/wps/iCatcher/shuffle0.bmp
diff --git a/wps/iCatcher/shuffle1-b.bmp b/wps/iCatcher/shuffle1-b.bmp
index 967407dd9e..765c5e360f 100644
--- a/wps/iCatcher/shuffle1-b.bmp
+++ b/wps/iCatcher/shuffle1-b.bmp
diff --git a/wps/iCatcher/shuffle1.bmp b/wps/iCatcher/shuffle1.bmp
index f2e1fa19e8..90e6a4f086 100644
--- a/wps/iCatcher/shuffle1.bmp
+++ b/wps/iCatcher/shuffle1.bmp
diff --git a/wps/iCatcher/vol0-b.bmp b/wps/iCatcher/vol0-b.bmp
index ed3e8db969..5a7834e585 100644
--- a/wps/iCatcher/vol0-b.bmp
+++ b/wps/iCatcher/vol0-b.bmp
diff --git a/wps/iCatcher/vol1-b.bmp b/wps/iCatcher/vol1-b.bmp
index d3c86fab7f..9a7f044c2f 100644
--- a/wps/iCatcher/vol1-b.bmp
+++ b/wps/iCatcher/vol1-b.bmp
diff --git a/wps/iCatcher/vol2-b.bmp b/wps/iCatcher/vol2-b.bmp
index b56d4224de..dd317325c9 100644
--- a/wps/iCatcher/vol2-b.bmp
+++ b/wps/iCatcher/vol2-b.bmp
diff --git a/wps/iCatcher/vol3-b.bmp b/wps/iCatcher/vol3-b.bmp
index e723f4387e..37d542fc31 100644
--- a/wps/iCatcher/vol3-b.bmp
+++ b/wps/iCatcher/vol3-b.bmp
diff --git a/wps/iCatcher/vol4-b.bmp b/wps/iCatcher/vol4-b.bmp
index 4becfe2bc8..8d8f4dedd7 100644
--- a/wps/iCatcher/vol4-b.bmp
+++ b/wps/iCatcher/vol4-b.bmp
diff --git a/wps/iCatcher/vol5-b.bmp b/wps/iCatcher/vol5-b.bmp
index e3581cd3d4..d1e4ac9675 100644
--- a/wps/iCatcher/vol5-b.bmp
+++ b/wps/iCatcher/vol5-b.bmp
diff --git a/wps/iCatcher/vol6-b.bmp b/wps/iCatcher/vol6-b.bmp
index 94ef4a9a70..c77a044ab6 100644
--- a/wps/iCatcher/vol6-b.bmp
+++ b/wps/iCatcher/vol6-b.bmp
diff --git a/wps/iCatcher/vol7-b.bmp b/wps/iCatcher/vol7-b.bmp
index 6fc4e28fce..d931993da9 100644
--- a/wps/iCatcher/vol7-b.bmp
+++ b/wps/iCatcher/vol7-b.bmp
diff --git a/wps/iCatcher/vol8-b.bmp b/wps/iCatcher/vol8-b.bmp
index 29c4f3de24..7c91b5f713 100644
--- a/wps/iCatcher/vol8-b.bmp
+++ b/wps/iCatcher/vol8-b.bmp