summaryrefslogtreecommitdiffstats
path: root/wps
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2008-04-02 19:03:00 +0000
committerMarianne Arnold <pixelma@rockbox.org>2008-04-02 19:03:00 +0000
commiteb015961e0f9ba906083e967ffaddbe2b7c49c75 (patch)
tree7ad16e0e3b5d15a83e8b7ffe35c9f837a35c9740 /wps
parentb073f0cfc1ebf0d939a6992612f176298b930dac (diff)
downloadrockbox-eb015961e0f9ba906083e967ffaddbe2b7c49c75.tar.gz
rockbox-eb015961e0f9ba906083e967ffaddbe2b7c49c75.tar.bz2
rockbox-eb015961e0f9ba906083e967ffaddbe2b7c49c75.zip
Convert UniCatcher to using bitmap strips (the actual graphics could be reused from iCatcher, including the addition of the missing codec icons). To tidy up some more, the 160x128 greyscale version also uses a backdrop graphic instead of two seperate bitmaps now. Delete some unused bitmaps which either were a copy of the iCatcher directory and accidentally kept or were there in preparation for a port to smaller screens. In case of the latter and someone picks this task up again - those can easily be pulled from an earlier revision and added again. * Reminder: don't forget to delete the 'UniCatcher' directory in '.rockbox/wps' before installing a new build if you want to keep your installation clean.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16933 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'wps')
-rw-r--r--wps/UniCatcher.128x64x1.wps53
-rw-r--r--wps/UniCatcher.128x96x1.wps55
-rw-r--r--wps/UniCatcher.160x128x16.wps73
-rw-r--r--wps/UniCatcher.160x128x2.wps76
-rw-r--r--wps/UniCatcher.176x132x16.wps73
-rw-r--r--wps/UniCatcher.176x220x16.wps73
-rw-r--r--wps/UniCatcher.220x176x16.wps73
-rw-r--r--wps/UniCatcher.240x320x16.wps73
-rw-r--r--wps/UniCatcher.320x240x16.wps73
-rw-r--r--wps/UniCatcher/ani1-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani1-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani1-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani1.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani2-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani2-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani2-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani2.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani3-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani3-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani3-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani3.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani4-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani4-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani4-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani4.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani5-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani5-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani5-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani5.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani6-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani6-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani6-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani6.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani7-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani7-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani7-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani7.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani8-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani8-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani8-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/ani8.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/animation-b.bmpbin0 -> 10806 bytes
-rw-r--r--wps/UniCatcher/animation-g.bmpbin0 -> 1096 bytes
-rw-r--r--wps/UniCatcher/animation-s.bmpbin0 -> 478 bytes
-rw-r--r--wps/UniCatcher/animation.bmpbin0 -> 6198 bytes
-rw-r--r--wps/UniCatcher/bat0-b.bmpbin696 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat0-g.bmpbin174 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat0-s.bmpbin98 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat0.bmpbin390 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat1-b.bmpbin696 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat1-g.bmpbin128 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat1-s.bmpbin98 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat1.bmpbin390 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat2-b.bmpbin696 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat2-g.bmpbin128 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat2-s.bmpbin98 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat2.bmpbin390 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat3-b.bmpbin696 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat3-g.bmpbin128 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat3-s.bmpbin98 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat3.bmpbin390 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat4-b.bmpbin696 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat4-g.bmpbin128 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat4-s.bmpbin98 -> 0 bytes
-rw-r--r--wps/UniCatcher/bat4.bmpbin390 -> 0 bytes
-rw-r--r--wps/UniCatcher/batlevel.bmpbin194 -> 0 bytes
-rw-r--r--wps/UniCatcher/battery-b.bmpbin0 -> 3254 bytes
-rw-r--r--wps/UniCatcher/battery-g.bmpbin0 -> 348 bytes
-rw-r--r--wps/UniCatcher/battery-s.bmpbin0 -> 242 bytes
-rw-r--r--wps/UniCatcher/battery.bmpbin0 -> 1734 bytes
-rw-r--r--wps/UniCatcher/bg-160x128x2-u.bmpbin0 -> 20546 bytes
-rw-r--r--wps/UniCatcher/bottomline-138.bmpbin288 -> 0 bytes
-rw-r--r--wps/UniCatcher/bottomline-160.bmpbin312 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-aac-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-aac-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-aac.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-ac3-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-ac3-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-ac3.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-aiff-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-aiff-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-aiff.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-alac-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-alac-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-alac.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-b.bmpbin0 -> 67086 bytes
-rw-r--r--wps/UniCatcher/codec-flac-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-flac-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-flac.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-g.bmpbin0 -> 5948 bytes
-rw-r--r--wps/UniCatcher/codec-mp1-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp1-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp1.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp2-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp2-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp2.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp3-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp3-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mp3.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mpc-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mpc-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-mpc.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-ogg-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-ogg-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-ogg.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-shorten-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-shorten-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-shorten.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-unknown-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-unknown-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-unknown.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-wav-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-wav-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-wav.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-wavpack-b.bmpbin3246 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-wavpack-g.bmpbin398 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec-wavpack.bmpbin1734 -> 0 bytes
-rw-r--r--wps/UniCatcher/codec.bmpbin0 -> 35334 bytes
-rw-r--r--wps/UniCatcher/hold-b.bmpbin0 -> 6966 bytes
-rw-r--r--wps/UniCatcher/hold-g.bmpbin0 -> 576 bytes
-rw-r--r--wps/UniCatcher/hold-s.bmpbin106 -> 194 bytes
-rw-r--r--wps/UniCatcher/hold.bmpbin0 -> 4086 bytes
-rw-r--r--wps/UniCatcher/hold0-b.bmpbin1782 -> 0 bytes
-rw-r--r--wps/UniCatcher/hold0.bmpbin1062 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdboth-b.bmpbin1782 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdboth-g.bmpbin286 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdboth-s.bmpbin106 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdboth.bmpbin1062 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdmain-b.bmpbin1782 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdmain-g.bmpbin286 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdmain-s.bmpbin106 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdmain.bmpbin1062 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdremote-b.bmpbin1782 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdremote-g.bmpbin286 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdremote-s.bmpbin106 -> 0 bytes
-rw-r--r--wps/UniCatcher/holdremote.bmpbin1062 -> 0 bytes
-rw-r--r--wps/UniCatcher/line1-112.bmpbin94 -> 0 bytes
-rw-r--r--wps/UniCatcher/line2-112.bmpbin94 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-fforward-b.bmpbin838 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-fforward-g.bmpbin152 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-fforward-s.bmpbin94 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-fforward.bmpbin454 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-pause-b.bmpbin838 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-pause-g.bmpbin198 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-pause-s.bmpbin94 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-pause.bmpbin454 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-play-b.bmpbin838 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-play-g.bmpbin198 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-play-s.bmpbin94 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-play.bmpbin454 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-rewind-b.bmpbin838 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-rewind-g.bmpbin198 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-rewind-s.bmpbin94 -> 0 bytes
-rw-r--r--wps/UniCatcher/pb-rewind.bmpbin454 -> 0 bytes
-rw-r--r--wps/UniCatcher/playmode-b.bmpbin0 -> 3190 bytes
-rw-r--r--wps/UniCatcher/playmode-g.bmpbin0 -> 388 bytes
-rw-r--r--wps/UniCatcher/playmode-s.bmpbin0 -> 190 bytes
-rw-r--r--wps/UniCatcher/playmode.bmpbin0 -> 1654 bytes
-rw-r--r--wps/UniCatcher/repeat-b.bmpbin0 -> 5814 bytes
-rw-r--r--wps/UniCatcher/repeat-g.bmpbin0 -> 640 bytes
-rw-r--r--wps/UniCatcher/repeat-s.bmpbin0 -> 238 bytes
-rw-r--r--wps/UniCatcher/repeat.bmpbin0 -> 3414 bytes
-rw-r--r--wps/UniCatcher/repeat0-b.bmpbin1206 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeat0.bmpbin726 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeata-b-b.bmpbin1206 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeata-b-g.bmpbin216 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeata-b-s.bmpbin106 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeata-b.bmpbin726 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatall-b.bmpbin1206 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatall-g.bmpbin216 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatall-s.bmpbin106 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatall.bmpbin726 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatone-b.bmpbin1206 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatone-g.bmpbin216 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatone-s.bmpbin98 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatone.bmpbin726 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatshuffle-b.bmpbin1206 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatshuffle-g.bmpbin216 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatshuffle-s.bmpbin106 -> 0 bytes
-rw-r--r--wps/UniCatcher/repeatshuffle.bmpbin726 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle-b.bmpbin0 -> 2238 bytes
-rw-r--r--wps/UniCatcher/shuffle-g.bmpbin0 -> 312 bytes
-rw-r--r--wps/UniCatcher/shuffle-s.bmpbin0 -> 118 bytes
-rw-r--r--wps/UniCatcher/shuffle.bmpbin0 -> 1334 bytes
-rw-r--r--wps/UniCatcher/shuffle0-b.bmpbin1146 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle0-g.bmpbin238 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle0-s.bmpbin90 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle0.bmpbin694 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle1-b.bmpbin1146 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle1-g.bmpbin238 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle1-s.bmpbin90 -> 0 bytes
-rw-r--r--wps/UniCatcher/shuffle1.bmpbin694 -> 0 bytes
-rw-r--r--wps/UniCatcher/upbar-138.bmpbin1728 -> 0 bytes
-rw-r--r--wps/UniCatcher/upbar-160.bmpbin1992 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol0-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol0-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol0-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol0.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol1-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol1-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol1-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol1.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol2-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol2-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol2-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol2.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol3-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol3-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol3-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol3.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol4-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol4-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol4-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol4.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol5-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol5-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol5-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol5.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol6-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol6-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol6-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol6.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol7-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol7-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol7-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol7.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol8-b.bmpbin1398 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol8-g.bmpbin246 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol8-s.bmpbin114 -> 0 bytes
-rw-r--r--wps/UniCatcher/vol8.bmpbin822 -> 0 bytes
-rw-r--r--wps/UniCatcher/volume-b.bmpbin0 -> 12150 bytes
-rw-r--r--wps/UniCatcher/volume-g.bmpbin0 -> 1216 bytes
-rw-r--r--wps/UniCatcher/volume-s.bmpbin0 -> 530 bytes
-rw-r--r--wps/UniCatcher/volume.bmpbin0 -> 6966 bytes
234 files changed, 131 insertions, 491 deletions
diff --git a/wps/UniCatcher.128x64x1.wps b/wps/UniCatcher.128x64x1.wps
index 4bbf5ca9f5..7239811c9e 100644
--- a/wps/UniCatcher.128x64x1.wps
+++ b/wps/UniCatcher.128x64x1.wps
@@ -4,44 +4,15 @@
%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%xl|A|bat0-s.bmp|109|3|
-%xl|B|bat1-s.bmp|109|3|
-%xl|C|bat2-s.bmp|109|3|
-%xl|D|bat3-s.bmp|109|3|
-%xl|E|bat4-s.bmp|109|3|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|G|holdmain-s.bmp|86|2|
-%xl|H|holdremote-s.bmp|86|2|
-%xl|I|holdboth-s.bmp|86|2|
-%xl|K|repeatall-s.bmp|66|2|
-%xl|L|repeatone-s.bmp|66|2|
-%xl|M|repeatshuffle-s.bmp|66|2|
-%xl|N|repeata-b-s.bmp|66|2|
-%xl|O|shuffle0-s.bmp|46|4|
-%xl|P|shuffle1-s.bmp|46|4|
-%xl|R|pb-play-s.bmp|3|3|
-%xl|S|pb-pause-s.bmp|3|3|
-%xl|T|pb-fforward-s.bmp|3|3|
-%xl|U|pb-rewind-s.bmp|3|3|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>%?mm<|%xdK|%xdL|%xdM|%xdN>%?ps<%xdP|%xdO>%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-s.bmp|16|1|
-%xl|b|vol1-s.bmp|16|1|
-%xl|c|vol2-s.bmp|16|1|
-%xl|d|vol3-s.bmp|16|1|
-%xl|e|vol4-s.bmp|16|1|
-%xl|f|vol5-s.bmp|16|1|
-%xl|g|vol6-s.bmp|16|1|
-%xl|h|vol7-s.bmp|16|1|
-%xl|i|vol8-s.bmp|16|1|
-%xl|j|ani1-s.bmp|16|1|
-%xl|k|ani2-s.bmp|16|1|
-%xl|l|ani3-s.bmp|16|1|
-%xl|m|ani4-s.bmp|16|1|
-%xl|n|ani5-s.bmp|16|1|
-%xl|o|ani6-s.bmp|16|1|
-%xl|p|ani7-s.bmp|16|1|
-%xl|q|ani8-s.bmp|16|1|
-%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|W|line1-128.bmp|0|0|
-%xl|X|line2-128.bmp|0|13|
-%xdW%xdX \ No newline at end of file
+%xl|A|battery-s.bmp|109|3|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-s.bmp|86|2|3|
+%xl|C|repeat-s.bmp|66|2|4|
+%xl|D|shuffle-s.bmp|46|4|2|
+%xl|E|playmode-s.bmp|3|3|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-s.bmp|16|1|9|
+%xl|G|animation-s.bmp|16|1|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%x|W|line1-128.bmp|0|0|
+%x|X|line2-128.bmp|0|13|
diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps
index 8f64272a92..e6ef042edf 100644
--- a/wps/UniCatcher.128x96x1.wps
+++ b/wps/UniCatcher.128x96x1.wps
@@ -6,45 +6,16 @@
%pb|4|11|117|
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%xl|A|bat0-s.bmp|109|3|
-%xl|B|bat1-s.bmp|109|3|
-%xl|C|bat2-s.bmp|109|3|
-%xl|D|bat3-s.bmp|109|3|
-%xl|E|bat4-s.bmp|109|3|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|G|holdmain-s.bmp|86|2|
-%xl|H|holdremote-s.bmp|86|2|
-%xl|I|holdboth-s.bmp|86|2|
-%xl|K|repeatall-s.bmp|66|2|
-%xl|L|repeatone-s.bmp|66|2|
-%xl|M|repeatshuffle-s.bmp|66|2|
-%xl|N|repeata-b-s.bmp|66|2|
-%xl|O|shuffle0-s.bmp|46|4|
-%xl|P|shuffle1-s.bmp|46|4|
-%xl|R|pb-play-s.bmp|3|3|
-%xl|S|pb-pause-s.bmp|3|3|
-%xl|T|pb-fforward-s.bmp|3|3|
-%xl|U|pb-rewind-s.bmp|3|3|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>%?mm<|%xdK|%xdL|%xdM|%xdN>%?ps<%xdP|%xdO>%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-s.bmp|16|1|
-%xl|b|vol1-s.bmp|16|1|
-%xl|c|vol2-s.bmp|16|1|
-%xl|d|vol3-s.bmp|16|1|
-%xl|e|vol4-s.bmp|16|1|
-%xl|f|vol5-s.bmp|16|1|
-%xl|g|vol6-s.bmp|16|1|
-%xl|h|vol7-s.bmp|16|1|
-%xl|i|vol8-s.bmp|16|1|
-%xl|j|ani1-s.bmp|16|1|
-%xl|k|ani2-s.bmp|16|1|
-%xl|l|ani3-s.bmp|16|1|
-%xl|m|ani4-s.bmp|16|1|
-%xl|n|ani5-s.bmp|16|1|
-%xl|o|ani6-s.bmp|16|1|
-%xl|p|ani7-s.bmp|16|1|
-%xl|q|ani8-s.bmp|16|1|
-%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|W|line1-128.bmp|0|0|
-%xl|X|line2-128.bmp|0|13|
-%xl|Y|line1-128.bmp|0|79|
-%xdW%xdX%xdY \ No newline at end of file
+%xl|A|battery-s.bmp|109|3|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-s.bmp|86|2|3|
+%xl|C|repeat-s.bmp|66|2|4|
+%xl|D|shuffle-s.bmp|46|4|2|
+%xl|E|playmode-s.bmp|3|3|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-s.bmp|16|1|9|
+%xl|G|animation-s.bmp|16|1|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%x|W|line1-128.bmp|0|0|
+%x|X|line2-128.bmp|0|13|
+%x|Y|line1-128.bmp|0|79|
diff --git a/wps/UniCatcher.160x128x16.wps b/wps/UniCatcher.160x128x16.wps
index 3083fce969..51b987f5ec 100644
--- a/wps/UniCatcher.160x128x16.wps
+++ b/wps/UniCatcher.160x128x16.wps
@@ -9,61 +9,18 @@
%pb|4|10|150|
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%xl|A|bat0.bmp|135|8|
-%xl|B|bat1.bmp|135|8|
-%xl|C|bat2.bmp|135|8|
-%xl|D|bat3.bmp|135|8|
-%xl|E|bat4.bmp|135|8|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0.bmp|106|5|
-%xl|G|holdmain.bmp|106|5|
-%xl|H|holdremote.bmp|106|5|
-%xl|I|holdboth.bmp|106|5|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0.bmp|83|6|
-%xl|K|repeatall.bmp|83|6|
-%xl|L|repeatone.bmp|83|6|
-%xl|M|repeatshuffle.bmp|83|6|
-%xl|N|repeata-b.bmp|83|6|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0.bmp|58|7|
-%xl|P|shuffle1.bmp|58|7|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play.bmp|6|7|
-%xl|S|pb-pause.bmp|6|7|
-%xl|T|pb-fforward.bmp|6|7|
-%xl|U|pb-rewind.bmp|6|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0.bmp|24|3|
-%xl|b|vol1.bmp|24|3|
-%xl|c|vol2.bmp|24|3|
-%xl|d|vol3.bmp|24|3|
-%xl|e|vol4.bmp|24|3|
-%xl|f|vol5.bmp|24|3|
-%xl|g|vol6.bmp|24|3|
-%xl|h|vol7.bmp|24|3|
-%xl|i|vol8.bmp|24|3|
-%xl|j|ani1.bmp|24|3|
-%xl|k|ani2.bmp|24|3|
-%xl|l|ani3.bmp|24|3|
-%xl|m|ani4.bmp|24|3|
-%xl|n|ani5.bmp|24|3|
-%xl|o|ani6.bmp|24|3|
-%xl|p|ani7.bmp|24|3|
-%xl|q|ani8.bmp|24|3|
-%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.bmp|115|82|
-%xl|s|codec-mp2.bmp|115|82|
-%xl|t|codec-mp3.bmp|115|82|
-%xl|u|codec-aiff.bmp|115|82|
-%xl|v|codec-wav.bmp|115|82|
-%xl|w|codec-ogg.bmp|115|82|
-%xl|x|codec-flac.bmp|115|82|
-%xl|y|codec-mpc.bmp|115|82|
-%xl|z|codec-ac3.bmp|115|82|
-%xl|V|codec-wavpack.bmp|115|82|
-%xl|W|codec-alac.bmp|115|82|
-%xl|X|codec-aac.bmp|115|82|
-%xl|Y|codec-shorten.bmp|115|82|
-%xl|Z|codec-unknown.bmp|115|82|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|A|battery.bmp|135|8|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold.bmp|106|5|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat.bmp|83|6|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle.bmp|58|7|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode.bmp|6|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume.bmp|24|3|9|
+%xl|G|animation.bmp|24|3|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec.bmp|115|82|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher.160x128x2.wps b/wps/UniCatcher.160x128x2.wps
index e1c5168c15..a8612ba7b3 100644
--- a/wps/UniCatcher.160x128x2.wps
+++ b/wps/UniCatcher.160x128x2.wps
@@ -1,4 +1,5 @@
%wd
+%X|bg-160x128x2-u.bmp|
%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 >
@@ -8,63 +9,18 @@
%pb|4|10|150|
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%xl|A|bat0-g.bmp|135|8|
-%xl|B|bat1-g.bmp|135|8|
-%xl|C|bat2-g.bmp|135|8|
-%xl|D|bat3-g.bmp|135|8|
-%xl|E|bat4-g.bmp|135|8|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|G|holdmain-g.bmp|106|5|
-%xl|H|holdremote-g.bmp|106|5|
-%xl|I|holdboth-g.bmp|106|5|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>
-%xl|K|repeatall-g.bmp|83|6|
-%xl|L|repeatone-g.bmp|83|6|
-%xl|M|repeatshuffle-g.bmp|83|6|
-%xl|N|repeata-b-g.bmp|83|6|
-%?mm<|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-g.bmp|58|7|
-%xl|P|shuffle1-g.bmp|58|7|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-g.bmp|6|7|
-%xl|S|pb-pause-g.bmp|6|7|
-%xl|T|pb-fforward-g.bmp|6|7|
-%xl|U|pb-rewind-g.bmp|6|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-g.bmp|24|4|
-%xl|b|vol1-g.bmp|24|4|
-%xl|c|vol2-g.bmp|24|4|
-%xl|d|vol3-g.bmp|24|4|
-%xl|e|vol4-g.bmp|24|4|
-%xl|f|vol5-g.bmp|24|4|
-%xl|g|vol6-g.bmp|24|4|
-%xl|h|vol7-g.bmp|24|4|
-%xl|i|vol8-g.bmp|24|4|
-%xl|j|ani1-g.bmp|24|4|
-%xl|k|ani2-g.bmp|24|4|
-%xl|l|ani3-g.bmp|24|4|
-%xl|m|ani4-g.bmp|24|4|
-%xl|n|ani5-g.bmp|24|4|
-%xl|o|ani6-g.bmp|24|4|
-%xl|p|ani7-g.bmp|24|4|
-%xl|q|ani8-g.bmp|24|4|
-%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-g.bmp|115|82|
-%xl|s|codec-mp2-g.bmp|115|82|
-%xl|t|codec-mp3-g.bmp|115|82|
-%xl|u|codec-aiff-g.bmp|115|82|
-%xl|v|codec-wav-g.bmp|115|82|
-%xl|w|codec-ogg-g.bmp|115|82|
-%xl|x|codec-flac-g.bmp|115|82|
-%xl|y|codec-mpc-g.bmp|115|82|
-%xl|z|codec-ac3-g.bmp|115|82|
-%xl|V|codec-wavpack-g.bmp|115|82|
-%xl|W|codec-alac-g.bmp|115|82|
-%xl|X|codec-aac-g.bmp|115|82|
-%xl|Y|codec-shorten-g.bmp|115|82|
-%xl|Z|codec-unknown-g.bmp|115|82|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
-%xl|F|upbar-160.bmp|0|0|
-%xl|J|bottomline-160.bmp|0|110|
-%xdF
-%xdJ
+%xl|A|battery-g.bmp|135|8|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-g.bmp|106|5|3|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>
+%xl|C|repeat-g.bmp|83|6|4|
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%xl|D|shuffle-g.bmp|58|7|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-g.bmp|6|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-g.bmp|24|4|9|
+%xl|G|animation-g.bmp|24|4|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec-g.bmp|115|82|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher.176x132x16.wps b/wps/UniCatcher.176x132x16.wps
index a3fddfa2ab..072362126c 100644
--- a/wps/UniCatcher.176x132x16.wps
+++ b/wps/UniCatcher.176x132x16.wps
@@ -9,61 +9,18 @@
%pb|4|10|166|
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%xl|A|bat0.bmp|151|8|
-%xl|B|bat1.bmp|151|8|
-%xl|C|bat2.bmp|151|8|
-%xl|D|bat3.bmp|151|8|
-%xl|E|bat4.bmp|151|8|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0.bmp|122|5|
-%xl|G|holdmain.bmp|122|5|
-%xl|H|holdremote.bmp|122|5|
-%xl|I|holdboth.bmp|122|5|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0.bmp|91|6|
-%xl|K|repeatall.bmp|91|6|
-%xl|L|repeatone.bmp|91|6|
-%xl|M|repeatshuffle.bmp|91|6|
-%xl|N|repeata-b.bmp|91|6|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0.bmp|66|7|
-%xl|P|shuffle1.bmp|66|7|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play.bmp|6|7|
-%xl|S|pb-pause.bmp|6|7|
-%xl|T|pb-fforward.bmp|6|7|
-%xl|U|pb-rewind.bmp|6|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0.bmp|24|3|
-%xl|b|vol1.bmp|24|3|
-%xl|c|vol2.bmp|24|3|
-%xl|d|vol3.bmp|24|3|
-%xl|e|vol4.bmp|24|3|
-%xl|f|vol5.bmp|24|3|
-%xl|g|vol6.bmp|24|3|
-%xl|h|vol7.bmp|24|3|
-%xl|i|vol8.bmp|24|3|
-%xl|j|ani1.bmp|24|3|
-%xl|k|ani2.bmp|24|3|
-%xl|l|ani3.bmp|24|3|
-%xl|m|ani4.bmp|24|3|
-%xl|n|ani5.bmp|24|3|
-%xl|o|ani6.bmp|24|3|
-%xl|p|ani7.bmp|24|3|
-%xl|q|ani8.bmp|24|3|
-%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.bmp|131|82|
-%xl|s|codec-mp2.bmp|131|82|
-%xl|t|codec-mp3.bmp|131|82|
-%xl|u|codec-aiff.bmp|131|82|
-%xl|v|codec-wav.bmp|131|82|
-%xl|w|codec-ogg.bmp|131|82|
-%xl|x|codec-flac.bmp|131|82|
-%xl|y|codec-mpc.bmp|131|82|
-%xl|z|codec-ac3.bmp|131|82|
-%xl|V|codec-wavpack.bmp|131|82|
-%xl|W|codec-alac.bmp|131|82|
-%xl|X|codec-aac.bmp|131|82|
-%xl|Y|codec-shorten.bmp|131|82|
-%xl|Z|codec-unknown.bmp|131|82|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|A|battery.bmp|151|8|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold.bmp|122|5|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat.bmp|91|6|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle.bmp|66|7|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode.bmp|6|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume.bmp|24|3|9|
+%xl|G|animation.bmp|24|3|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec.bmp|131|82|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps
index 63bd8d5c72..917e344064 100644
--- a/wps/UniCatcher.176x220x16.wps
+++ b/wps/UniCatcher.176x220x16.wps
@@ -14,61 +14,18 @@
%pb|4|10|166|
%s%acNext: %?It<%It|%?Fn<%Fn|?>>
-%xl|A|bat0.bmp|151|8|
-%xl|B|bat1.bmp|151|8|
-%xl|C|bat2.bmp|151|8|
-%xl|D|bat3.bmp|151|8|
-%xl|E|bat4.bmp|151|8|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0.bmp|122|5|
-%xl|G|holdmain.bmp|122|5|
-%xl|H|holdremote.bmp|122|5|
-%xl|I|holdboth.bmp|122|5|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0.bmp|91|6|
-%xl|K|repeatall.bmp|91|6|
-%xl|L|repeatone.bmp|91|6|
-%xl|M|repeatshuffle.bmp|91|6|
-%xl|N|repeata-b.bmp|91|6|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0.bmp|66|7|
-%xl|P|shuffle1.bmp|66|7|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play.bmp|6|7|
-%xl|S|pb-pause.bmp|6|7|
-%xl|T|pb-fforward.bmp|6|7|
-%xl|U|pb-rewind.bmp|6|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0.bmp|24|3|
-%xl|b|vol1.bmp|24|3|
-%xl|c|vol2.bmp|24|3|
-%xl|d|vol3.bmp|24|3|
-%xl|e|vol4.bmp|24|3|
-%xl|f|vol5.bmp|24|3|
-%xl|g|vol6.bmp|24|3|
-%xl|h|vol7.bmp|24|3|
-%xl|i|vol8.bmp|24|3|
-%xl|j|ani1.bmp|24|3|
-%xl|k|ani2.bmp|24|3|
-%xl|l|ani3.bmp|24|3|
-%xl|m|ani4.bmp|24|3|
-%xl|n|ani5.bmp|24|3|
-%xl|o|ani6.bmp|24|3|
-%xl|p|ani7.bmp|24|3|
-%xl|q|ani8.bmp|24|3|
-%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.bmp|131|164|
-%xl|s|codec-mp2.bmp|131|164|
-%xl|t|codec-mp3.bmp|131|164|
-%xl|u|codec-aiff.bmp|131|164|
-%xl|v|codec-wav.bmp|131|164|
-%xl|w|codec-ogg.bmp|131|164|
-%xl|x|codec-flac.bmp|131|164|
-%xl|y|codec-mpc.bmp|131|164|
-%xl|z|codec-ac3.bmp|131|164|
-%xl|V|codec-wavpack.bmp|131|164|
-%xl|W|codec-alac.bmp|131|164|
-%xl|X|codec-aac.bmp|131|164|
-%xl|Y|codec-shorten.bmp|131|164|
-%xl|Z|codec-unknown.bmp|131|164|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|A|battery.bmp|151|8|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold.bmp|122|5|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat.bmp|91|6|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle.bmp|66|7|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode.bmp|6|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume.bmp|24|3|9|
+%xl|G|animation.bmp|24|3|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec.bmp|131|164|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps
index 4ec8bd6db1..c0c79b5352 100644
--- a/wps/UniCatcher.220x176x16.wps
+++ b/wps/UniCatcher.220x176x16.wps
@@ -12,61 +12,18 @@
%s%acNext: %?It<%It|%?Fn<%Fn|?>>
-%xl|A|bat0.bmp|194|9|
-%xl|B|bat1.bmp|194|9|
-%xl|C|bat2.bmp|194|9|
-%xl|D|bat3.bmp|194|9|
-%xl|E|bat4.bmp|194|9|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0.bmp|165|6|
-%xl|G|holdmain.bmp|165|6|
-%xl|H|holdremote.bmp|165|6|
-%xl|I|holdboth.bmp|165|6|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0.bmp|114|7|
-%xl|K|repeatall.bmp|114|7|
-%xl|L|repeatone.bmp|114|7|
-%xl|M|repeatshuffle.bmp|114|7|
-%xl|N|repeata-b.bmp|114|7|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0.bmp|89|8|
-%xl|P|shuffle1.bmp|89|8|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play.bmp|8|7|
-%xl|S|pb-pause.bmp|8|7|
-%xl|T|pb-fforward.bmp|8|7|
-%xl|U|pb-rewind.bmp|8|7|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0.bmp|25|4|
-%xl|b|vol1.bmp|25|4|
-%xl|c|vol2.bmp|25|4|
-%xl|d|vol3.bmp|25|4|
-%xl|e|vol4.bmp|25|4|
-%xl|f|vol5.bmp|25|4|
-%xl|g|vol6.bmp|25|4|
-%xl|h|vol7.bmp|25|4|
-%xl|i|vol8.bmp|25|4|
-%xl|j|ani1.bmp|25|4|
-%xl|k|ani2.bmp|25|4|
-%xl|l|ani3.bmp|25|4|
-%xl|m|ani4.bmp|25|4|
-%xl|n|ani5.bmp|25|4|
-%xl|o|ani6.bmp|25|4|
-%xl|p|ani7.bmp|25|4|
-%xl|q|ani8.bmp|25|4|
-%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.bmp|173|115|
-%xl|s|codec-mp2.bmp|173|115|
-%xl|t|codec-mp3.bmp|173|115|
-%xl|u|codec-aiff.bmp|173|115|
-%xl|v|codec-wav.bmp|173|115|
-%xl|w|codec-ogg.bmp|173|115|
-%xl|x|codec-flac.bmp|173|115|
-%xl|y|codec-mpc.bmp|173|115|
-%xl|z|codec-ac3.bmp|173|115|
-%xl|V|codec-wavpack.bmp|173|115|
-%xl|W|codec-alac.bmp|173|115|
-%xl|X|codec-aac.bmp|173|115|
-%xl|Y|codec-shorten.bmp|173|115|
-%xl|Z|codec-unknown.bmp|173|115|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|A|battery.bmp|194|9|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold.bmp|165|6|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat.bmp|114|7|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle.bmp|89|8|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode.bmp|8|7|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume.bmp|25|4|9|
+%xl|G|animation.bmp|25|4|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec.bmp|173|115|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps
index 43a921191b..22ece3cee0 100644
--- a/wps/UniCatcher.240x320x16.wps
+++ b/wps/UniCatcher.240x320x16.wps
@@ -20,61 +20,18 @@
%s%acNext: %?It<%It|%?Fn<%Fn|?>>
-%xl|A|bat0-b.bmp|204|12|
-%xl|B|bat1-b.bmp|204|12|
-%xl|C|bat2-b.bmp|204|12|
-%xl|D|bat3-b.bmp|204|12|
-%xl|E|bat4-b.bmp|204|12|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0-b.bmp|164|8|
-%xl|G|holdmain-b.bmp|164|8|
-%xl|H|holdremote-b.bmp|164|8|
-%xl|I|holdboth-b.bmp|164|8|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0-b.bmp|126|9|
-%xl|K|repeatall-b.bmp|126|9|
-%xl|L|repeatone-b.bmp|126|9|
-%xl|M|repeatshuffle-b.bmp|126|9|
-%xl|N|repeata-b-b.bmp|126|9|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-b.bmp|91|11|
-%xl|P|shuffle1-b.bmp|91|11|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-b.bmp|11|10|
-%xl|S|pb-pause-b.bmp|11|10|
-%xl|T|pb-fforward-b.bmp|11|10|
-%xl|U|pb-rewind-b.bmp|11|10|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-b.bmp|34|5|
-%xl|b|vol1-b.bmp|34|5|
-%xl|c|vol2-b.bmp|34|5|
-%xl|d|vol3-b.bmp|34|5|
-%xl|e|vol4-b.bmp|34|5|
-%xl|f|vol5-b.bmp|34|5|
-%xl|g|vol6-b.bmp|34|5|
-%xl|h|vol7-b.bmp|34|5|
-%xl|i|vol8-b.bmp|34|5|
-%xl|j|ani1-b.bmp|34|5|
-%xl|k|ani2-b.bmp|34|5|
-%xl|l|ani3-b.bmp|34|5|
-%xl|m|ani4-b.bmp|34|5|
-%xl|n|ani5-b.bmp|34|5|
-%xl|o|ani6-b.bmp|34|5|
-%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|236|
-%xl|s|codec-mp2-b.bmp|168|236|
-%xl|t|codec-mp3-b.bmp|168|236|
-%xl|u|codec-aiff-b.bmp|168|236|
-%xl|v|codec-wav-b.bmp|168|236|
-%xl|w|codec-ogg-b.bmp|168|236|
-%xl|x|codec-flac-b.bmp|168|236|
-%xl|y|codec-mpc-b.bmp|168|236|
-%xl|z|codec-ac3-b.bmp|168|236|
-%xl|V|codec-wavpack-b.bmp|168|236|
-%xl|W|codec-alac-b.bmp|168|236|
-%xl|X|codec-aac-b.bmp|168|236|
-%xl|Y|codec-shorten-b.bmp|168|236|
-%xl|Z|codec-unknown-b.bmp|168|236|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|A|battery-b.bmp|204|12|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-b.bmp|164|8|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat-b.bmp|126|9|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle-b.bmp|91|11|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-b.bmp|11|10|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-b.bmp|34|5|9|
+%xl|G|animation-b.bmp|34|5|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec-b.bmp|168|236|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps
index 14bbe0d70a..3c7ae3e85e 100644
--- a/wps/UniCatcher.320x240x16.wps
+++ b/wps/UniCatcher.320x240x16.wps
@@ -15,61 +15,18 @@
%s%acNext: %?It<%It|%?Fn<%Fn|?>>
-%xl|A|bat0-b.bmp|284|12|
-%xl|B|bat1-b.bmp|284|12|
-%xl|C|bat2-b.bmp|284|12|
-%xl|D|bat3-b.bmp|284|12|
-%xl|E|bat4-b.bmp|284|12|
-%t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdA|%xdB|%xdC|%xdD|%xdE|%xdE>>
-%xl|F|hold0-b.bmp|244|8|
-%xl|G|holdmain-b.bmp|244|8|
-%xl|H|holdremote-b.bmp|244|8|
-%xl|I|holdboth-b.bmp|244|8|
-%?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|%xdF>>
-%xl|J|repeat0-b.bmp|166|9|
-%xl|K|repeatall-b.bmp|166|9|
-%xl|L|repeatone-b.bmp|166|9|
-%xl|M|repeatshuffle-b.bmp|166|9|
-%xl|N|repeata-b-b.bmp|166|9|
-%?mm<%xdJ|%xdK|%xdL|%xdM|%xdN>
-%xl|O|shuffle0-b.bmp|131|11|
-%xl|P|shuffle1-b.bmp|131|11|
-%?ps<%xdP|%xdO>
-%xl|R|pb-play-b.bmp|11|10|
-%xl|S|pb-pause-b.bmp|11|10|
-%xl|T|pb-fforward-b.bmp|11|10|
-%xl|U|pb-rewind-b.bmp|11|10|
-%?mp<|%xdR|%xdS|%xdT|%xdU>
-%xl|a|vol0-b.bmp|34|5|
-%xl|b|vol1-b.bmp|34|5|
-%xl|c|vol2-b.bmp|34|5|
-%xl|d|vol3-b.bmp|34|5|
-%xl|e|vol4-b.bmp|34|5|
-%xl|f|vol5-b.bmp|34|5|
-%xl|g|vol6-b.bmp|34|5|
-%xl|h|vol7-b.bmp|34|5|
-%xl|i|vol8-b.bmp|34|5|
-%xl|j|ani1-b.bmp|34|5|
-%xl|k|ani2-b.bmp|34|5|
-%xl|l|ani3-b.bmp|34|5|
-%xl|m|ani4-b.bmp|34|5|
-%xl|n|ani5-b.bmp|34|5|
-%xl|o|ani6-b.bmp|34|5|
-%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|158|
-%xl|s|codec-mp2-b.bmp|248|158|
-%xl|t|codec-mp3-b.bmp|248|158|
-%xl|u|codec-aiff-b.bmp|248|158|
-%xl|v|codec-wav-b.bmp|248|158|
-%xl|w|codec-ogg-b.bmp|248|158|
-%xl|x|codec-flac-b.bmp|248|158|
-%xl|y|codec-mpc-b.bmp|248|158|
-%xl|z|codec-ac3-b.bmp|248|158|
-%xl|V|codec-wavpack-b.bmp|248|158|
-%xl|W|codec-alac-b.bmp|248|158|
-%xl|X|codec-aac-b.bmp|248|158|
-%xl|Y|codec-shorten-b.bmp|248|158|
-%xl|Z|codec-unknown-b.bmp|248|158|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|A|battery-b.bmp|284|12|5|
+%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
+%xl|B|hold-b.bmp|244|8|4|
+%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
+%xl|C|repeat-b.bmp|166|9|5|
+%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
+%xl|D|shuffle-b.bmp|131|11|2|
+%?ps<%xdDa|%xdDb>
+%xl|E|playmode-b.bmp|11|10|4|
+%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
+%xl|F|volume-b.bmp|34|5|9|
+%xl|G|animation-b.bmp|34|5|8|
+%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl|H|codec-b.bmp|248|158|21|
+%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu>
diff --git a/wps/UniCatcher/ani1-b.bmp b/wps/UniCatcher/ani1-b.bmp
deleted file mode 100644
index 913b4856ee..0000000000
--- a/wps/UniCatcher/ani1-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani1-g.bmp b/wps/UniCatcher/ani1-g.bmp
deleted file mode 100644
index 038e330a91..0000000000
--- a/wps/UniCatcher/ani1-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani1-s.bmp b/wps/UniCatcher/ani1-s.bmp
deleted file mode 100644
index 355fb8d506..0000000000
--- a/wps/UniCatcher/ani1-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani1.bmp b/wps/UniCatcher/ani1.bmp
deleted file mode 100644
index 33a3c128fa..0000000000
--- a/wps/UniCatcher/ani1.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani2-b.bmp b/wps/UniCatcher/ani2-b.bmp
deleted file mode 100644
index 102bc20258..0000000000
--- a/wps/UniCatcher/ani2-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani2-g.bmp b/wps/UniCatcher/ani2-g.bmp
deleted file mode 100644
index d8afaa5d5b..0000000000
--- a/wps/UniCatcher/ani2-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani2-s.bmp b/wps/UniCatcher/ani2-s.bmp
deleted file mode 100644
index 5a1c4eeddd..0000000000
--- a/wps/UniCatcher/ani2-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani2.bmp b/wps/UniCatcher/ani2.bmp
deleted file mode 100644
index 2fcaf72b84..0000000000
--- a/wps/UniCatcher/ani2.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani3-b.bmp b/wps/UniCatcher/ani3-b.bmp
deleted file mode 100644
index a553ce75bb..0000000000
--- a/wps/UniCatcher/ani3-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani3-g.bmp b/wps/UniCatcher/ani3-g.bmp
deleted file mode 100644
index 662acd097e..0000000000
--- a/wps/UniCatcher/ani3-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani3-s.bmp b/wps/UniCatcher/ani3-s.bmp
deleted file mode 100644
index 8304137526..0000000000
--- a/wps/UniCatcher/ani3-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani3.bmp b/wps/UniCatcher/ani3.bmp
deleted file mode 100644
index b4636c550d..0000000000
--- a/wps/UniCatcher/ani3.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani4-b.bmp b/wps/UniCatcher/ani4-b.bmp
deleted file mode 100644
index c1a539dee5..0000000000
--- a/wps/UniCatcher/ani4-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani4-g.bmp b/wps/UniCatcher/ani4-g.bmp
deleted file mode 100644
index e2aa6e57f5..0000000000
--- a/wps/UniCatcher/ani4-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani4-s.bmp b/wps/UniCatcher/ani4-s.bmp
deleted file mode 100644
index 7960ab539c..0000000000
--- a/wps/UniCatcher/ani4-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani4.bmp b/wps/UniCatcher/ani4.bmp
deleted file mode 100644
index ed0268e607..0000000000
--- a/wps/UniCatcher/ani4.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani5-b.bmp b/wps/UniCatcher/ani5-b.bmp
deleted file mode 100644
index 39f447beb7..0000000000
--- a/wps/UniCatcher/ani5-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani5-g.bmp b/wps/UniCatcher/ani5-g.bmp
deleted file mode 100644
index 9601560e0e..0000000000
--- a/wps/UniCatcher/ani5-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani5-s.bmp b/wps/UniCatcher/ani5-s.bmp
deleted file mode 100644
index 2ea42b2145..0000000000
--- a/wps/UniCatcher/ani5-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani5.bmp b/wps/UniCatcher/ani5.bmp
deleted file mode 100644
index 332a7cbc3b..0000000000
--- a/wps/UniCatcher/ani5.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani6-b.bmp b/wps/UniCatcher/ani6-b.bmp
deleted file mode 100644
index 26b0295a27..0000000000
--- a/wps/UniCatcher/ani6-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani6-g.bmp b/wps/UniCatcher/ani6-g.bmp
deleted file mode 100644
index 03d488004e..0000000000
--- a/wps/UniCatcher/ani6-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani6-s.bmp b/wps/UniCatcher/ani6-s.bmp
deleted file mode 100644
index 7ee00ac355..0000000000
--- a/wps/UniCatcher/ani6-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani6.bmp b/wps/UniCatcher/ani6.bmp
deleted file mode 100644
index 1a10c85963..0000000000
--- a/wps/UniCatcher/ani6.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani7-b.bmp b/wps/UniCatcher/ani7-b.bmp
deleted file mode 100644
index cc28e09d8a..0000000000
--- a/wps/UniCatcher/ani7-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani7-g.bmp b/wps/UniCatcher/ani7-g.bmp
deleted file mode 100644
index ee81014244..0000000000
--- a/wps/UniCatcher/ani7-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani7-s.bmp b/wps/UniCatcher/ani7-s.bmp
deleted file mode 100644
index 35117db762..0000000000
--- a/wps/UniCatcher/ani7-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani7.bmp b/wps/UniCatcher/ani7.bmp
deleted file mode 100644
index 29751f180b..0000000000
--- a/wps/UniCatcher/ani7.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani8-b.bmp b/wps/UniCatcher/ani8-b.bmp
deleted file mode 100644
index 34bf59f461..0000000000
--- a/wps/UniCatcher/ani8-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani8-g.bmp b/wps/UniCatcher/ani8-g.bmp
deleted file mode 100644
index cb535f0658..0000000000
--- a/wps/UniCatcher/ani8-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani8-s.bmp b/wps/UniCatcher/ani8-s.bmp
deleted file mode 100644
index 3a91a7b9a0..0000000000
--- a/wps/UniCatcher/ani8-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/ani8.bmp b/wps/UniCatcher/ani8.bmp
deleted file mode 100644
index 88c1595892..0000000000
--- a/wps/UniCatcher/ani8.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/animation-b.bmp b/wps/UniCatcher/animation-b.bmp
new file mode 100644
index 0000000000..e73dbdb794
--- /dev/null
+++ b/wps/UniCatcher/animation-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/animation-g.bmp b/wps/UniCatcher/animation-g.bmp
new file mode 100644
index 0000000000..c0ba9f7ada
--- /dev/null
+++ b/wps/UniCatcher/animation-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/animation-s.bmp b/wps/UniCatcher/animation-s.bmp
new file mode 100644
index 0000000000..4827ffa708
--- /dev/null
+++ b/wps/UniCatcher/animation-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/animation.bmp b/wps/UniCatcher/animation.bmp
new file mode 100644
index 0000000000..1ae59cb670
--- /dev/null
+++ b/wps/UniCatcher/animation.bmp
Binary files differ
diff --git a/wps/UniCatcher/bat0-b.bmp b/wps/UniCatcher/bat0-b.bmp
deleted file mode 100644
index ad71668ca4..0000000000
--- a/wps/UniCatcher/bat0-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat0-g.bmp b/wps/UniCatcher/bat0-g.bmp
deleted file mode 100644
index c74cef632b..0000000000
--- a/wps/UniCatcher/bat0-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat0-s.bmp b/wps/UniCatcher/bat0-s.bmp
deleted file mode 100644
index d50ff8eeea..0000000000
--- a/wps/UniCatcher/bat0-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat0.bmp b/wps/UniCatcher/bat0.bmp
deleted file mode 100644
index f3f138e394..0000000000
--- a/wps/UniCatcher/bat0.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat1-b.bmp b/wps/UniCatcher/bat1-b.bmp
deleted file mode 100644
index b6d9e08e0f..0000000000
--- a/wps/UniCatcher/bat1-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat1-g.bmp b/wps/UniCatcher/bat1-g.bmp
deleted file mode 100644
index 0c7932e400..0000000000
--- a/wps/UniCatcher/bat1-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat1-s.bmp b/wps/UniCatcher/bat1-s.bmp
deleted file mode 100644
index e22ffc7a4c..0000000000
--- a/wps/UniCatcher/bat1-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat1.bmp b/wps/UniCatcher/bat1.bmp
deleted file mode 100644
index f5063d353a..0000000000
--- a/wps/UniCatcher/bat1.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat2-b.bmp b/wps/UniCatcher/bat2-b.bmp
deleted file mode 100644
index 5fe4982a03..0000000000
--- a/wps/UniCatcher/bat2-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat2-g.bmp b/wps/UniCatcher/bat2-g.bmp
deleted file mode 100644
index 4d717742b8..0000000000
--- a/wps/UniCatcher/bat2-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat2-s.bmp b/wps/UniCatcher/bat2-s.bmp
deleted file mode 100644
index bca55380f3..0000000000
--- a/wps/UniCatcher/bat2-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat2.bmp b/wps/UniCatcher/bat2.bmp
deleted file mode 100644
index ab9fb061cb..0000000000
--- a/wps/UniCatcher/bat2.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat3-b.bmp b/wps/UniCatcher/bat3-b.bmp
deleted file mode 100644
index a5303f17cb..0000000000
--- a/wps/UniCatcher/bat3-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat3-g.bmp b/wps/UniCatcher/bat3-g.bmp
deleted file mode 100644
index c96c1bdc8d..0000000000
--- a/wps/UniCatcher/bat3-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat3-s.bmp b/wps/UniCatcher/bat3-s.bmp
deleted file mode 100644
index ae2f97c05e..0000000000
--- a/wps/UniCatcher/bat3-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat3.bmp b/wps/UniCatcher/bat3.bmp
deleted file mode 100644
index ca09e41695..0000000000
--- a/wps/UniCatcher/bat3.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat4-b.bmp b/wps/UniCatcher/bat4-b.bmp
deleted file mode 100644
index f581aaecc5..0000000000
--- a/wps/UniCatcher/bat4-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat4-g.bmp b/wps/UniCatcher/bat4-g.bmp
deleted file mode 100644
index be62640e8d..0000000000
--- a/wps/UniCatcher/bat4-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat4-s.bmp b/wps/UniCatcher/bat4-s.bmp
deleted file mode 100644
index 1f5cf2a8cf..0000000000
--- a/wps/UniCatcher/bat4-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bat4.bmp b/wps/UniCatcher/bat4.bmp
deleted file mode 100644
index 2131b794b6..0000000000
--- a/wps/UniCatcher/bat4.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/batlevel.bmp b/wps/UniCatcher/batlevel.bmp
deleted file mode 100644
index 9e23095506..0000000000
--- a/wps/UniCatcher/batlevel.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/battery-b.bmp b/wps/UniCatcher/battery-b.bmp
new file mode 100644
index 0000000000..bda4d8e15d
--- /dev/null
+++ b/wps/UniCatcher/battery-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/battery-g.bmp b/wps/UniCatcher/battery-g.bmp
new file mode 100644
index 0000000000..3c75a91129
--- /dev/null
+++ b/wps/UniCatcher/battery-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/battery-s.bmp b/wps/UniCatcher/battery-s.bmp
new file mode 100644
index 0000000000..56ccdb1df4
--- /dev/null
+++ b/wps/UniCatcher/battery-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/battery.bmp b/wps/UniCatcher/battery.bmp
new file mode 100644
index 0000000000..1d5785ed9b
--- /dev/null
+++ b/wps/UniCatcher/battery.bmp
Binary files differ
diff --git a/wps/UniCatcher/bg-160x128x2-u.bmp b/wps/UniCatcher/bg-160x128x2-u.bmp
new file mode 100644
index 0000000000..c333135bc5
--- /dev/null
+++ b/wps/UniCatcher/bg-160x128x2-u.bmp
Binary files differ
diff --git a/wps/UniCatcher/bottomline-138.bmp b/wps/UniCatcher/bottomline-138.bmp
deleted file mode 100644
index b668ba24dc..0000000000
--- a/wps/UniCatcher/bottomline-138.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/bottomline-160.bmp b/wps/UniCatcher/bottomline-160.bmp
deleted file mode 100644
index d347addad0..0000000000
--- a/wps/UniCatcher/bottomline-160.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-aac-b.bmp b/wps/UniCatcher/codec-aac-b.bmp
deleted file mode 100644
index 476810b0a5..0000000000
--- a/wps/UniCatcher/codec-aac-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-aac-g.bmp b/wps/UniCatcher/codec-aac-g.bmp
deleted file mode 100644
index 43cc8c52db..0000000000
--- a/wps/UniCatcher/codec-aac-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-aac.bmp b/wps/UniCatcher/codec-aac.bmp
deleted file mode 100644
index b907d3ce12..0000000000
--- a/wps/UniCatcher/codec-aac.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-ac3-b.bmp b/wps/UniCatcher/codec-ac3-b.bmp
deleted file mode 100644
index 9406fc6cda..0000000000
--- a/wps/UniCatcher/codec-ac3-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-ac3-g.bmp b/wps/UniCatcher/codec-ac3-g.bmp
deleted file mode 100644
index 24a8b3b920..0000000000
--- a/wps/UniCatcher/codec-ac3-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-ac3.bmp b/wps/UniCatcher/codec-ac3.bmp
deleted file mode 100644
index eeddb7e520..0000000000
--- a/wps/UniCatcher/codec-ac3.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-aiff-b.bmp b/wps/UniCatcher/codec-aiff-b.bmp
deleted file mode 100644
index ddc11f8403..0000000000
--- a/wps/UniCatcher/codec-aiff-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-aiff-g.bmp b/wps/UniCatcher/codec-aiff-g.bmp
deleted file mode 100644
index 5677d0942c..0000000000
--- a/wps/UniCatcher/codec-aiff-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-aiff.bmp b/wps/UniCatcher/codec-aiff.bmp
deleted file mode 100644
index e4a9859980..0000000000
--- a/wps/UniCatcher/codec-aiff.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-alac-b.bmp b/wps/UniCatcher/codec-alac-b.bmp
deleted file mode 100644
index 5bdc6f0501..0000000000
--- a/wps/UniCatcher/codec-alac-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-alac-g.bmp b/wps/UniCatcher/codec-alac-g.bmp
deleted file mode 100644
index fe7dc6cff6..0000000000
--- a/wps/UniCatcher/codec-alac-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-alac.bmp b/wps/UniCatcher/codec-alac.bmp
deleted file mode 100644
index 89b0228f88..0000000000
--- a/wps/UniCatcher/codec-alac.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-b.bmp b/wps/UniCatcher/codec-b.bmp
new file mode 100644
index 0000000000..b7f0573c29
--- /dev/null
+++ b/wps/UniCatcher/codec-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/codec-flac-b.bmp b/wps/UniCatcher/codec-flac-b.bmp
deleted file mode 100644
index 2d909df56e..0000000000
--- a/wps/UniCatcher/codec-flac-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-flac-g.bmp b/wps/UniCatcher/codec-flac-g.bmp
deleted file mode 100644
index bf611d199c..0000000000
--- a/wps/UniCatcher/codec-flac-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-flac.bmp b/wps/UniCatcher/codec-flac.bmp
deleted file mode 100644
index 1253c44f53..0000000000
--- a/wps/UniCatcher/codec-flac.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-g.bmp b/wps/UniCatcher/codec-g.bmp
new file mode 100644
index 0000000000..cabb927245
--- /dev/null
+++ b/wps/UniCatcher/codec-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/codec-mp1-b.bmp b/wps/UniCatcher/codec-mp1-b.bmp
deleted file mode 100644
index 05f521d832..0000000000
--- a/wps/UniCatcher/codec-mp1-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp1-g.bmp b/wps/UniCatcher/codec-mp1-g.bmp
deleted file mode 100644
index 50d42a68d6..0000000000
--- a/wps/UniCatcher/codec-mp1-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp1.bmp b/wps/UniCatcher/codec-mp1.bmp
deleted file mode 100644
index 38dc7786c5..0000000000
--- a/wps/UniCatcher/codec-mp1.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp2-b.bmp b/wps/UniCatcher/codec-mp2-b.bmp
deleted file mode 100644
index 94db238441..0000000000
--- a/wps/UniCatcher/codec-mp2-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp2-g.bmp b/wps/UniCatcher/codec-mp2-g.bmp
deleted file mode 100644
index 5dd7f83451..0000000000
--- a/wps/UniCatcher/codec-mp2-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp2.bmp b/wps/UniCatcher/codec-mp2.bmp
deleted file mode 100644
index cedc102bf1..0000000000
--- a/wps/UniCatcher/codec-mp2.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp3-b.bmp b/wps/UniCatcher/codec-mp3-b.bmp
deleted file mode 100644
index e2ebc4f17d..0000000000
--- a/wps/UniCatcher/codec-mp3-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp3-g.bmp b/wps/UniCatcher/codec-mp3-g.bmp
deleted file mode 100644
index ecab90bdcb..0000000000
--- a/wps/UniCatcher/codec-mp3-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mp3.bmp b/wps/UniCatcher/codec-mp3.bmp
deleted file mode 100644
index 52c6224d75..0000000000
--- a/wps/UniCatcher/codec-mp3.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mpc-b.bmp b/wps/UniCatcher/codec-mpc-b.bmp
deleted file mode 100644
index 82eddf6dbc..0000000000
--- a/wps/UniCatcher/codec-mpc-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mpc-g.bmp b/wps/UniCatcher/codec-mpc-g.bmp
deleted file mode 100644
index 34abb5afb4..0000000000
--- a/wps/UniCatcher/codec-mpc-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-mpc.bmp b/wps/UniCatcher/codec-mpc.bmp
deleted file mode 100644
index 4ac3ea7d25..0000000000
--- a/wps/UniCatcher/codec-mpc.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-ogg-b.bmp b/wps/UniCatcher/codec-ogg-b.bmp
deleted file mode 100644
index c8f731ef57..0000000000
--- a/wps/UniCatcher/codec-ogg-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-ogg-g.bmp b/wps/UniCatcher/codec-ogg-g.bmp
deleted file mode 100644
index 62fc2dc950..0000000000
--- a/wps/UniCatcher/codec-ogg-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-ogg.bmp b/wps/UniCatcher/codec-ogg.bmp
deleted file mode 100644
index 6f013f0d5b..0000000000
--- a/wps/UniCatcher/codec-ogg.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-shorten-b.bmp b/wps/UniCatcher/codec-shorten-b.bmp
deleted file mode 100644
index 1ce5cc386f..0000000000
--- a/wps/UniCatcher/codec-shorten-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-shorten-g.bmp b/wps/UniCatcher/codec-shorten-g.bmp
deleted file mode 100644
index bddd28d0b9..0000000000
--- a/wps/UniCatcher/codec-shorten-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-shorten.bmp b/wps/UniCatcher/codec-shorten.bmp
deleted file mode 100644
index 8ab045994a..0000000000
--- a/wps/UniCatcher/codec-shorten.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-unknown-b.bmp b/wps/UniCatcher/codec-unknown-b.bmp
deleted file mode 100644
index a1baa50400..0000000000
--- a/wps/UniCatcher/codec-unknown-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-unknown-g.bmp b/wps/UniCatcher/codec-unknown-g.bmp
deleted file mode 100644
index b548c9dca1..0000000000
--- a/wps/UniCatcher/codec-unknown-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-unknown.bmp b/wps/UniCatcher/codec-unknown.bmp
deleted file mode 100644
index 48f3f76ac4..0000000000
--- a/wps/UniCatcher/codec-unknown.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-wav-b.bmp b/wps/UniCatcher/codec-wav-b.bmp
deleted file mode 100644
index 0d9e675967..0000000000
--- a/wps/UniCatcher/codec-wav-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-wav-g.bmp b/wps/UniCatcher/codec-wav-g.bmp
deleted file mode 100644
index 1e7681774f..0000000000
--- a/wps/UniCatcher/codec-wav-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-wav.bmp b/wps/UniCatcher/codec-wav.bmp
deleted file mode 100644
index d70b0c7586..0000000000
--- a/wps/UniCatcher/codec-wav.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-wavpack-b.bmp b/wps/UniCatcher/codec-wavpack-b.bmp
deleted file mode 100644
index 515e2150fc..0000000000
--- a/wps/UniCatcher/codec-wavpack-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-wavpack-g.bmp b/wps/UniCatcher/codec-wavpack-g.bmp
deleted file mode 100644
index ace139f079..0000000000
--- a/wps/UniCatcher/codec-wavpack-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec-wavpack.bmp b/wps/UniCatcher/codec-wavpack.bmp
deleted file mode 100644
index bf20a1a71f..0000000000
--- a/wps/UniCatcher/codec-wavpack.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/codec.bmp b/wps/UniCatcher/codec.bmp
new file mode 100644
index 0000000000..13df8fcd00
--- /dev/null
+++ b/wps/UniCatcher/codec.bmp
Binary files differ
diff --git a/wps/UniCatcher/hold-b.bmp b/wps/UniCatcher/hold-b.bmp
new file mode 100644
index 0000000000..5d9b545981
--- /dev/null
+++ b/wps/UniCatcher/hold-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/hold-g.bmp b/wps/UniCatcher/hold-g.bmp
new file mode 100644
index 0000000000..4c0d3873fa
--- /dev/null
+++ b/wps/UniCatcher/hold-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/hold-s.bmp b/wps/UniCatcher/hold-s.bmp
index 6b2b42acb8..9d0d446235 100644
--- a/wps/UniCatcher/hold-s.bmp
+++ b/wps/UniCatcher/hold-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/hold.bmp b/wps/UniCatcher/hold.bmp
new file mode 100644
index 0000000000..48183fe64f
--- /dev/null
+++ b/wps/UniCatcher/hold.bmp
Binary files differ
diff --git a/wps/UniCatcher/hold0-b.bmp b/wps/UniCatcher/hold0-b.bmp
deleted file mode 100644
index f4663acc4c..0000000000
--- a/wps/UniCatcher/hold0-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/hold0.bmp b/wps/UniCatcher/hold0.bmp
deleted file mode 100644
index 8112299d19..0000000000
--- a/wps/UniCatcher/hold0.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdboth-b.bmp b/wps/UniCatcher/holdboth-b.bmp
deleted file mode 100644
index 12c8b536fa..0000000000
--- a/wps/UniCatcher/holdboth-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdboth-g.bmp b/wps/UniCatcher/holdboth-g.bmp
deleted file mode 100644
index 236c29db53..0000000000
--- a/wps/UniCatcher/holdboth-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdboth-s.bmp b/wps/UniCatcher/holdboth-s.bmp
deleted file mode 100644
index 2461602a86..0000000000
--- a/wps/UniCatcher/holdboth-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdboth.bmp b/wps/UniCatcher/holdboth.bmp
deleted file mode 100644
index a8c71b3fd5..0000000000
--- a/wps/UniCatcher/holdboth.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdmain-b.bmp b/wps/UniCatcher/holdmain-b.bmp
deleted file mode 100644
index 7cc056c5cb..0000000000
--- a/wps/UniCatcher/holdmain-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdmain-g.bmp b/wps/UniCatcher/holdmain-g.bmp
deleted file mode 100644
index 5fdf153458..0000000000
--- a/wps/UniCatcher/holdmain-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdmain-s.bmp b/wps/UniCatcher/holdmain-s.bmp
deleted file mode 100644
index 9e2532bcd6..0000000000
--- a/wps/UniCatcher/holdmain-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdmain.bmp b/wps/UniCatcher/holdmain.bmp
deleted file mode 100644
index 048731e645..0000000000
--- a/wps/UniCatcher/holdmain.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdremote-b.bmp b/wps/UniCatcher/holdremote-b.bmp
deleted file mode 100644
index 0364024eee..0000000000
--- a/wps/UniCatcher/holdremote-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdremote-g.bmp b/wps/UniCatcher/holdremote-g.bmp
deleted file mode 100644
index 0ed1a983f5..0000000000
--- a/wps/UniCatcher/holdremote-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdremote-s.bmp b/wps/UniCatcher/holdremote-s.bmp
deleted file mode 100644
index 5cefc290d5..0000000000
--- a/wps/UniCatcher/holdremote-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/holdremote.bmp b/wps/UniCatcher/holdremote.bmp
deleted file mode 100644
index d6c13a8c00..0000000000
--- a/wps/UniCatcher/holdremote.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/line1-112.bmp b/wps/UniCatcher/line1-112.bmp
deleted file mode 100644
index d8306dfb96..0000000000
--- a/wps/UniCatcher/line1-112.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/line2-112.bmp b/wps/UniCatcher/line2-112.bmp
deleted file mode 100644
index c9a26017f3..0000000000
--- a/wps/UniCatcher/line2-112.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-fforward-b.bmp b/wps/UniCatcher/pb-fforward-b.bmp
deleted file mode 100644
index ccddcf2db1..0000000000
--- a/wps/UniCatcher/pb-fforward-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-fforward-g.bmp b/wps/UniCatcher/pb-fforward-g.bmp
deleted file mode 100644
index ca9dda8a13..0000000000
--- a/wps/UniCatcher/pb-fforward-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-fforward-s.bmp b/wps/UniCatcher/pb-fforward-s.bmp
deleted file mode 100644
index 267cc214e7..0000000000
--- a/wps/UniCatcher/pb-fforward-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-fforward.bmp b/wps/UniCatcher/pb-fforward.bmp
deleted file mode 100644
index 61f8a510a3..0000000000
--- a/wps/UniCatcher/pb-fforward.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-pause-b.bmp b/wps/UniCatcher/pb-pause-b.bmp
deleted file mode 100644
index 2344361229..0000000000
--- a/wps/UniCatcher/pb-pause-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-pause-g.bmp b/wps/UniCatcher/pb-pause-g.bmp
deleted file mode 100644
index 73aa0953c4..0000000000
--- a/wps/UniCatcher/pb-pause-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-pause-s.bmp b/wps/UniCatcher/pb-pause-s.bmp
deleted file mode 100644
index 35b004732c..0000000000
--- a/wps/UniCatcher/pb-pause-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-pause.bmp b/wps/UniCatcher/pb-pause.bmp
deleted file mode 100644
index dc0f4059d3..0000000000
--- a/wps/UniCatcher/pb-pause.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-play-b.bmp b/wps/UniCatcher/pb-play-b.bmp
deleted file mode 100644
index 8c1d2f78d3..0000000000
--- a/wps/UniCatcher/pb-play-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-play-g.bmp b/wps/UniCatcher/pb-play-g.bmp
deleted file mode 100644
index 3f1ea52925..0000000000
--- a/wps/UniCatcher/pb-play-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-play-s.bmp b/wps/UniCatcher/pb-play-s.bmp
deleted file mode 100644
index 0259fc0fae..0000000000
--- a/wps/UniCatcher/pb-play-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-play.bmp b/wps/UniCatcher/pb-play.bmp
deleted file mode 100644
index 16c4bc9de5..0000000000
--- a/wps/UniCatcher/pb-play.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-rewind-b.bmp b/wps/UniCatcher/pb-rewind-b.bmp
deleted file mode 100644
index 6c1293b067..0000000000
--- a/wps/UniCatcher/pb-rewind-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-rewind-g.bmp b/wps/UniCatcher/pb-rewind-g.bmp
deleted file mode 100644
index cfe567404f..0000000000
--- a/wps/UniCatcher/pb-rewind-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-rewind-s.bmp b/wps/UniCatcher/pb-rewind-s.bmp
deleted file mode 100644
index a945204909..0000000000
--- a/wps/UniCatcher/pb-rewind-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/pb-rewind.bmp b/wps/UniCatcher/pb-rewind.bmp
deleted file mode 100644
index 993717b4f8..0000000000
--- a/wps/UniCatcher/pb-rewind.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/playmode-b.bmp b/wps/UniCatcher/playmode-b.bmp
new file mode 100644
index 0000000000..fd6233a943
--- /dev/null
+++ b/wps/UniCatcher/playmode-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/playmode-g.bmp b/wps/UniCatcher/playmode-g.bmp
new file mode 100644
index 0000000000..3e890d2527
--- /dev/null
+++ b/wps/UniCatcher/playmode-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/playmode-s.bmp b/wps/UniCatcher/playmode-s.bmp
new file mode 100644
index 0000000000..de06a250ba
--- /dev/null
+++ b/wps/UniCatcher/playmode-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/playmode.bmp b/wps/UniCatcher/playmode.bmp
new file mode 100644
index 0000000000..a3c5450976
--- /dev/null
+++ b/wps/UniCatcher/playmode.bmp
Binary files differ
diff --git a/wps/UniCatcher/repeat-b.bmp b/wps/UniCatcher/repeat-b.bmp
new file mode 100644
index 0000000000..384f374dc2
--- /dev/null
+++ b/wps/UniCatcher/repeat-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/repeat-g.bmp b/wps/UniCatcher/repeat-g.bmp
new file mode 100644
index 0000000000..e127e0c5cd
--- /dev/null
+++ b/wps/UniCatcher/repeat-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/repeat-s.bmp b/wps/UniCatcher/repeat-s.bmp
new file mode 100644
index 0000000000..78dd2c2a2b
--- /dev/null
+++ b/wps/UniCatcher/repeat-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/repeat.bmp b/wps/UniCatcher/repeat.bmp
new file mode 100644
index 0000000000..04036dc65c
--- /dev/null
+++ b/wps/UniCatcher/repeat.bmp
Binary files differ
diff --git a/wps/UniCatcher/repeat0-b.bmp b/wps/UniCatcher/repeat0-b.bmp
deleted file mode 100644
index 1914e6a0dc..0000000000
--- a/wps/UniCatcher/repeat0-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeat0.bmp b/wps/UniCatcher/repeat0.bmp
deleted file mode 100644
index 7b7a2ddb4a..0000000000
--- a/wps/UniCatcher/repeat0.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeata-b-b.bmp b/wps/UniCatcher/repeata-b-b.bmp
deleted file mode 100644
index d9a5f5a598..0000000000
--- a/wps/UniCatcher/repeata-b-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeata-b-g.bmp b/wps/UniCatcher/repeata-b-g.bmp
deleted file mode 100644
index 61e2611bd7..0000000000
--- a/wps/UniCatcher/repeata-b-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeata-b-s.bmp b/wps/UniCatcher/repeata-b-s.bmp
deleted file mode 100644
index 26c6c82cfa..0000000000
--- a/wps/UniCatcher/repeata-b-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeata-b.bmp b/wps/UniCatcher/repeata-b.bmp
deleted file mode 100644
index edbd1756af..0000000000
--- a/wps/UniCatcher/repeata-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatall-b.bmp b/wps/UniCatcher/repeatall-b.bmp
deleted file mode 100644
index c7cb4efdf6..0000000000
--- a/wps/UniCatcher/repeatall-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatall-g.bmp b/wps/UniCatcher/repeatall-g.bmp
deleted file mode 100644
index 9ada6fb3c3..0000000000
--- a/wps/UniCatcher/repeatall-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatall-s.bmp b/wps/UniCatcher/repeatall-s.bmp
deleted file mode 100644
index 565484111a..0000000000
--- a/wps/UniCatcher/repeatall-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatall.bmp b/wps/UniCatcher/repeatall.bmp
deleted file mode 100644
index f22daa0a13..0000000000
--- a/wps/UniCatcher/repeatall.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatone-b.bmp b/wps/UniCatcher/repeatone-b.bmp
deleted file mode 100644
index 09dd2d6f33..0000000000
--- a/wps/UniCatcher/repeatone-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatone-g.bmp b/wps/UniCatcher/repeatone-g.bmp
deleted file mode 100644
index 4166ec8f68..0000000000
--- a/wps/UniCatcher/repeatone-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatone-s.bmp b/wps/UniCatcher/repeatone-s.bmp
deleted file mode 100644
index 67f60d97ec..0000000000
--- a/wps/UniCatcher/repeatone-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatone.bmp b/wps/UniCatcher/repeatone.bmp
deleted file mode 100644
index 068230ce80..0000000000
--- a/wps/UniCatcher/repeatone.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatshuffle-b.bmp b/wps/UniCatcher/repeatshuffle-b.bmp
deleted file mode 100644
index 05a24551b4..0000000000
--- a/wps/UniCatcher/repeatshuffle-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatshuffle-g.bmp b/wps/UniCatcher/repeatshuffle-g.bmp
deleted file mode 100644
index 25dffbd7a5..0000000000
--- a/wps/UniCatcher/repeatshuffle-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatshuffle-s.bmp b/wps/UniCatcher/repeatshuffle-s.bmp
deleted file mode 100644
index d539c1878d..0000000000
--- a/wps/UniCatcher/repeatshuffle-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/repeatshuffle.bmp b/wps/UniCatcher/repeatshuffle.bmp
deleted file mode 100644
index 74391b8d58..0000000000
--- a/wps/UniCatcher/repeatshuffle.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle-b.bmp b/wps/UniCatcher/shuffle-b.bmp
new file mode 100644
index 0000000000..6dc3613c45
--- /dev/null
+++ b/wps/UniCatcher/shuffle-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/shuffle-g.bmp b/wps/UniCatcher/shuffle-g.bmp
new file mode 100644
index 0000000000..de51aadc53
--- /dev/null
+++ b/wps/UniCatcher/shuffle-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/shuffle-s.bmp b/wps/UniCatcher/shuffle-s.bmp
new file mode 100644
index 0000000000..e43ae93c91
--- /dev/null
+++ b/wps/UniCatcher/shuffle-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/shuffle.bmp b/wps/UniCatcher/shuffle.bmp
new file mode 100644
index 0000000000..f09c0bd098
--- /dev/null
+++ b/wps/UniCatcher/shuffle.bmp
Binary files differ
diff --git a/wps/UniCatcher/shuffle0-b.bmp b/wps/UniCatcher/shuffle0-b.bmp
deleted file mode 100644
index f1f7cac88c..0000000000
--- a/wps/UniCatcher/shuffle0-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle0-g.bmp b/wps/UniCatcher/shuffle0-g.bmp
deleted file mode 100644
index 9595058cb5..0000000000
--- a/wps/UniCatcher/shuffle0-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle0-s.bmp b/wps/UniCatcher/shuffle0-s.bmp
deleted file mode 100644
index 04053099ba..0000000000
--- a/wps/UniCatcher/shuffle0-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle0.bmp b/wps/UniCatcher/shuffle0.bmp
deleted file mode 100644
index d2493eda50..0000000000
--- a/wps/UniCatcher/shuffle0.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle1-b.bmp b/wps/UniCatcher/shuffle1-b.bmp
deleted file mode 100644
index 765c5e360f..0000000000
--- a/wps/UniCatcher/shuffle1-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle1-g.bmp b/wps/UniCatcher/shuffle1-g.bmp
deleted file mode 100644
index 4e4bf03111..0000000000
--- a/wps/UniCatcher/shuffle1-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle1-s.bmp b/wps/UniCatcher/shuffle1-s.bmp
deleted file mode 100644
index 736876e52e..0000000000
--- a/wps/UniCatcher/shuffle1-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/shuffle1.bmp b/wps/UniCatcher/shuffle1.bmp
deleted file mode 100644
index 90e6a4f086..0000000000
--- a/wps/UniCatcher/shuffle1.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/upbar-138.bmp b/wps/UniCatcher/upbar-138.bmp
deleted file mode 100644
index 5d6ca1ecbb..0000000000
--- a/wps/UniCatcher/upbar-138.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/upbar-160.bmp b/wps/UniCatcher/upbar-160.bmp
deleted file mode 100644
index daaab2daa6..0000000000
--- a/wps/UniCatcher/upbar-160.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol0-b.bmp b/wps/UniCatcher/vol0-b.bmp
deleted file mode 100644
index 5a7834e585..0000000000
--- a/wps/UniCatcher/vol0-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol0-g.bmp b/wps/UniCatcher/vol0-g.bmp
deleted file mode 100644
index 830d9b6adf..0000000000
--- a/wps/UniCatcher/vol0-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol0-s.bmp b/wps/UniCatcher/vol0-s.bmp
deleted file mode 100644
index 4658a37a2e..0000000000
--- a/wps/UniCatcher/vol0-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol0.bmp b/wps/UniCatcher/vol0.bmp
deleted file mode 100644
index be7c0e4309..0000000000
--- a/wps/UniCatcher/vol0.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol1-b.bmp b/wps/UniCatcher/vol1-b.bmp
deleted file mode 100644
index 9a7f044c2f..0000000000
--- a/wps/UniCatcher/vol1-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol1-g.bmp b/wps/UniCatcher/vol1-g.bmp
deleted file mode 100644
index e7f9308222..0000000000
--- a/wps/UniCatcher/vol1-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol1-s.bmp b/wps/UniCatcher/vol1-s.bmp
deleted file mode 100644
index 31c6be6325..0000000000
--- a/wps/UniCatcher/vol1-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol1.bmp b/wps/UniCatcher/vol1.bmp
deleted file mode 100644
index fe0e8ea78a..0000000000
--- a/wps/UniCatcher/vol1.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol2-b.bmp b/wps/UniCatcher/vol2-b.bmp
deleted file mode 100644
index dd317325c9..0000000000
--- a/wps/UniCatcher/vol2-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol2-g.bmp b/wps/UniCatcher/vol2-g.bmp
deleted file mode 100644
index ff6f437bd7..0000000000
--- a/wps/UniCatcher/vol2-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol2-s.bmp b/wps/UniCatcher/vol2-s.bmp
deleted file mode 100644
index 6ce8ab61af..0000000000
--- a/wps/UniCatcher/vol2-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol2.bmp b/wps/UniCatcher/vol2.bmp
deleted file mode 100644
index 29f65bc9b1..0000000000
--- a/wps/UniCatcher/vol2.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol3-b.bmp b/wps/UniCatcher/vol3-b.bmp
deleted file mode 100644
index 37d542fc31..0000000000
--- a/wps/UniCatcher/vol3-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol3-g.bmp b/wps/UniCatcher/vol3-g.bmp
deleted file mode 100644
index c7f0e5dffc..0000000000
--- a/wps/UniCatcher/vol3-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol3-s.bmp b/wps/UniCatcher/vol3-s.bmp
deleted file mode 100644
index 8d6694712c..0000000000
--- a/wps/UniCatcher/vol3-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol3.bmp b/wps/UniCatcher/vol3.bmp
deleted file mode 100644
index bc3fb537b2..0000000000
--- a/wps/UniCatcher/vol3.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol4-b.bmp b/wps/UniCatcher/vol4-b.bmp
deleted file mode 100644
index 8d8f4dedd7..0000000000
--- a/wps/UniCatcher/vol4-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol4-g.bmp b/wps/UniCatcher/vol4-g.bmp
deleted file mode 100644
index c2ea8518f6..0000000000
--- a/wps/UniCatcher/vol4-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol4-s.bmp b/wps/UniCatcher/vol4-s.bmp
deleted file mode 100644
index 6cbefe0169..0000000000
--- a/wps/UniCatcher/vol4-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol4.bmp b/wps/UniCatcher/vol4.bmp
deleted file mode 100644
index a3b49ac3ec..0000000000
--- a/wps/UniCatcher/vol4.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol5-b.bmp b/wps/UniCatcher/vol5-b.bmp
deleted file mode 100644
index d1e4ac9675..0000000000
--- a/wps/UniCatcher/vol5-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol5-g.bmp b/wps/UniCatcher/vol5-g.bmp
deleted file mode 100644
index b17141a792..0000000000
--- a/wps/UniCatcher/vol5-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol5-s.bmp b/wps/UniCatcher/vol5-s.bmp
deleted file mode 100644
index dc1bd9d76f..0000000000
--- a/wps/UniCatcher/vol5-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol5.bmp b/wps/UniCatcher/vol5.bmp
deleted file mode 100644
index 6d8c540f4f..0000000000
--- a/wps/UniCatcher/vol5.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol6-b.bmp b/wps/UniCatcher/vol6-b.bmp
deleted file mode 100644
index c77a044ab6..0000000000
--- a/wps/UniCatcher/vol6-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol6-g.bmp b/wps/UniCatcher/vol6-g.bmp
deleted file mode 100644
index 65dd206615..0000000000
--- a/wps/UniCatcher/vol6-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol6-s.bmp b/wps/UniCatcher/vol6-s.bmp
deleted file mode 100644
index 8cb0172f93..0000000000
--- a/wps/UniCatcher/vol6-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol6.bmp b/wps/UniCatcher/vol6.bmp
deleted file mode 100644
index 76296779d4..0000000000
--- a/wps/UniCatcher/vol6.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol7-b.bmp b/wps/UniCatcher/vol7-b.bmp
deleted file mode 100644
index d931993da9..0000000000
--- a/wps/UniCatcher/vol7-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol7-g.bmp b/wps/UniCatcher/vol7-g.bmp
deleted file mode 100644
index 9d43b37d59..0000000000
--- a/wps/UniCatcher/vol7-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol7-s.bmp b/wps/UniCatcher/vol7-s.bmp
deleted file mode 100644
index 17a1f295ef..0000000000
--- a/wps/UniCatcher/vol7-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol7.bmp b/wps/UniCatcher/vol7.bmp
deleted file mode 100644
index 179820ada6..0000000000
--- a/wps/UniCatcher/vol7.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol8-b.bmp b/wps/UniCatcher/vol8-b.bmp
deleted file mode 100644
index 7c91b5f713..0000000000
--- a/wps/UniCatcher/vol8-b.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol8-g.bmp b/wps/UniCatcher/vol8-g.bmp
deleted file mode 100644
index 6bcc9ce92a..0000000000
--- a/wps/UniCatcher/vol8-g.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol8-s.bmp b/wps/UniCatcher/vol8-s.bmp
deleted file mode 100644
index 602e531451..0000000000
--- a/wps/UniCatcher/vol8-s.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/vol8.bmp b/wps/UniCatcher/vol8.bmp
deleted file mode 100644
index 82a51077b2..0000000000
--- a/wps/UniCatcher/vol8.bmp
+++ /dev/null
Binary files differ
diff --git a/wps/UniCatcher/volume-b.bmp b/wps/UniCatcher/volume-b.bmp
new file mode 100644
index 0000000000..73d4c0fe0b
--- /dev/null
+++ b/wps/UniCatcher/volume-b.bmp
Binary files differ
diff --git a/wps/UniCatcher/volume-g.bmp b/wps/UniCatcher/volume-g.bmp
new file mode 100644
index 0000000000..175170befa
--- /dev/null
+++ b/wps/UniCatcher/volume-g.bmp
Binary files differ
diff --git a/wps/UniCatcher/volume-s.bmp b/wps/UniCatcher/volume-s.bmp
new file mode 100644
index 0000000000..b827998784
--- /dev/null
+++ b/wps/UniCatcher/volume-s.bmp
Binary files differ
diff --git a/wps/UniCatcher/volume.bmp b/wps/UniCatcher/volume.bmp
new file mode 100644
index 0000000000..d75f144522
--- /dev/null
+++ b/wps/UniCatcher/volume.bmp
Binary files differ