185 files changed, 62 insertions, 190 deletions

diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index 1bddf1f905..303147bdf4 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -4,38 +4,12 @@
 %wd
 %X|wpsbackdrop-128x128x16.bmp|
 %P|pb-128x128x16.bmp|
-%xl|A|lockclosed-128x128x16.bmp|3|110|
-%xl|B|lockopen-128x128x16.bmp|3|110|
-%xl|C|battpl-128x128x16.bmp|23|110|
-%xl|D|battch-128x128x16.bmp|23|110|
-%xl|E|batt00-128x128x16.bmp|23|110|
-%xl|F|batt01-128x128x16.bmp|23|110|
-%xl|G|batt02-128x128x16.bmp|23|110|
-%xl|H|batt03-128x128x16.bmp|23|110|
-%xl|I|batt04-128x128x16.bmp|23|110|
-%xl|J|batt05-128x128x16.bmp|23|110|
-%xl|K|batt06-128x128x16.bmp|23|110|
-%xl|L|batt07-128x128x16.bmp|23|110|
-%xl|M|vol0-128x128x16.bmp|51|110|
-%xl|N|vol1-128x128x16.bmp|51|110|
-%xl|O|vol2-128x128x16.bmp|51|110|
-%xl|P|vol3-128x128x16.bmp|51|110|
-%xl|Q|vol4-128x128x16.bmp|51|110|
-%xl|b|vol5-128x128x16.bmp|51|110|
-%xl|c|vol6-128x128x16.bmp|51|110|
-%xl|d|vol7-128x128x16.bmp|51|110|
-%xl|e|vol8-128x128x16.bmp|51|110|
-%xl|f|vol9-128x128x16.bmp|51|110|
-%xl|R|shuffle-128x128x16.bmp|74|110|
-%xl|S|repeatall-128x128x16.bmp|97|110|
-%xl|T|repeatone-128x128x16.bmp|97|110|
-%xl|U|repeatshuffle-128x128x16.bmp|97|110|
-%xl|V|repeatab-128x128x16.bmp|97|110|
-%xl|W|stop-128x128x16.bmp|111|110|
-%xl|X|play-128x128x16.bmp|111|110|
-%xl|Y|pause-128x128x16.bmp|111|110|
-%xl|Z|ff-128x128x16.bmp|111|110|
-%xl|a|rew-128x128x16.bmp|111|110|
+%xl|A|lockclosed-128x128x16.bmp|3|110|2|
+%xl|B|battery-128x128x16.bmp|23|110|10|
+%xl|C|volume-128x128x16.bmp|51|110|10|
+%xl|D|shuffle-128x128x16.bmp|74|110|
+%xl|E|repeat-128x128x16.bmp|97|110|4|
+%xl|F|playmode-128x128x16.bmp|111|110|5|
 %Cl|4|12|s60|s60|
 %pb|6|3|125|87|
 #NowPlaying
@@ -48,10 +22,10 @@
 
 %al %pc%ac%pp of %pe%ar%pr 
 
-%?mh<%xdA|%xdB>
-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdP|%xdQ|%xdb|%xdc|%xdd|%xde|%xdf>
-%?ps<%xdR>
-%?mm<|%xdS|%xdT|%xdU|%xdV>
-%?mp<%xdW|%xdX|%xdY|%xdZ|%xda>
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
 %?C<%C>
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 272b1e4829..2b0caed4fb 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -3,38 +3,12 @@
 %wd
 %X|wpsbackdrop-132x80x16.bmp|
 %P|pb-132x80x16.bmp|
-%xl|A|lockclosed-132x80x16.bmp|36|69|
-%xl|B|lockopen-132x80x16.bmp|36|69|
-%xl|C|battpl-132x80x16.bmp|51|69|
-%xl|D|battch-132x80x16.bmp|51|69|
-%xl|E|batt00-132x80x16.bmp|51|69|
-%xl|F|batt01-132x80x16.bmp|51|69|
-%xl|G|batt02-132x80x16.bmp|51|69|
-%xl|H|batt03-132x80x16.bmp|51|69|
-%xl|I|batt04-132x80x16.bmp|51|69|
-%xl|J|batt05-132x80x16.bmp|51|69|
-%xl|K|batt06-132x80x16.bmp|51|69|
-%xl|L|batt07-132x80x16.bmp|51|69|
-%xl|M|vol0-132x80x16.bmp|69|69|
-%xl|N|vol1-132x80x16.bmp|69|69|
-%xl|O|vol2-132x80x16.bmp|69|69|
-%xl|P|vol3-132x80x16.bmp|69|69|
-%xl|Q|shuffle-132x80x16.bmp|86|69|
-%xl|R|repeatall-132x80x16.bmp|105|67|
-%xl|S|repeatone-132x80x16.bmp|105|67|
-%xl|T|repeatshuffle-132x80x16.bmp|105|67|
-%xl|U|repeatab-132x80x16.bmp|105|67|
-%xl|V|stop-132x80x16.bmp|118|67|
-%xl|W|play-132x80x16.bmp|118|67|
-%xl|X|pause-132x80x16.bmp|118|67|
-%xl|Y|ff-132x80x16.bmp|118|67|
-%xl|Z|rew-132x80x16.bmp|118|67|
-%xl|a|vol4-132x80x16.bmp|69|69|
-%xl|b|vol5-132x80x16.bmp|69|69|
-%xl|c|vol6-132x80x16.bmp|69|69|
-%xl|d|vol7-132x80x16.bmp|69|69|
-%xl|e|vol8-132x80x16.bmp|69|69|
-%xl|f|vol9-132x80x16.bmp|69|69|
+%xl|A|lock-132x80x16.bmp|36|69|2|
+%xl|B|battery-132x80x16.bmp|51|69|10|
+%xl|C|volume-132x80x16.bmp|69|69|10|
+%xl|D|shuffle-132x80x16.bmp|86|69|
+%xl|E|repeat-132x80x16.bmp|105|67|4|
+%xl|F|playmode-132x80x16.bmp|118|67|5|
 %Cl|3|14|c40|c40|
 %pb|6|2|129|58|
 #NowPlaying
@@ -42,10 +16,10 @@
 %?C<%s%m|48|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<%s%m|48|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 %?C<%s%m|48|%alNext: %?It<%It|%Fn>|%s%acNext: %?It<%It|%Fn>>
-%?mh<%xdA|%xdB>
-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdP|%xda|%xdb|%xdc|%xdd|%xde|%xdf>
-%?ps<%xdQ>
-%?mm<|%xdR|%xdS|%xdT|%xdU>
-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
-%?C<%C>
\ No newline at end of file
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?C<%C>
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 456f5e311b..93a207bc10 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -5,38 +5,12 @@
 %wd
 %P|pb-176x132x16.bmp|
 %X|wpsbackdrop-176x132x16.bmp|
