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
diff --git a/wps/UniCatcher.128x64x1.wps b/wps/UniCatcher.128x64x1.wps
index 4bbf5ca..7239811 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 8f64272..e6ef042 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 3083fce..51b987f 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 e1c5168..a8612ba 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 a3fddfa..0723621 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 63bd8d5..917e344 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 4ec8bd6..c0c79b5 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 43a9211..22ece3c 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 14bbe0d..3c7ae3e 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 913b485..0000000
--- 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 038e330..0000000
--- 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 355fb8d..0000000
--- 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 33a3c12..0000000
--- 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 102bc20..0000000
--- 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 d8afaa5..0000000
--- 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 5a1c4ee..0000000
--- 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 2fcaf72..0000000
--- 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 a553ce7..0000000
--- 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 662acd0..0000000
--- 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 8304137..0000000
--- 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 b4636c5..0000000
--- 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 c1a539d..0000000
--- 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 e2aa6e5..0000000
--- 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 7960ab5..0000000
--- 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 ed0268e..0000000
--- 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 39f447b..0000000
--- 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 9601560..0000000
--- 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 2ea42b2..0000000
--- 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 332a7cb..0000000
--- 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 26b0295..0000000
--- 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 03d4880..0000000
--- 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 7ee00ac..0000000
--- 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 1a10c85..0000000
--- 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 cc28e09..0000000
--- 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 ee81014..0000000
--- 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 35117db..0000000
--- 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 29751f1..0000000
--- 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 34bf59f..0000000
--- 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 cb535f0..0000000
--- 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 3a91a7b..0000000
--- 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 88c1595..0000000
--- 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 0000000..e73dbdb
--- /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 0000000..c0ba9f7
--- /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 0000000..4827ffa7
--- /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 0000000..1ae59cb
--- /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 ad71668..0000000
--- 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 c74cef6..0000000
--- 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 d50ff8e..0000000
--- 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 f3f138e..0000000
--- 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 b6d9e08..0000000
--- 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 0c7932e..0000000
--- 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 e22ffc7..0000000
--- 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 f5063d3..0000000
--- 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 5fe4982..0000000
--- 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 4d71774..0000000
--- 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 bca5538..0000000
--- 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 ab9fb06..0000000
--- 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 a5303f1..0000000
--- 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 c96c1bd..0000000
--- 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 ae2f97c..0000000
--- 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 ca09e41..0000000
--- 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 f581aae..0000000
--- 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 be62640..0000000
--- 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 1f5cf2a..0000000
--- 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 2131b79..0000000
--- 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 9e23095..0000000
--- 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 0000000..bda4d8e
--- /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 0000000..3c75a91
--- /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 0000000..56ccdb1
--- /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 0000000..1d5785e
--- /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 0000000..c333135
--- /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 b668ba2..0000000
--- 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 d347add..0000000
--- 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 476810b..0000000
--- 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 43cc8c5..0000000
--- 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 b907d3c..0000000
--- 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 9406fc6..0000000
--- 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 24a8b3b..0000000
--- 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 eeddb7e..0000000
--- 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 ddc11f8..0000000
--- 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 5677d09..0000000
--- 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 e4a9859..0000000
--- 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 5bdc6f0..0000000
--- 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 fe7dc6c..0000000
--- 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 89b0228..0000000
--- 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 0000000..b7f0573
--- /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 2d909df..0000000
--- 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 bf611d1..0000000
--- 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 1253c44..0000000
--- 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 0000000..cabb927
--- /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 05f521d..0000000
--- 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 50d42a6..0000000
--- 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 38dc778..0000000
--- 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 94db238..0000000
--- 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 5dd7f83..0000000
--- 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 cedc102..0000000
--- 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 e2ebc4f..0000000
--- 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 ecab90b..0000000
--- 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 52c6224..0000000
--- 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 82eddf6..0000000
--- 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 34abb5a..0000000
--- 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 4ac3ea7..0000000
--- 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 c8f731e..0000000
--- 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 62fc2dc..0000000
--- 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 6f013f0..0000000
--- 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 1ce5cc3..0000000
--- 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 bddd28d..0000000
--- 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 8ab0459..0000000
--- 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 a1baa50..0000000
--- 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 b548c9d..0000000
--- 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 48f3f76..0000000
--- 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 0d9e675..0000000
--- 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 1e76817..0000000
--- 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 d70b0c7..0000000
--- 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 515e215..0000000
--- 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 ace139f..0000000
--- 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 bf20a1a..0000000
--- 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 0000000..13df8fc
--- /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 0000000..5d9b545
--- /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 0000000..4c0d387
--- /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 6b2b42a..9d0d446 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 0000000..48183fe
--- /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 f4663ac..0000000
--- 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 8112299..0000000
--- 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 12c8b53..0000000
--- 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 236c29d..0000000
--- 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 2461602..0000000
--- 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 a8c71b3..0000000
--- 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 7cc056c..0000000
--- 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 5fdf153..0000000
--- 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 9e2532b..0000000
--- 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 048731e..0000000
--- 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 0364024..0000000
--- 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 0ed1a98..0000000
--- 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 5cefc29..0000000
--- 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 d6c13a8..0000000
--- 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 d8306df..0000000
--- 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 c9a2601..0000000
--- 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 ccddcf2..0000000
--- 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 ca9dda8..0000000
--- 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 267cc21..0000000
--- 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 61f8a51..0000000
--- 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 2344361..0000000
--- 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 73aa095..0000000
--- 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 35b0047..0000000
--- 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 dc0f405..0000000
--- 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 8c1d2f7..0000000
--- 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 3f1ea52..0000000
--- 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 0259fc0..0000000
--- 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 16c4bc9..0000000
--- 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 6c1293b..0000000
--- 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 cfe5674..0000000
--- 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 a945204..0000000
--- 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 993717b..0000000
--- 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 0000000..fd6233a
--- /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 0000000..3e890d2
--- /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 0000000..de06a25
--- /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 0000000..a3c5450
--- /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 0000000..384f374
--- /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 0000000..e127e0c
--- /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 0000000..78dd2c2
--- /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 0000000..04036dc
--- /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 1914e6a..0000000
--- 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 7b7a2dd..0000000
--- 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 d9a5f5a..0000000
--- 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 61e2611..0000000
--- 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 26c6c82..0000000
--- 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 edbd175..0000000
--- 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 c7cb4ef..0000000
--- 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 9ada6fb..0000000
--- 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 5654841..0000000
--- 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 f22daa0..0000000
--- 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 09dd2d6..0000000
--- 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 4166ec8..0000000
--- 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 67f60d9..0000000
--- 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 068230c..0000000
--- 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 05a2455..0000000
--- 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 25dffbd..0000000
--- 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 d539c18..0000000
--- 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 74391b8..0000000
--- 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 0000000..6dc3613
--- /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 0000000..de51aad
--- /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 0000000..e43ae93
--- /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 0000000..f09c0bd
--- /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 f1f7cac..0000000
--- 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 9595058..0000000
--- 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 0405309..0000000
--- 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 d2493ed..0000000
--- 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 765c5e3..0000000
--- 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 4e4bf03..0000000
--- 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 736876e..0000000
--- 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 90e6a4f..0000000
--- 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 5d6ca1e..0000000
--- 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 daaab2d..0000000
--- 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 5a7834e..0000000
--- 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 830d9b6..0000000
--- 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 4658a37..0000000
--- 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 be7c0e4..0000000
--- 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 9a7f044..0000000
--- 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 e7f9308..0000000
--- 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 31c6be6..0000000
--- 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 fe0e8ea..0000000
--- 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 dd31732..0000000
--- 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 ff6f437..0000000
--- 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 6ce8ab6..0000000
--- 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 29f65bc..0000000
--- 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 37d542f..0000000
--- 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 c7f0e5d..0000000
--- 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 8d66947..0000000
--- 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 bc3fb53..0000000
--- 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 8d8f4de..0000000
--- 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 c2ea851..0000000
--- 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 6cbefe0..0000000
--- 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 a3b49ac..0000000
--- 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 d1e4ac9..0000000
--- 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 b17141a..0000000
--- 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 dc1bd9d..0000000
--- 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 6d8c540..0000000
--- 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 c77a044..0000000
--- 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 65dd206..0000000
--- 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 8cb0172..0000000
--- 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 7629677..0000000
--- 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 d931993..0000000
--- 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 9d43b37..0000000
--- 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 17a1f29..0000000
--- 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 179820a..0000000
--- 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 7c91b5f..0000000
--- 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 6bcc9ce..0000000
--- 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 602e531..0000000
--- 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 82a5107..0000000
--- 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 0000000..73d4c0f
--- /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 0000000..175170b
--- /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 0000000..b827998
--- /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 0000000..d75f144
--- /dev/null
+++ b/wps/UniCatcher/volume.bmp
Binary files differ