Start using bitmap strips in cabbiev2 - this commits converts 220x176x16 and 320x240x16, reducing the number of bitmaps to 8 for each WPS. If you want to keep your installation tidy, remove the .rockbox/wps/cabbiev2/ directory before updating to ensure unused bitmaps are deleted.

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

74 files changed, 25 insertions, 77 deletions

diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index cab8e11edd..94cf128d43 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -1,41 +1,15 @@
-# cabbie 2.0 default

+# cabbie 2.0 default
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 %X|wpsbackdrop-220x176x16.bmp|
 %P|pb-220x176x16.bmp|
-%xl|A|lockclosed-220x176x16.bmp|88|152|
-%xl|B|lockopen-220x176x16.bmp|88|152|
-%xl|C|battpl-220x176x16.bmp|110|153|
-%xl|D|battch-220x176x16.bmp|110|153|
-%xl|E|batt00-220x176x16.bmp|110|153|
-%xl|F|batt01-220x176x16.bmp|110|153|
-%xl|G|batt02-220x176x16.bmp|110|153|
-%xl|H|batt03-220x176x16.bmp|110|153|
-%xl|I|batt04-220x176x16.bmp|110|153|
-%xl|J|batt05-220x176x16.bmp|110|153|
-%xl|K|batt06-220x176x16.bmp|110|153|
-%xl|L|batt07-220x176x16.bmp|110|153|
-%xl|M|vol0-220x176x16.bmp|134|153|
-%xl|N|vol1-220x176x16.bmp|134|153|
-%xl|O|vol2-220x176x16.bmp|134|153|
-%xl|P|vol3-220x176x16.bmp|134|153|
-%xl|Q|vol4-220x176x16.bmp|134|153|
-%xl|b|vol5-220x176x16.bmp|134|153|
-%xl|c|vol6-220x176x16.bmp|134|153|
-%xl|d|vol7-220x176x16.bmp|134|153|
-%xl|e|vol8-220x176x16.bmp|134|153|
-%xl|f|vol9-220x176x16.bmp|134|153|
-%xl|R|shuffle-220x176x16.bmp|155|153|
-%xl|S|repeatall-220x176x16.bmp|182|151|
-%xl|T|repeatone-220x176x16.bmp|182|151|
-%xl|U|repeatshuffle-220x176x16.bmp|182|151|
-%xl|V|repeatab-220x176x16.bmp|182|151|
-%xl|W|stop-220x176x16.bmp|200|152|
-%xl|X|play-220x176x16.bmp|200|152|
-%xl|Y|pause-220x176x16.bmp|200|152|
-%xl|Z|ff-220x176x16.bmp|200|152|
-%xl|a|rew-220x176x16.bmp|200|152|
+%xl|A|lock-220x176x16.bmp|88|152|2|
+%xl|B|battery-220x176x16.bmp|110|153|10|
+%xl|C|volume-220x176x16.bmp|134|153|10|
+%xl|D|shuffle-220x176x16.bmp|155|153|
+%xl|E|repeat-220x176x16.bmp|182|151|4|
+%xl|F|playmode-220x176x16.bmp|200|152|5|
 %Cl|15|32|s75|s75|
 %pb|8|11|210|121|
 #NowPlaying
@@ -51,10 +25,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.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 87a73e5b33..210489fa8b 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -6,38 +6,12 @@
 

 %X|wpsbackdrop-240x320x16.bmp|

 %P|pb-240x320x16.bmp|

-%xl|A|lockclosed-240x320x16.bmp|11|292|

-%xl|B|lockopen-240x320x16.bmp|11|292|

-%xl|C|battpl-240x320x16.bmp|46|292|

-%xl|D|battch-240x320x16.bmp|46|292|

-%xl|E|batt00-240x320x16.bmp|46|292|

-%xl|F|batt01-240x320x16.bmp|46|292|

-%xl|G|batt02-240x320x16.bmp|46|292|

-%xl|H|batt03-240x320x16.bmp|46|292|

-%xl|I|batt04-240x320x16.bmp|46|292|

-%xl|J|batt05-240x320x16.bmp|46|292|

-%xl|K|batt06-240x320x16.bmp|46|292|

-%xl|L|batt07-240x320x16.bmp|46|292|

-%xl|M|vol0-240x320x16.bmp|98|292|