-%xl|A|lockclosed-176x132x16.bmp|65|116|
-%xl|B|lockopen-176x132x16.bmp|65|116|
-%xl|C|battpl-176x132x16.bmp|83|117|
-%xl|D|battch-176x132x16.bmp|83|117|
-%xl|E|batt00-176x132x16.bmp|83|117|
-%xl|F|batt01-176x132x16.bmp|83|117|
-%xl|G|batt02-176x132x16.bmp|83|117|
-%xl|H|batt03-176x132x16.bmp|83|117|
-%xl|I|batt04-176x132x16.bmp|83|117|
-%xl|J|batt05-176x132x16.bmp|83|117|
-%xl|K|batt06-176x132x16.bmp|83|117|
-%xl|L|batt07-176x132x16.bmp|83|117|
-%xl|M|vol0-176x132x16.bmp|102|117|
-%xl|N|vol1-176x132x16.bmp|102|117|
-%xl|O|vol2-176x132x16.bmp|102|117|
-%xl|P|vol3-176x132x16.bmp|102|117|
-%xl|Q|shuffle-176x132x16.bmp|120|117|
-%xl|R|repeatall-176x132x16.bmp|139|113|
-%xl|S|repeatone-176x132x16.bmp|139|113|
-%xl|T|repeatshuffle-176x132x16.bmp|139|113|
-%xl|U|repeatab-176x132x16.bmp|139|113|
-%xl|V|stop-176x132x16.bmp|156|115|
-%xl|W|play-176x132x16.bmp|156|115|
-%xl|X|pause-176x132x16.bmp|156|115|
-%xl|Y|ff-176x132x16.bmp|156|115|
-%xl|Z|rew-176x132x16.bmp|156|115|
-%xl|a|vol4-176x132x16.bmp|102|117|
-%xl|b|vol5-176x132x16.bmp|102|117|
-%xl|c|vol6-176x132x16.bmp|102|117|
-%xl|d|vol7-176x132x16.bmp|102|117|
-%xl|e|vol8-176x132x16.bmp|102|117|
-%xl|f|vol9-176x132x16.bmp|102|117|
+%xl|A|lock-176x132x16.bmp|65|116|2|
+%xl|B|battery-176x132x16.bmp|83|117|10|
+%xl|C|volume-176x132x16.bmp|102|117|10|
+%xl|D|shuffle-176x132x16.bmp|120|117|
+%xl|E|repeat-176x132x16.bmp|139|113|4|
+%xl|F|playmode-176x132x16.bmp|156|115|5|
 %Cl|9|16|s65|s65|
 %pb|8|8|168|86|
 #NowPlaying
@@ -48,8 +22,10 @@
 %?C<%s%m|81|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
 
 %al   %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr   
-%?mh<%xdA|%xdB>
-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdP|%xda|%xdb|%xdc|%xdd|%xde|%xdf>%?ps<%xdQ>
-%?mm<|%xdR|%xdS|%xdT|%xdU>
-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>%?C<%C>
\ No newline at end of file
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?C<%C>
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 4abd52f9b8..042ffcdf01 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -3,38 +3,12 @@
 %wd
 %X|wpsbackdrop-176x220x16.bmp|
 %P|pb-176x220x16.bmp|
-%xl|A|lockclosed-176x220x16.bmp|51|204|
-%xl|B|lockopen-176x220x16.bmp|51|204|
-%xl|C|battpl-176x220x16.bmp|73|206|
-%xl|D|battch-176x220x16.bmp|73|206|
-%xl|E|batt00-176x220x16.bmp|73|206|
-%xl|F|batt01-176x220x16.bmp|73|206|
-%xl|G|batt02-176x220x16.bmp|73|206|
-%xl|H|batt03-176x220x16.bmp|73|206|
-%xl|I|batt04-176x220x16.bmp|73|206|
-%xl|J|batt05-176x220x16.bmp|73|206|
-%xl|K|batt06-176x220x16.bmp|73|206|
-%xl|L|batt07-176x220x16.bmp|73|206|
-%xl|M|vol0-176x220x16.bmp|97|206|
-%xl|N|vol1-176x220x16.bmp|97|206|
-%xl|O|vol2-176x220x16.bmp|97|206|
-%xl|o|vol3-176x220x16.bmp|97|206|
-%xl|P|vol4-176x220x16.bmp|97|206|
-%xl|a|vol5-176x220x16.bmp|97|206|
-%xl|b|vol6-176x220x16.bmp|97|206|
-%xl|c|vol7-176x220x16.bmp|97|206|
-%xl|d|vol8-176x220x16.bmp|97|206|
-%xl|e|vol9-176x220x16.bmp|97|206|
-%xl|Q|shuffle-176x220x16.bmp|119|207|
-%xl|R|repeatall-176x220x16.bmp|144|204|
-%xl|S|repeatone-176x220x16.bmp|144|204|
-%xl|T|repeatshuffle-176x220x16.bmp|144|204|
-%xl|U|repeatab-176x220x16.bmp|144|204|
-%xl|V|stop-176x220x16.bmp|159|204|
-%xl|W|play-176x220x16.bmp|159|204|
-%xl|X|pause-176x220x16.bmp|159|204|
-%xl|Y|ff-176x220x16.bmp|159|204|
-%xl|Z|rew-176x220x16.bmp|159|204|
+%xl|A|lock-176x220x16.bmp|51|204|2|
+%xl|B|battery-176x220x16.bmp|73|206|10|
+%xl|C|volume-176x220x16.bmp|97|206|10|
+%xl|D|shuffle-176x220x16.bmp|119|207|
+%xl|E|repeat-176x220x16.bmp|144|204|4|
+%xl|F|playmode-176x220x16.bmp|159|204|5|
 %Cl|29|20|c120|c120|
 %pb|8|5|171|182|
 #NowPlaying
@@ -54,10 +28,10 @@
 %?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|>
 
 %al    %pc%ac%pp of %pe%ar%pr   
-%?mh<%xdA|%xdB>
-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdo|%xdP|%xda|%xdb|%xdc|%xdd|%xde>
-%?ps<%xdQ>
-%?mm<|%xdR|%xdS|%xdT|%xdU>
-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
 %?C<%C>
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index 48d751cf40..43aab4742a 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -4,38 +4,12 @@
 %wd

 %X|wpsbackdrop-320x240x16.bmp|

 %P|pb-320x240x16.bmp|

-%xl|A|lockclosed-320x240x16.bmp|91|207|

-%xl|B|lockopen-320x240x16.bmp|91|207|

-%xl|C|battpl-320x240x16.bmp|126|207|

-%xl|D|battch-320x240x16.bmp|126|207|

-%xl|E|batt00-320x240x16.bmp|126|207|

-%xl|F|batt01-320x240x16.bmp|126|207|

-%xl|G|batt02-320x240x16.bmp|126|207|

-%xl|H|batt03-320x240x16.bmp|126|207|

-%xl|I|batt04-320x240x16.bmp|126|207|

-%xl|J|batt05-320x240x16.bmp|126|207|

-%xl|K|batt06-320x240x16.bmp|126|207|

-%xl|L|batt07-320x240x16.bmp|126|207|

-%xl|M|vol0-320x240x16.bmp|177|207|

-%xl|N|vol1-320x240x16.bmp|177|207|

-%xl|O|vol2-320x240x16.bmp|177|207|

-%xl|P|vol3-320x240x16.bmp|177|207|

-%xl|Q|vol4-320x240x16.bmp|177|207|

-%xl|b|vol5-320x240x16.bmp|177|207|

-%xl|c|vol6-320x240x16.bmp|177|207|

-%xl|d|vol7-320x240x16.bmp|177|207|

-%xl|e|vol8-320x240x16.bmp|177|207|

-%xl|f|vol9-320x240x16.bmp|177|207|

-%xl|R|shuffle-320x240x16.bmp|218|211|

-%xl|S|repeatall-320x240x16.bmp|261|207|

-%xl|T|repeatone-320x240x16.bmp|261|207|

-%xl|U|repeatshuffle-320x240x16.bmp|261|207|

-%xl|V|repeatab-320x240x16.bmp|261|207|

-%xl|W|stop-320x240x16.bmp|286|207|

-%xl|X|play-320x240x16.bmp|286|207|

-%xl|Y|pause-320x240x16.bmp|286|207|

-%xl|Z|ff-320x240x16.bmp|286|207|

-%xl|a|rew-320x240x16.bmp|286|207|

+%xl|A|lock-320x240x16.bmp|91|207|2|

+%xl|B|battery-320x240x16.bmp|126|207|10|

+%xl|C|volume-320x240x16.bmp|177|207|10|

+%xl|D|shuffle-320x240x16.bmp|218|211|

+%xl|E|repeat-320x240x16.bmp|261|207|4|

+%xl|F|playmode-320x240x16.bmp|286|207|5|

 %Cl|16|32|s120|s120|

 %pb|15|10|310|162|

 #NowPlaying

@@ -52,10 +26,10 @@
 

 %al   %pc%ac%pp of %pe%ar%pr   

 

-%?mh<%xdA|%xdB>

-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>

-%?pv<%xdM|%xdN|%xdO|%xdP|%xdQ|%xdb|%xdc|%xdd|%xde|%xdf>

-%?ps<%xdR>

-%?mm<|%xdS|%xdT|%xdU|%xdV>

-%?mp<%xdW|%xdX|%xdY|%xdZ|%xda>

+%?mh<%xdAa|%xdAb>

+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>

+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>

+%?ps<%xdD>

+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>

+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>

 %?C<%C>