-%xl|N|vol1-240x320x16.bmp|98|292|

-%xl|O|vol2-240x320x16.bmp|98|292|

-%xl|o|vol3-240x320x16.bmp|98|292|

-%xl|P|vol4-240x320x16.bmp|98|292|

-%xl|a|vol5-240x320x16.bmp|98|292|

-%xl|b|vol6-240x320x16.bmp|98|292|

-%xl|c|vol7-240x320x16.bmp|98|292|

-%xl|d|vol8-240x320x16.bmp|98|292|

-%xl|e|vol9-240x320x16.bmp|98|292|

-%xl|Q|shuffle-240x320x16.bmp|139|292|

-%xl|R|repeatall-240x320x16.bmp|182|292|

-%xl|S|repeatone-240x320x16.bmp|182|292|

-%xl|T|repeatshuffle-240x320x16.bmp|182|292|

-%xl|U|repeatab-240x320x16.bmp|182|292|

-%xl|V|stop-240x320x16.bmp|206|292|

-%xl|W|play-240x320x16.bmp|206|292|

-%xl|X|pause-240x320x16.bmp|206|292|

-%xl|Y|ff-240x320x16.bmp|206|292|

-%xl|Z|rew-240x320x16.bmp|206|292|

+%xl|A|lock-240x320x16.bmp|11|292|2|

+%xl|B|battery-240x320x16.bmp|46|292|10|

+%xl|C|volume-240x320x16.bmp|98|292|10|

+%xl|D|shuffle-240x320x16.bmp|139|292|

+%xl|E|repeat-240x320x16.bmp|182|292|4|

+%xl|F|playmode-240x320x16.bmp|206|292|5|

 %Cl|55|30|sc130|sc130|

 %pb|13|22|221|254|

 %?C<|>

@@ -58,11 +32,11 @@
 

      %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/batt00-220x176x16.bmp b/wps/cabbiev2/batt00-220x176x16.bmp
deleted file mode 100644
index 0e1f83f9c7..0000000000
--- a/wps/cabbiev2/batt00-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt00-240x320x16.bmp b/wps/cabbiev2/batt00-240x320x16.bmp
deleted file mode 100644
index 0fd67aa378..0000000000
--- a/wps/cabbiev2/batt00-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-220x176x16.bmp b/wps/cabbiev2/batt01-220x176x16.bmp
deleted file mode 100644
index 4478ff1ccf..0000000000
--- a/wps/cabbiev2/batt01-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-240x320x16.bmp b/wps/cabbiev2/batt01-240x320x16.bmp
deleted file mode 100644
index 776a953e12..0000000000
--- a/wps/cabbiev2/batt01-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-220x176x16.bmp b/wps/cabbiev2/batt02-220x176x16.bmp
deleted file mode 100644
index b94c9a2b6e..0000000000
--- a/wps/cabbiev2/batt02-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-240x320x16.bmp b/wps/cabbiev2/batt02-240x320x16.bmp
deleted file mode 100644
index 3e96fd35a8..0000000000
--- a/wps/cabbiev2/batt02-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-220x176x16.bmp b/wps/cabbiev2/batt03-220x176x16.bmp
deleted file mode 100644
index c54907ec0c..0000000000
--- a/wps/cabbiev2/batt03-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-240x320x16.bmp b/wps/cabbiev2/batt03-240x320x16.bmp
deleted file mode 100644
index 191e7b9c4a..0000000000
--- a/wps/cabbiev2/batt03-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-220x176x16.bmp b/wps/cabbiev2/batt04-220x176x16.bmp
deleted file mode 100644
index 8092444946..0000000000
--- a/wps/cabbiev2/batt04-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-240x320x16.bmp b/wps/cabbiev2/batt04-240x320x16.bmp
deleted file mode 100644
index d4570179ee..0000000000
--- a/wps/cabbiev2/batt04-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-220x176x16.bmp b/wps/cabbiev2/batt05-220x176x16.bmp
deleted file mode 100644
index 8924a9feba..0000000000
--- a/wps/cabbiev2/batt05-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-240x320x16.bmp b/wps/cabbiev2/batt05-240x320x16.bmp
deleted file mode 100644
index 4fa658fc4f..0000000000
--- a/wps/cabbiev2/batt05-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-220x176x16.bmp b/wps/cabbiev2/batt06-220x176x16.bmp
deleted file mode 100644
index 919916ef8f..0000000000
--- a/wps/cabbiev2/batt06-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-240x320x16.bmp b/wps/cabbiev2/batt06-240x320x16.bmp
deleted file mode 100644
index 457c6d1c1b..0000000000
--- a/wps/cabbiev2/batt06-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-220x176x16.bmp b/wps/cabbiev2/batt07-220x176x16.bmp
deleted file mode 100644
index a565683e27..0000000000
--- a/wps/cabbiev2/batt07-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-240x320x16.bmp b/wps/cabbiev2/batt07-240x320x16.bmp
deleted file mode 100644
index 07063671dd..0000000000
--- a/wps/cabbiev2/batt07-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-220x176x16.bmp b/wps/cabbiev2/battch-220x176x16.bmp
deleted file mode 100644
index 69e7129e6b..0000000000
--- a/wps/cabbiev2/battch-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-240x320x16.bmp b/wps/cabbiev2/battch-240x320x16.bmp
deleted file mode 100644
index 13a7dd2af1..0000000000
--- a/wps/cabbiev2/battch-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battery-220x176x16.bmp b/wps/cabbiev2/battery-220x176x16.bmp
new file mode 100644
index 0000000000..d10e970a53
--- /dev/null
+++ b/wps/cabbiev2/battery-220x176x16.bmp
diff --git a/wps/cabbiev2/battery-240x320x16.bmp b/wps/cabbiev2/battery-240x320x16.bmp
new file mode 100644
index 0000000000..a596a303ee
--- /dev/null
+++ b/wps/cabbiev2/battery-240x320x16.bmp
diff --git a/wps/cabbiev2/battpl-220x176x16.bmp b/wps/cabbiev2/battpl-220x176x16.bmp
deleted file mode 100644
index 2988d7ba33..0000000000
--- a/wps/cabbiev2/battpl-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battpl-240x320x16.bmp b/wps/cabbiev2/battpl-240x320x16.bmp
deleted file mode 100644
index ae1bb5d4d3..0000000000
--- a/wps/cabbiev2/battpl-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-220x176x16.bmp b/wps/cabbiev2/ff-220x176x16.bmp
deleted file mode 100644
index 8aa8b025ac..0000000000
--- a/wps/cabbiev2/ff-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-240x320x16.bmp b/wps/cabbiev2/ff-240x320x16.bmp
deleted file mode 100644
index 2ee0406f3f..0000000000
--- a/wps/cabbiev2/ff-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lock-220x176x16.bmp b/wps/cabbiev2/lock-220x176x16.bmp
new file mode 100644
index 0000000000..d91639b45b
--- /dev/null
+++ b/wps/cabbiev2/lock-220x176x16.bmp
diff --git a/wps/cabbiev2/lock-240x320x16.bmp b/wps/cabbiev2/lock-240x320x16.bmp
new file mode 100644
index 0000000000..152c903dd3
--- /dev/null
+++ b/wps/cabbiev2/lock-240x320x16.bmp
diff --git a/wps/cabbiev2/lockclosed-220x176x16.bmp b/wps/cabbiev2/lockclosed-220x176x16.bmp
deleted file mode 100644
index 0544be5c11..0000000000
--- a/wps/cabbiev2/lockclosed-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockclosed-240x320x16.bmp b/wps/cabbiev2/lockclosed-240x320x16.bmp
deleted file mode 100644
index 5fd4f16820..0000000000
--- a/wps/cabbiev2/lockclosed-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-220x176x16.bmp b/wps/cabbiev2/lockopen-220x176x16.bmp
deleted file mode 100644
index 555ac10da6..0000000000
--- a/wps/cabbiev2/lockopen-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-240x320x16.bmp b/wps/cabbiev2/lockopen-240x320x16.bmp
deleted file mode 100644
index 0cc48a687f..0000000000
--- a/wps/cabbiev2/lockopen-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-220x176x16.bmp b/wps/cabbiev2/pause-220x176x16.bmp
deleted file mode 100644
index 903ddb5d50..0000000000
--- a/wps/cabbiev2/pause-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-240x320x16.bmp b/wps/cabbiev2/pause-240x320x16.bmp
deleted file mode 100644
index fc94043017..0000000000
--- a/wps/cabbiev2/pause-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-220x176x16.bmp b/wps/cabbiev2/play-220x176x16.bmp
deleted file mode 100644
index 7725842a8f..0000000000
--- a/wps/cabbiev2/play-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-240x320x16.bmp b/wps/cabbiev2/play-240x320x16.bmp
deleted file mode 100644
index af60725e2d..0000000000
--- a/wps/cabbiev2/play-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/playmode-220x176x16.bmp b/wps/cabbiev2/playmode-220x176x16.bmp
new file mode 100644
index 0000000000..1ef033a023
--- /dev/null
+++ b/wps/cabbiev2/playmode-220x176x16.bmp
diff --git a/wps/cabbiev2/playmode-240x320x16.bmp b/wps/cabbiev2/playmode-240x320x16.bmp
new file mode 100644
index 0000000000..f8176eb4ad
--- /dev/null
+++ b/wps/cabbiev2/playmode-240x320x16.bmp
diff --git a/wps/cabbiev2/repeat-220x176x16.bmp b/wps/cabbiev2/repeat-220x176x16.bmp
new file mode 100644
index 0000000000..0998e3acff
--- /dev/null
+++ b/wps/cabbiev2/repeat-220x176x16.bmp
diff --git a/wps/cabbiev2/repeat-240x320x16.bmp b/wps/cabbiev2/repeat-240x320x16.bmp
new file mode 100644
index 0000000000..86421a9f14
--- /dev/null
+++ b/wps/cabbiev2/repeat-240x320x16.bmp
diff --git a/wps/cabbiev2/repeatab-220x176x16.bmp b/wps/cabbiev2/repeatab-220x176x16.bmp
deleted file mode 100644
index d016ab18f1..0000000000
--- a/wps/cabbiev2/repeatab-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatab-240x320x16.bmp b/wps/cabbiev2/repeatab-240x320x16.bmp
deleted file mode 100644
index 69aea3d372..0000000000
--- a/wps/cabbiev2/repeatab-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-220x176x16.bmp b/wps/cabbiev2/repeatall-220x176x16.bmp
deleted file mode 100644
index e981168ce0..0000000000
--- a/wps/cabbiev2/repeatall-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-240x320x16.bmp b/wps/cabbiev2/repeatall-240x320x16.bmp
deleted file mode 100644
index 2de658ed9a..0000000000
--- a/wps/cabbiev2/repeatall-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-220x176x16.bmp b/wps/cabbiev2/repeatone-220x176x16.bmp
deleted file mode 100644
index e71362f355..0000000000
--- a/wps/cabbiev2/repeatone-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-240x320x16.bmp b/wps/cabbiev2/repeatone-240x320x16.bmp
deleted file mode 100644
index 189837578b..0000000000
--- a/wps/cabbiev2/repeatone-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-220x176x16.bmp b/wps/cabbiev2/repeatshuffle-220x176x16.bmp
deleted file mode 100644
index 49e04f0d55..0000000000
--- a/wps/cabbiev2/repeatshuffle-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-240x320x16.bmp b/wps/cabbiev2/repeatshuffle-240x320x16.bmp
deleted file mode 100644
index d5acb5bfe9..0000000000
--- a/wps/cabbiev2/repeatshuffle-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-220x176x16.bmp b/wps/cabbiev2/rew-220x176x16.bmp
deleted file mode 100644
index eb700ca486..0000000000
--- a/wps/cabbiev2/rew-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-240x320x16.bmp b/wps/cabbiev2/rew-240x320x16.bmp
deleted file mode 100644
index 48b7cbc6aa..0000000000
--- a/wps/cabbiev2/rew-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-220x176x16.bmp b/wps/cabbiev2/stop-220x176x16.bmp
deleted file mode 100644
index 7b0b426575..0000000000
--- a/wps/cabbiev2/stop-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-240x320x16.bmp b/wps/cabbiev2/stop-240x320x16.bmp
deleted file mode 100644
index c35e18797f..0000000000
--- a/wps/cabbiev2/stop-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-220x176x16.bmp b/wps/cabbiev2/vol0-220x176x16.bmp
deleted file mode 100644
index 46cc845f93..0000000000
--- a/wps/cabbiev2/vol0-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-240x320x16.bmp b/wps/cabbiev2/vol0-240x320x16.bmp
deleted file mode 100644
index 7aa00edac7..0000000000
--- a/wps/cabbiev2/vol0-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-220x176x16.bmp b/wps/cabbiev2/vol1-220x176x16.bmp
deleted file mode 100644
index fb25448b47..0000000000
--- a/wps/cabbiev2/vol1-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-240x320x16.bmp b/wps/cabbiev2/vol1-240x320x16.bmp
deleted file mode 100644
index 1c9708e5f0..0000000000
--- a/wps/cabbiev2/vol1-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-220x176x16.bmp b/wps/cabbiev2/vol2-220x176x16.bmp
deleted file mode 100644
index b8e6597d7e..0000000000
--- a/wps/cabbiev2/vol2-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-240x320x16.bmp b/wps/cabbiev2/vol2-240x320x16.bmp
deleted file mode 100644
index cf909d1095..0000000000
--- a/wps/cabbiev2/vol2-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-220x176x16.bmp b/wps/cabbiev2/vol3-220x176x16.bmp
deleted file mode 100644
index d4486b0200..0000000000
--- a/wps/cabbiev2/vol3-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-240x320x16.bmp b/wps/cabbiev2/vol3-240x320x16.bmp
deleted file mode 100644
index d3d473b4bd..0000000000
--- a/wps/cabbiev2/vol3-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-220x176x16.bmp b/wps/cabbiev2/vol4-220x176x16.bmp
deleted file mode 100644
index 624b27c373..0000000000
--- a/wps/cabbiev2/vol4-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-240x320x16.bmp b/wps/cabbiev2/vol4-240x320x16.bmp
deleted file mode 100644
index 114693e18f..0000000000
--- a/wps/cabbiev2/vol4-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-220x176x16.bmp b/wps/cabbiev2/vol5-220x176x16.bmp
deleted file mode 100644
index a2c3c43c45..0000000000
--- a/wps/cabbiev2/vol5-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-240x320x16.bmp b/wps/cabbiev2/vol5-240x320x16.bmp
deleted file mode 100644
index 3bba0558b1..0000000000
--- a/wps/cabbiev2/vol5-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-220x176x16.bmp b/wps/cabbiev2/vol6-220x176x16.bmp
deleted file mode 100644
index 6fc0ac6b0c..0000000000
--- a/wps/cabbiev2/vol6-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-240x320x16.bmp b/wps/cabbiev2/vol6-240x320x16.bmp
deleted file mode 100644
index 456c55af8b..0000000000
--- a/wps/cabbiev2/vol6-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-220x176x16.bmp b/wps/cabbiev2/vol7-220x176x16.bmp
deleted file mode 100644
index aad2b55a45..0000000000
--- a/wps/cabbiev2/vol7-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-240x320x16.bmp b/wps/cabbiev2/vol7-240x320x16.bmp
deleted file mode 100644
index 21c9aa1a84..0000000000
--- a/wps/cabbiev2/vol7-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-220x176x16.bmp b/wps/cabbiev2/vol8-220x176x16.bmp
deleted file mode 100644
index d28efc8e50..0000000000
--- a/wps/cabbiev2/vol8-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-240x320x16.bmp b/wps/cabbiev2/vol8-240x320x16.bmp
deleted file mode 100644
index 76c234792a..0000000000
--- a/wps/cabbiev2/vol8-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-220x176x16.bmp b/wps/cabbiev2/vol9-220x176x16.bmp
deleted file mode 100644
index d193ad8d03..0000000000
--- a/wps/cabbiev2/vol9-220x176x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-240x320x16.bmp b/wps/cabbiev2/vol9-240x320x16.bmp
deleted file mode 100644
index 90e7d6dd2e..0000000000
--- a/wps/cabbiev2/vol9-240x320x16.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/volume-220x176x16.bmp b/wps/cabbiev2/volume-220x176x16.bmp
new file mode 100644
index 0000000000..645b3ec6bc
--- /dev/null
+++ b/wps/cabbiev2/volume-220x176x16.bmp
diff --git a/wps/cabbiev2/volume-240x320x16.bmp b/wps/cabbiev2/volume-240x320x16.bmp
new file mode 100644
index 0000000000..041674aa10
--- /dev/null
+++ b/wps/cabbiev2/volume-240x320x16.bmp