diff --git a/wps/cabbiev2/batt00-128x128x16.bmp b/wps/cabbiev2/batt00-128x128x16.bmp
deleted file mode 100644
index 0db270acf9..0000000000
--- a/wps/cabbiev2/batt00-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt00-132x80x16.bmp b/wps/cabbiev2/batt00-132x80x16.bmp
deleted file mode 100644
index b10583f4d0..0000000000
--- a/wps/cabbiev2/batt00-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt00-176x132x16.bmp b/wps/cabbiev2/batt00-176x132x16.bmp
deleted file mode 100644
index b10583f4d0..0000000000
--- a/wps/cabbiev2/batt00-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt00-176x220x16.bmp b/wps/cabbiev2/batt00-176x220x16.bmp
deleted file mode 100644
index 0e1f83f9c7..0000000000
--- a/wps/cabbiev2/batt00-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt00-320x240x16.bmp b/wps/cabbiev2/batt00-320x240x16.bmp
deleted file mode 100644
index 3c7bad30ac..0000000000
--- a/wps/cabbiev2/batt00-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-128x128x16.bmp b/wps/cabbiev2/batt01-128x128x16.bmp
deleted file mode 100644
index f169ae946e..0000000000
--- a/wps/cabbiev2/batt01-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-132x80x16.bmp b/wps/cabbiev2/batt01-132x80x16.bmp
deleted file mode 100644
index b03bfd6a6a..0000000000
--- a/wps/cabbiev2/batt01-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-176x132x16.bmp b/wps/cabbiev2/batt01-176x132x16.bmp
deleted file mode 100644
index b03bfd6a6a..0000000000
--- a/wps/cabbiev2/batt01-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-176x220x16.bmp b/wps/cabbiev2/batt01-176x220x16.bmp
deleted file mode 100644
index 4478ff1ccf..0000000000
--- a/wps/cabbiev2/batt01-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-320x240x16.bmp b/wps/cabbiev2/batt01-320x240x16.bmp
deleted file mode 100644
index d76460c880..0000000000
--- a/wps/cabbiev2/batt01-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-128x128x16.bmp b/wps/cabbiev2/batt02-128x128x16.bmp
deleted file mode 100644
index 45a6704d2f..0000000000
--- a/wps/cabbiev2/batt02-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-132x80x16.bmp b/wps/cabbiev2/batt02-132x80x16.bmp
deleted file mode 100644
index 8db5d61e14..0000000000
--- a/wps/cabbiev2/batt02-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-176x132x16.bmp b/wps/cabbiev2/batt02-176x132x16.bmp
deleted file mode 100644
index 8db5d61e14..0000000000
--- a/wps/cabbiev2/batt02-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-176x220x16.bmp b/wps/cabbiev2/batt02-176x220x16.bmp
deleted file mode 100644
index b94c9a2b6e..0000000000
--- a/wps/cabbiev2/batt02-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-320x240x16.bmp b/wps/cabbiev2/batt02-320x240x16.bmp
deleted file mode 100644
index f3cd877f2f..0000000000
--- a/wps/cabbiev2/batt02-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-128x128x16.bmp b/wps/cabbiev2/batt03-128x128x16.bmp
deleted file mode 100644
index e3ae84c6b5..0000000000
--- a/wps/cabbiev2/batt03-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-132x80x16.bmp b/wps/cabbiev2/batt03-132x80x16.bmp
deleted file mode 100644
index 7f999ae0f6..0000000000
--- a/wps/cabbiev2/batt03-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-176x132x16.bmp b/wps/cabbiev2/batt03-176x132x16.bmp
deleted file mode 100644
index 7f999ae0f6..0000000000
--- a/wps/cabbiev2/batt03-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-176x220x16.bmp b/wps/cabbiev2/batt03-176x220x16.bmp
deleted file mode 100644
index c54907ec0c..0000000000
--- a/wps/cabbiev2/batt03-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-320x240x16.bmp b/wps/cabbiev2/batt03-320x240x16.bmp
deleted file mode 100644
index e175ab515e..0000000000
--- a/wps/cabbiev2/batt03-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-128x128x16.bmp b/wps/cabbiev2/batt04-128x128x16.bmp
deleted file mode 100644
index 3b69873b6b..0000000000
--- a/wps/cabbiev2/batt04-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-132x80x16.bmp b/wps/cabbiev2/batt04-132x80x16.bmp
deleted file mode 100644
index 98565da120..0000000000
--- a/wps/cabbiev2/batt04-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-176x132x16.bmp b/wps/cabbiev2/batt04-176x132x16.bmp
deleted file mode 100644
index 98565da120..0000000000
--- a/wps/cabbiev2/batt04-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-176x220x16.bmp b/wps/cabbiev2/batt04-176x220x16.bmp
deleted file mode 100644
index 8092444946..0000000000
--- a/wps/cabbiev2/batt04-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-320x240x16.bmp b/wps/cabbiev2/batt04-320x240x16.bmp
deleted file mode 100644
index 53e333f624..0000000000
--- a/wps/cabbiev2/batt04-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-128x128x16.bmp b/wps/cabbiev2/batt05-128x128x16.bmp
deleted file mode 100644
index 263214c36e..0000000000
--- a/wps/cabbiev2/batt05-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-132x80x16.bmp b/wps/cabbiev2/batt05-132x80x16.bmp
deleted file mode 100644
index c809b1351f..0000000000
--- a/wps/cabbiev2/batt05-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-176x132x16.bmp b/wps/cabbiev2/batt05-176x132x16.bmp
deleted file mode 100644
index c809b1351f..0000000000
--- a/wps/cabbiev2/batt05-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-176x220x16.bmp b/wps/cabbiev2/batt05-176x220x16.bmp
deleted file mode 100644
index 8924a9feba..0000000000
--- a/wps/cabbiev2/batt05-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-320x240x16.bmp b/wps/cabbiev2/batt05-320x240x16.bmp
deleted file mode 100644
index 4863bcb0a5..0000000000
--- a/wps/cabbiev2/batt05-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-128x128x16.bmp b/wps/cabbiev2/batt06-128x128x16.bmp
deleted file mode 100644
index b374b798f6..0000000000
--- a/wps/cabbiev2/batt06-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-132x80x16.bmp b/wps/cabbiev2/batt06-132x80x16.bmp
deleted file mode 100644
index 7e750d4f5d..0000000000
--- a/wps/cabbiev2/batt06-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-176x132x16.bmp b/wps/cabbiev2/batt06-176x132x16.bmp
deleted file mode 100644
index 7e750d4f5d..0000000000
--- a/wps/cabbiev2/batt06-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-176x220x16.bmp b/wps/cabbiev2/batt06-176x220x16.bmp
deleted file mode 100644
index 919916ef8f..0000000000
--- a/wps/cabbiev2/batt06-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-320x240x16.bmp b/wps/cabbiev2/batt06-320x240x16.bmp
deleted file mode 100644
index 493aceac4f..0000000000
--- a/wps/cabbiev2/batt06-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-128x128x16.bmp b/wps/cabbiev2/batt07-128x128x16.bmp
deleted file mode 100644
index 05401b81a9..0000000000
--- a/wps/cabbiev2/batt07-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-132x80x16.bmp b/wps/cabbiev2/batt07-132x80x16.bmp
deleted file mode 100644
index 363c02bc26..0000000000
--- a/wps/cabbiev2/batt07-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-176x132x16.bmp b/wps/cabbiev2/batt07-176x132x16.bmp
deleted file mode 100644
index 363c02bc26..0000000000
--- a/wps/cabbiev2/batt07-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-176x220x16.bmp b/wps/cabbiev2/batt07-176x220x16.bmp
deleted file mode 100644
index a565683e27..0000000000
--- a/wps/cabbiev2/batt07-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-320x240x16.bmp b/wps/cabbiev2/batt07-320x240x16.bmp
deleted file mode 100644
index c88ad5fffa..0000000000
--- a/wps/cabbiev2/batt07-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-128x128x16.bmp b/wps/cabbiev2/battch-128x128x16.bmp
deleted file mode 100644
index 2929193705..0000000000
--- a/wps/cabbiev2/battch-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-132x80x16.bmp b/wps/cabbiev2/battch-132x80x16.bmp
deleted file mode 100644
index bb9c741cbd..0000000000
--- a/wps/cabbiev2/battch-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-176x132x16.bmp b/wps/cabbiev2/battch-176x132x16.bmp
deleted file mode 100644
index bb9c741cbd..0000000000
--- a/wps/cabbiev2/battch-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-176x220x16.bmp b/wps/cabbiev2/battch-176x220x16.bmp
deleted file mode 100644
index 69e7129e6b..0000000000
--- a/wps/cabbiev2/battch-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-320x240x16.bmp b/wps/cabbiev2/battch-320x240x16.bmp
deleted file mode 100644
index 1d1c05a8d7..0000000000
--- a/wps/cabbiev2/battch-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battery-128x128x16.bmp b/wps/cabbiev2/battery-128x128x16.bmp
new file mode 100644
index 0000000000..921f0c4ee7
--- /dev/null
+++ b/wps/cabbiev2/battery-128x128x16.bmp
diff --git a/wps/cabbiev2/battery-132x80x16.bmp b/wps/cabbiev2/battery-132x80x16.bmp
new file mode 100644
index 0000000000..277a36f5dd
--- /dev/null
+++ b/wps/cabbiev2/battery-132x80x16.bmp
diff --git a/wps/cabbiev2/battery-176x132x16.bmp b/wps/cabbiev2/battery-176x132x16.bmp
new file mode 100644
index 0000000000..277a36f5dd
--- /dev/null
+++ b/wps/cabbiev2/battery-176x132x16.bmp
diff --git a/wps/cabbiev2/battery-176x220x16.bmp b/wps/cabbiev2/battery-176x220x16.bmp
new file mode 100644
index 0000000000..d10e970a53
--- /dev/null
+++ b/wps/cabbiev2/battery-176x220x16.bmp
diff --git a/wps/cabbiev2/battery-320x240x16.bmp b/wps/cabbiev2/battery-320x240x16.bmp
new file mode 100644
index 0000000000..afd7a248c2
--- /dev/null
+++ b/wps/cabbiev2/battery-320x240x16.bmp
diff --git a/wps/cabbiev2/battpl-128x128x16.bmp b/wps/cabbiev2/battpl-128x128x16.bmp
deleted file mode 100644
index 5201f2fa1c..0000000000
--- a/wps/cabbiev2/battpl-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battpl-132x80x16.bmp b/wps/cabbiev2/battpl-132x80x16.bmp
deleted file mode 100644
index 217f02c057..0000000000
--- a/wps/cabbiev2/battpl-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battpl-176x132x16.bmp b/wps/cabbiev2/battpl-176x132x16.bmp
deleted file mode 100644
index 217f02c057..0000000000
--- a/wps/cabbiev2/battpl-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battpl-176x220x16.bmp b/wps/cabbiev2/battpl-176x220x16.bmp
deleted file mode 100644
index 2988d7ba33..0000000000
--- a/wps/cabbiev2/battpl-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battpl-320x240x16.bmp b/wps/cabbiev2/battpl-320x240x16.bmp
deleted file mode 100644
index 1d5fa3ae11..0000000000
--- a/wps/cabbiev2/battpl-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-128x128x16.bmp b/wps/cabbiev2/ff-128x128x16.bmp
deleted file mode 100644
index 57708f6c02..0000000000
--- a/wps/cabbiev2/ff-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-132x80x16.bmp b/wps/cabbiev2/ff-132x80x16.bmp
deleted file mode 100644
index 7926ccee8c..0000000000
--- a/wps/cabbiev2/ff-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-176x132x16.bmp b/wps/cabbiev2/ff-176x132x16.bmp
deleted file mode 100644
index 7926ccee8c..0000000000
--- a/wps/cabbiev2/ff-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-176x220x16.bmp b/wps/cabbiev2/ff-176x220x16.bmp
deleted file mode 100644
index 8aa8b025ac..0000000000
--- a/wps/cabbiev2/ff-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-320x240x16.bmp b/wps/cabbiev2/ff-320x240x16.bmp
deleted file mode 100644
index c733da1540..0000000000
--- a/wps/cabbiev2/ff-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lock-128x128x16.bmp b/wps/cabbiev2/lock-128x128x16.bmp
new file mode 100644
index 0000000000..393bf53087
--- /dev/null
+++ b/wps/cabbiev2/lock-128x128x16.bmp
diff --git a/wps/cabbiev2/lock-132x80x16.bmp b/wps/cabbiev2/lock-132x80x16.bmp
new file mode 100644
index 0000000000..e6a022821e
--- /dev/null
+++ b/wps/cabbiev2/lock-132x80x16.bmp
diff --git a/wps/cabbiev2/lock-176x132x16.bmp b/wps/cabbiev2/lock-176x132x16.bmp
new file mode 100644
index 0000000000..89714ed8b2
--- /dev/null
+++ b/wps/cabbiev2/lock-176x132x16.bmp
diff --git a/wps/cabbiev2/lock-176x220x16.bmp b/wps/cabbiev2/lock-176x220x16.bmp
new file mode 100644
index 0000000000..d91639b45b
--- /dev/null
+++ b/wps/cabbiev2/lock-176x220x16.bmp
diff --git a/wps/cabbiev2/lock-320x240x16.bmp b/wps/cabbiev2/lock-320x240x16.bmp
new file mode 100644
index 0000000000..0fa2c74eb7
--- /dev/null
+++ b/wps/cabbiev2/lock-320x240x16.bmp
diff --git a/wps/cabbiev2/lockclosed-128x128x16.bmp b/wps/cabbiev2/lockclosed-128x128x16.bmp
deleted file mode 100644
index 0f170220b6..0000000000
--- a/wps/cabbiev2/lockclosed-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockclosed-132x80x16.bmp b/wps/cabbiev2/lockclosed-132x80x16.bmp
deleted file mode 100644
index 87b9be0c93..0000000000
--- a/wps/cabbiev2/lockclosed-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockclosed-176x132x16.bmp b/wps/cabbiev2/lockclosed-176x132x16.bmp
deleted file mode 100644
index b88ab893e7..0000000000
--- a/wps/cabbiev2/lockclosed-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockclosed-176x220x16.bmp b/wps/cabbiev2/lockclosed-176x220x16.bmp
deleted file mode 100644
index 0544be5c11..0000000000
--- a/wps/cabbiev2/lockclosed-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockclosed-320x240x16.bmp b/wps/cabbiev2/lockclosed-320x240x16.bmp
deleted file mode 100644
index 2841c0b47c..0000000000
--- a/wps/cabbiev2/lockclosed-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-128x128x16.bmp b/wps/cabbiev2/lockopen-128x128x16.bmp
deleted file mode 100644
index 07bdce8638..0000000000
--- a/wps/cabbiev2/lockopen-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-132x80x16.bmp b/wps/cabbiev2/lockopen-132x80x16.bmp
deleted file mode 100644
index 6aa9f5c38a..0000000000
--- a/wps/cabbiev2/lockopen-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-176x132x16.bmp b/wps/cabbiev2/lockopen-176x132x16.bmp
deleted file mode 100644
index ed13234a81..0000000000
--- a/wps/cabbiev2/lockopen-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-176x220x16.bmp b/wps/cabbiev2/lockopen-176x220x16.bmp
deleted file mode 100644
index 555ac10da6..0000000000
--- a/wps/cabbiev2/lockopen-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-320x240x16.bmp b/wps/cabbiev2/lockopen-320x240x16.bmp
deleted file mode 100644
index ca4f157274..0000000000
--- a/wps/cabbiev2/lockopen-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-128x128x16.bmp b/wps/cabbiev2/pause-128x128x16.bmp
deleted file mode 100644
index 545b169e11..0000000000
--- a/wps/cabbiev2/pause-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-132x80x16.bmp b/wps/cabbiev2/pause-132x80x16.bmp
deleted file mode 100644
index 458acac923..0000000000
--- a/wps/cabbiev2/pause-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-176x132x16.bmp b/wps/cabbiev2/pause-176x132x16.bmp
deleted file mode 100644
index 458acac923..0000000000
--- a/wps/cabbiev2/pause-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-176x220x16.bmp b/wps/cabbiev2/pause-176x220x16.bmp
deleted file mode 100644
index 903ddb5d50..0000000000
--- a/wps/cabbiev2/pause-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-320x240x16.bmp b/wps/cabbiev2/pause-320x240x16.bmp
deleted file mode 100644
index ba396a4321..0000000000
--- a/wps/cabbiev2/pause-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-128x128x16.bmp b/wps/cabbiev2/play-128x128x16.bmp
deleted file mode 100644
index 394442866d..0000000000
--- a/wps/cabbiev2/play-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-132x80x16.bmp b/wps/cabbiev2/play-132x80x16.bmp
deleted file mode 100644
index b43f9a6a8c..0000000000
--- a/wps/cabbiev2/play-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-176x132x16.bmp b/wps/cabbiev2/play-176x132x16.bmp
deleted file mode 100644
index b43f9a6a8c..0000000000
--- a/wps/cabbiev2/play-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-176x220x16.bmp b/wps/cabbiev2/play-176x220x16.bmp
deleted file mode 100644
index 7725842a8f..0000000000
--- a/wps/cabbiev2/play-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-320x240x16.bmp b/wps/cabbiev2/play-320x240x16.bmp
deleted file mode 100644
index cf1df26264..0000000000
--- a/wps/cabbiev2/play-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/playmode-128x128x16.bmp b/wps/cabbiev2/playmode-128x128x16.bmp
new file mode 100644
index 0000000000..a1edf4f4d7
--- /dev/null
+++ b/wps/cabbiev2/playmode-128x128x16.bmp
diff --git a/wps/cabbiev2/playmode-132x80x16.bmp b/wps/cabbiev2/playmode-132x80x16.bmp
new file mode 100644
index 0000000000..85f10ca4f9
--- /dev/null
+++ b/wps/cabbiev2/playmode-132x80x16.bmp
diff --git a/wps/cabbiev2/playmode-176x132x16.bmp b/wps/cabbiev2/playmode-176x132x16.bmp
new file mode 100644
index 0000000000..85f10ca4f9
--- /dev/null
+++ b/wps/cabbiev2/playmode-176x132x16.bmp
diff --git a/wps/cabbiev2/playmode-176x220x16.bmp b/wps/cabbiev2/playmode-176x220x16.bmp
new file mode 100644
index 0000000000..1ef033a023
--- /dev/null
+++ b/wps/cabbiev2/playmode-176x220x16.bmp
diff --git a/wps/cabbiev2/playmode-320x240x16.bmp b/wps/cabbiev2/playmode-320x240x16.bmp
new file mode 100644
index 0000000000..9bc41f67be
--- /dev/null
+++ b/wps/cabbiev2/playmode-320x240x16.bmp
diff --git a/wps/cabbiev2/repeat-128x128x16.bmp b/wps/cabbiev2/repeat-128x128x16.bmp
new file mode 100644
index 0000000000..96dce5be65
--- /dev/null
+++ b/wps/cabbiev2/repeat-128x128x16.bmp
diff --git a/wps/cabbiev2/repeat-132x80x16.bmp b/wps/cabbiev2/repeat-132x80x16.bmp
new file mode 100644
index 0000000000..ad248eb9c6
--- /dev/null
+++ b/wps/cabbiev2/repeat-132x80x16.bmp
diff --git a/wps/cabbiev2/repeat-176x132x16.bmp b/wps/cabbiev2/repeat-176x132x16.bmp
new file mode 100644
index 0000000000..9fc20e9bfb
--- /dev/null
+++ b/wps/cabbiev2/repeat-176x132x16.bmp
diff --git a/wps/cabbiev2/repeat-176x220x16.bmp b/wps/cabbiev2/repeat-176x220x16.bmp
new file mode 100644
index 0000000000..fd17e6ed57
--- /dev/null
+++ b/wps/cabbiev2/repeat-176x220x16.bmp
diff --git a/wps/cabbiev2/repeat-320x240x16.bmp b/wps/cabbiev2/repeat-320x240x16.bmp
new file mode 100644
index 0000000000..0fafa8b795
--- /dev/null
+++ b/wps/cabbiev2/repeat-320x240x16.bmp
diff --git a/wps/cabbiev2/repeatab-128x128x16.bmp b/wps/cabbiev2/repeatab-128x128x16.bmp
deleted file mode 100644
index 18a45ce32f..0000000000
--- a/wps/cabbiev2/repeatab-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatab-132x80x16.bmp b/wps/cabbiev2/repeatab-132x80x16.bmp
deleted file mode 100644
index abc459221a..0000000000
--- a/wps/cabbiev2/repeatab-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatab-176x132x16.bmp b/wps/cabbiev2/repeatab-176x132x16.bmp
deleted file mode 100644
index ebb0c78d67..0000000000
--- a/wps/cabbiev2/repeatab-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatab-176x220x16.bmp b/wps/cabbiev2/repeatab-176x220x16.bmp
deleted file mode 100644
index 4bc055cd04..0000000000
--- a/wps/cabbiev2/repeatab-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatab-320x240x16.bmp b/wps/cabbiev2/repeatab-320x240x16.bmp
deleted file mode 100644
index 3731dfe5cc..0000000000
--- a/wps/cabbiev2/repeatab-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-128x128x16.bmp b/wps/cabbiev2/repeatall-128x128x16.bmp
deleted file mode 100644
index 0090bbba6a..0000000000
--- a/wps/cabbiev2/repeatall-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-132x80x16.bmp b/wps/cabbiev2/repeatall-132x80x16.bmp
deleted file mode 100644
index 25f5aa7d32..0000000000
--- a/wps/cabbiev2/repeatall-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-176x132x16.bmp b/wps/cabbiev2/repeatall-176x132x16.bmp
deleted file mode 100644
index 1388f5e60a..0000000000
--- a/wps/cabbiev2/repeatall-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-176x220x16.bmp b/wps/cabbiev2/repeatall-176x220x16.bmp
deleted file mode 100644
index 9dc9f8c9e9..0000000000
--- a/wps/cabbiev2/repeatall-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-320x240x16.bmp b/wps/cabbiev2/repeatall-320x240x16.bmp
deleted file mode 100644
index 9f2477b566..0000000000
--- a/wps/cabbiev2/repeatall-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-128x128x16.bmp b/wps/cabbiev2/repeatone-128x128x16.bmp
deleted file mode 100644
index 902f16fd21..0000000000
--- a/wps/cabbiev2/repeatone-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-132x80x16.bmp b/wps/cabbiev2/repeatone-132x80x16.bmp
deleted file mode 100644
index db7e66a0d4..0000000000
--- a/wps/cabbiev2/repeatone-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-176x132x16.bmp b/wps/cabbiev2/repeatone-176x132x16.bmp
deleted file mode 100644
index d227a334e6..0000000000
--- a/wps/cabbiev2/repeatone-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-176x220x16.bmp b/wps/cabbiev2/repeatone-176x220x16.bmp
deleted file mode 100644
index c6ea1ccdc5..0000000000
--- a/wps/cabbiev2/repeatone-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-320x240x16.bmp b/wps/cabbiev2/repeatone-320x240x16.bmp
deleted file mode 100644
index c77187522f..0000000000
--- a/wps/cabbiev2/repeatone-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-128x128x16.bmp b/wps/cabbiev2/repeatshuffle-128x128x16.bmp
deleted file mode 100644
index a81589ba39..0000000000
--- a/wps/cabbiev2/repeatshuffle-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-132x80x16.bmp b/wps/cabbiev2/repeatshuffle-132x80x16.bmp
deleted file mode 100644
index 3d6fe720b7..0000000000
--- a/wps/cabbiev2/repeatshuffle-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-176x132x16.bmp b/wps/cabbiev2/repeatshuffle-176x132x16.bmp
deleted file mode 100644
index 9e7c119b1d..0000000000
--- a/wps/cabbiev2/repeatshuffle-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-176x220x16.bmp b/wps/cabbiev2/repeatshuffle-176x220x16.bmp
deleted file mode 100644
index 6a4c4f43b0..0000000000
--- a/wps/cabbiev2/repeatshuffle-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-320x240x16.bmp b/wps/cabbiev2/repeatshuffle-320x240x16.bmp
deleted file mode 100644
index 53942b451d..0000000000
--- a/wps/cabbiev2/repeatshuffle-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-128x128x16.bmp b/wps/cabbiev2/rew-128x128x16.bmp
deleted file mode 100644
index 8d24a04349..0000000000
--- a/wps/cabbiev2/rew-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-132x80x16.bmp b/wps/cabbiev2/rew-132x80x16.bmp
deleted file mode 100644
index 50d41ab5d0..0000000000
--- a/wps/cabbiev2/rew-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-176x132x16.bmp b/wps/cabbiev2/rew-176x132x16.bmp
deleted file mode 100644
index eb700ca486..0000000000
--- a/wps/cabbiev2/rew-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-176x220x16.bmp b/wps/cabbiev2/rew-176x220x16.bmp
deleted file mode 100644
index eb700ca486..0000000000
--- a/wps/cabbiev2/rew-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-320x240x16.bmp b/wps/cabbiev2/rew-320x240x16.bmp
deleted file mode 100644
index 52cd7b35d7..0000000000
--- a/wps/cabbiev2/rew-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-128x128x16.bmp b/wps/cabbiev2/stop-128x128x16.bmp
deleted file mode 100644
index 6eabbfee67..0000000000
--- a/wps/cabbiev2/stop-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-132x80x16.bmp b/wps/cabbiev2/stop-132x80x16.bmp
deleted file mode 100644
index 7dc1a61593..0000000000
--- a/wps/cabbiev2/stop-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-176x132x16.bmp b/wps/cabbiev2/stop-176x132x16.bmp
deleted file mode 100644
index 7dc1a61593..0000000000
--- a/wps/cabbiev2/stop-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-176x220x16.bmp b/wps/cabbiev2/stop-176x220x16.bmp
deleted file mode 100644
index 7b0b426575..0000000000
--- a/wps/cabbiev2/stop-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-320x240x16.bmp b/wps/cabbiev2/stop-320x240x16.bmp
deleted file mode 100644
index 15f35dc3d1..0000000000
--- a/wps/cabbiev2/stop-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-128x128x16.bmp b/wps/cabbiev2/vol0-128x128x16.bmp
deleted file mode 100644
index 2e4a299fe5..0000000000
--- a/wps/cabbiev2/vol0-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-132x80x16.bmp b/wps/cabbiev2/vol0-132x80x16.bmp
deleted file mode 100644
index 339f536753..0000000000
--- a/wps/cabbiev2/vol0-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-176x132x16.bmp b/wps/cabbiev2/vol0-176x132x16.bmp
deleted file mode 100644
index 339f536753..0000000000
--- a/wps/cabbiev2/vol0-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-176x220x16.bmp b/wps/cabbiev2/vol0-176x220x16.bmp
deleted file mode 100644
index 612718d3f1..0000000000
--- a/wps/cabbiev2/vol0-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-320x240x16.bmp b/wps/cabbiev2/vol0-320x240x16.bmp
deleted file mode 100644
index 809e546d0e..0000000000
--- a/wps/cabbiev2/vol0-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-128x128x16.bmp b/wps/cabbiev2/vol1-128x128x16.bmp
deleted file mode 100644
index d84e1def12..0000000000
--- a/wps/cabbiev2/vol1-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-132x80x16.bmp b/wps/cabbiev2/vol1-132x80x16.bmp
deleted file mode 100644
index b5a6f12f23..0000000000
--- a/wps/cabbiev2/vol1-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-176x132x16.bmp b/wps/cabbiev2/vol1-176x132x16.bmp
deleted file mode 100644
index b5a6f12f23..0000000000
--- a/wps/cabbiev2/vol1-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-176x220x16.bmp b/wps/cabbiev2/vol1-176x220x16.bmp
deleted file mode 100644
index 51a1fd43b7..0000000000
--- a/wps/cabbiev2/vol1-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-320x240x16.bmp b/wps/cabbiev2/vol1-320x240x16.bmp
deleted file mode 100644
index e6ff395dfd..0000000000
--- a/wps/cabbiev2/vol1-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-128x128x16.bmp b/wps/cabbiev2/vol2-128x128x16.bmp
deleted file mode 100644
index 88266c8c7d..0000000000
--- a/wps/cabbiev2/vol2-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-132x80x16.bmp b/wps/cabbiev2/vol2-132x80x16.bmp
deleted file mode 100644
index a6d397abfc..0000000000
--- a/wps/cabbiev2/vol2-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-176x132x16.bmp b/wps/cabbiev2/vol2-176x132x16.bmp
deleted file mode 100644
index a6d397abfc..0000000000
--- a/wps/cabbiev2/vol2-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-176x220x16.bmp b/wps/cabbiev2/vol2-176x220x16.bmp
deleted file mode 100644
index 95f13d6e0d..0000000000
--- a/wps/cabbiev2/vol2-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-320x240x16.bmp b/wps/cabbiev2/vol2-320x240x16.bmp
deleted file mode 100644
index cc8b516128..0000000000
--- a/wps/cabbiev2/vol2-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-128x128x16.bmp b/wps/cabbiev2/vol3-128x128x16.bmp
deleted file mode 100644
index cd12471cec..0000000000
--- a/wps/cabbiev2/vol3-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-132x80x16.bmp b/wps/cabbiev2/vol3-132x80x16.bmp
deleted file mode 100644
index 168de3aa90..0000000000
--- a/wps/cabbiev2/vol3-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-176x132x16.bmp b/wps/cabbiev2/vol3-176x132x16.bmp
deleted file mode 100644
index 168de3aa90..0000000000
--- a/wps/cabbiev2/vol3-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-176x220x16.bmp b/wps/cabbiev2/vol3-176x220x16.bmp
deleted file mode 100644
index 9e471a6aa4..0000000000
--- a/wps/cabbiev2/vol3-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-320x240x16.bmp b/wps/cabbiev2/vol3-320x240x16.bmp
deleted file mode 100644
index dce8e06047..0000000000
--- a/wps/cabbiev2/vol3-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-128x128x16.bmp b/wps/cabbiev2/vol4-128x128x16.bmp
deleted file mode 100644
index da6ae332db..0000000000
--- a/wps/cabbiev2/vol4-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-132x80x16.bmp b/wps/cabbiev2/vol4-132x80x16.bmp
deleted file mode 100644
index 7bf7b1ee49..0000000000
--- a/wps/cabbiev2/vol4-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-176x132x16.bmp b/wps/cabbiev2/vol4-176x132x16.bmp
deleted file mode 100644
index 7bf7b1ee49..0000000000
--- a/wps/cabbiev2/vol4-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-176x220x16.bmp b/wps/cabbiev2/vol4-176x220x16.bmp
deleted file mode 100644
index c94f81d2d1..0000000000
--- a/wps/cabbiev2/vol4-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-320x240x16.bmp b/wps/cabbiev2/vol4-320x240x16.bmp
deleted file mode 100644
index 9904b31ca4..0000000000
--- a/wps/cabbiev2/vol4-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-128x128x16.bmp b/wps/cabbiev2/vol5-128x128x16.bmp
deleted file mode 100644
index 3111b671bb..0000000000
--- a/wps/cabbiev2/vol5-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-132x80x16.bmp b/wps/cabbiev2/vol5-132x80x16.bmp
deleted file mode 100644
index 0b471450ac..0000000000
--- a/wps/cabbiev2/vol5-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-176x132x16.bmp b/wps/cabbiev2/vol5-176x132x16.bmp
deleted file mode 100644
index 0b471450ac..0000000000
--- a/wps/cabbiev2/vol5-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-176x220x16.bmp b/wps/cabbiev2/vol5-176x220x16.bmp
deleted file mode 100644
index 2a9f14029e..0000000000
--- a/wps/cabbiev2/vol5-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-320x240x16.bmp b/wps/cabbiev2/vol5-320x240x16.bmp
deleted file mode 100644
index 6c5d2037c4..0000000000
--- a/wps/cabbiev2/vol5-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-128x128x16.bmp b/wps/cabbiev2/vol6-128x128x16.bmp
deleted file mode 100644
index e1f3af2b28..0000000000
--- a/wps/cabbiev2/vol6-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-132x80x16.bmp b/wps/cabbiev2/vol6-132x80x16.bmp
deleted file mode 100644
index ec8f68b5ca..0000000000
--- a/wps/cabbiev2/vol6-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-176x132x16.bmp b/wps/cabbiev2/vol6-176x132x16.bmp
deleted file mode 100644
index ec8f68b5ca..0000000000
--- a/wps/cabbiev2/vol6-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-176x220x16.bmp b/wps/cabbiev2/vol6-176x220x16.bmp
deleted file mode 100644
index 91c8d47603..0000000000
--- a/wps/cabbiev2/vol6-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-320x240x16.bmp b/wps/cabbiev2/vol6-320x240x16.bmp
deleted file mode 100644
index bcd4843540..0000000000
--- a/wps/cabbiev2/vol6-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-128x128x16.bmp b/wps/cabbiev2/vol7-128x128x16.bmp
deleted file mode 100644
index a42cc68443..0000000000
--- a/wps/cabbiev2/vol7-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-132x80x16.bmp b/wps/cabbiev2/vol7-132x80x16.bmp
deleted file mode 100644
index ccd194ea47..0000000000
--- a/wps/cabbiev2/vol7-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-176x132x16.bmp b/wps/cabbiev2/vol7-176x132x16.bmp
deleted file mode 100644
index ccd194ea47..0000000000
--- a/wps/cabbiev2/vol7-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-176x220x16.bmp b/wps/cabbiev2/vol7-176x220x16.bmp
deleted file mode 100644
index 8b74417e21..0000000000
--- a/wps/cabbiev2/vol7-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-320x240x16.bmp b/wps/cabbiev2/vol7-320x240x16.bmp
deleted file mode 100644
index ea2ef2e551..0000000000
--- a/wps/cabbiev2/vol7-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-128x128x16.bmp b/wps/cabbiev2/vol8-128x128x16.bmp
deleted file mode 100644
index 9a758bec59..0000000000
--- a/wps/cabbiev2/vol8-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-132x80x16.bmp b/wps/cabbiev2/vol8-132x80x16.bmp
deleted file mode 100644
index 99b95bf9ee..0000000000
--- a/wps/cabbiev2/vol8-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-176x132x16.bmp b/wps/cabbiev2/vol8-176x132x16.bmp
deleted file mode 100644
index 99b95bf9ee..0000000000
--- a/wps/cabbiev2/vol8-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-176x220x16.bmp b/wps/cabbiev2/vol8-176x220x16.bmp
deleted file mode 100644
index c575cd0210..0000000000
--- a/wps/cabbiev2/vol8-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-320x240x16.bmp b/wps/cabbiev2/vol8-320x240x16.bmp
deleted file mode 100644
index 2d86e0548f..0000000000
--- a/wps/cabbiev2/vol8-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-128x128x16.bmp b/wps/cabbiev2/vol9-128x128x16.bmp
deleted file mode 100644
index f6e458ac79..0000000000
--- a/wps/cabbiev2/vol9-128x128x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-132x80x16.bmp b/wps/cabbiev2/vol9-132x80x16.bmp
deleted file mode 100644
index 01de67ffa5..0000000000
--- a/wps/cabbiev2/vol9-132x80x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-176x132x16.bmp b/wps/cabbiev2/vol9-176x132x16.bmp
deleted file mode 100644
index e69a378caf..0000000000
--- a/wps/cabbiev2/vol9-176x132x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-176x220x16.bmp b/wps/cabbiev2/vol9-176x220x16.bmp
deleted file mode 100644
index 034a4aced2..0000000000
--- a/wps/cabbiev2/vol9-176x220x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-320x240x16.bmp b/wps/cabbiev2/vol9-320x240x16.bmp
deleted file mode 100644
index a7277a1318..0000000000
--- a/wps/cabbiev2/vol9-320x240x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/volume-128x128x16.bmp b/wps/cabbiev2/volume-128x128x16.bmp
new file mode 100644
index 0000000000..aec57bd645
--- /dev/null
+++ b/wps/cabbiev2/volume-128x128x16.bmp
diff --git a/wps/cabbiev2/volume-132x80x16.bmp b/wps/cabbiev2/volume-132x80x16.bmp
new file mode 100644
index 0000000000..73e47ca5e8
--- /dev/null
+++ b/wps/cabbiev2/volume-132x80x16.bmp
diff --git a/wps/cabbiev2/volume-176x132x16.bmp b/wps/cabbiev2/volume-176x132x16.bmp
new file mode 100644
index 0000000000..2b5dfa2da8
--- /dev/null
+++ b/wps/cabbiev2/volume-176x132x16.bmp
diff --git a/wps/cabbiev2/volume-176x220x16.bmp b/wps/cabbiev2/volume-176x220x16.bmp
new file mode 100644
index 0000000000..7586655605
--- /dev/null
+++ b/wps/cabbiev2/volume-176x220x16.bmp
diff --git a/wps/cabbiev2/volume-320x240x16.bmp b/wps/cabbiev2/volume-320x240x16.bmp
new file mode 100644
index 0000000000..5120ce88bf
--- /dev/null
+++ b/wps/cabbiev2/volume-320x240x16.bmp