Finally convert the two monochrome cabbiev2 WPSs to using bitmap strips. Changed the background image of the Archos version a bit for it and used a blank space for the 'mute' volume bitmap part for consistency.

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

69 files changed, 38 insertions, 85 deletions

diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index d977173b47..2982c1cedd 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -1,46 +1,26 @@
-# cabbie 2.0 default for the Archos Series by Marianne Arnold

-# derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)

-%wd

-%x|z|wpsbackdrop-112x64x1.bmp|0|0|

-%P|pb-112x64x1.bmp|

-%xl|A|lockclosed-112x64x1.bmp|4|56|

-%xl|B|battpl-112x64x1.bmp|23|56|

-%xl|C|battch-112x64x1.bmp|23|56|

-%xl|D|batt01-112x64x1.bmp|23|57|

-%xl|E|batt02-112x64x1.bmp|23|57|

-%xl|F|batt03-112x64x1.bmp|23|57|

-%xl|G|batt04-112x64x1.bmp|23|57|

-%xl|H|batt05-112x64x1.bmp|23|57|

-%xl|I|batt06-112x64x1.bmp|23|57|

-%xl|J|vol1-112x64x1.bmp|41|56|

-%xl|K|vol2-112x64x1.bmp|41|56|

-%xl|L|vol3-112x64x1.bmp|41|56|

-%xl|M|vol4-112x64x1.bmp|41|56|

-%xl|N|vol5-112x64x1.bmp|41|56|

-%xl|O|vol6-112x64x1.bmp|41|56|

-%xl|P|vol7-112x64x1.bmp|41|56|

-%xl|Q|vol8-112x64x1.bmp|41|56|

-%xl|R|shuffle-112x64x1.bmp|59|56|

-%xl|S|repeatall-112x64x1.bmp|81|56|

-%xl|T|repeatone-112x64x1.bmp|81|56|

-%xl|U|repeatshuffle-112x64x1.bmp|81|56|

-%xl|V|repeatab-112x64x1.bmp|81|56|

-%xl|W|play-112x64x1.bmp|98|56|

-%xl|X|pause-112x64x1.bmp|98|56|

-%xl|Y|ff-112x64x1.bmp|98|56|

-%xl|Z|rew-112x64x1.bmp|98|56|

-#NowPlaying

-

-%s%ac%?it<%it|%fn>

-%s%ac%?ia<%ia|%?d2<%d2|(root)>>

-%s%ac%?id<%id|%?d1<%d1|(root)>>

-%t5%ac%s%?Fn<Next: %?It<%It|%Fn>|%ac%pp of %pe>;%t5%ac%s%?Fn<Next: %?Ia<%Ia|%Fn>|%ac%pp of %pe>

-%pb|4|1|111|42|

-%pc%ar%pr

-#Bottom status bar

-%?mh<%xdA|>

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

-%?pv<|%xdJ|%xdK|%xdL|%xdM|%xdN|%xdO|%xdP|%xdQ>

-%?ps<%xdR|>

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

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

+# cabbie 2.0 default for the Archos Series by Marianne Arnold
+# derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+%wd
+%x|z|wpsbackdrop-112x64x1.bmp|0|0|
+%P|pb-112x64x1.bmp|
+%xl|A|lock-112x64x1.bmp|4|56|2|
+%xl|B|battery-112x64x1.bmp|22|56|9|
+%xl|C|volume-112x64x1.bmp|41|56|9|
+%xl|D|shuffle-112x64x1.bmp|59|56|
+%xl|E|repeat-112x64x1.bmp|81|56|4|
+%xl|F|playmode-112x64x1.bmp|98|56|5|
+#NowPlaying
+
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d2<%d2|(root)>>
+%s%ac%?id<%id|%?d1<%d1|(root)>>
+%t5%ac%s%?Fn<Next: %?It<%It|%Fn>|%ac%pp of %pe>;%t5%ac%s%?Fn<Next: %?Ia<%Ia|%Fn>|%ac%pp of %pe>
+%pb|4|1|111|42|
+%pc%ar%pr
+#Bottom status bar
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps
index 4fbe4def89..8727a446a6 100755
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -6,38 +6,12 @@
 %wd
 %x|z|wpsbackdrop-160x128x1.bmp|0|0|
 %P|pb-160x128x1.bmp|
-%xl|A|lockclosed-160x128x1.bmp|48|114|
-%xl|B|lockopen-160x128x1.bmp|48|114|
-%xl|C|battpl-160x128x1.bmp|66|115|
-%xl|D|battch-160x128x1.bmp|66|115|
-%xl|E|batt00-160x128x1.bmp|66|115|
-%xl|F|batt01-160x128x1.bmp|66|115|
-%xl|G|batt02-160x128x1.bmp|66|115|
-%xl|H|batt03-160x128x1.bmp|66|115|
-%xl|I|batt04-160x128x1.bmp|66|115|
-%xl|J|batt05-160x128x1.bmp|66|115|
-%xl|K|batt06-160x128x1.bmp|66|115|
-%xl|L|batt07-160x128x1.bmp|66|115|
-%xl|M|vol0-160x128x1.bmp|87|114|
-%xl|N|vol1-160x128x1.bmp|87|114|
-%xl|O|vol2-160x128x1.bmp|87|114|
-%xl|P|vol3-160x128x1.bmp|87|114|
-%xl|p|vol4-160x128x1.bmp|87|114|
-%xl|q|vol5-160x128x1.bmp|87|114|
-%xl|r|vol6-160x128x1.bmp|87|114|
-%xl|s|vol7-160x128x1.bmp|87|114|
-%xl|t|vol8-160x128x1.bmp|87|114|
-%xl|u|vol9-160x128x1.bmp|87|114|
-%xl|Q|shuffle-160x128x1.bmp|107|115|
-%xl|R|repeatall-160x128x1.bmp|127|113|
-%xl|S|repeatone-160x128x1.bmp|127|113|
-%xl|T|repeatshuffle-160x128x1.bmp|127|113|
-%xl|U|repeatab-160x128x1.bmp|127|113|
-%xl|V|stop-160x128x1.bmp|145|114|
-%xl|W|play-160x128x1.bmp|145|114|
-%xl|X|pause-160x128x1.bmp|145|114|
-%xl|Y|ff-160x128x1.bmp|145|114|
-%xl|Z|rew-160x128x1.bmp|145|114|
+%xl|A|lock-160x128x1.bmp|48|114|2|
+%xl|B|battery-160x128x1.bmp|66|115|10|
+%xl|C|volume-160x128x1.bmp|87|114|10|
+%xl|D|shuffle-160x128x1.bmp|107|115|
+%xl|E|repeat-160x128x1.bmp|127|113|4|
+%xl|F|playmode-160x128x1.bmp|145|114|5|
 %pb|8|1|159|86|
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d2<%d2|(root)>>
@@ -47,10 +21,9 @@
 %s%ac%?It<%It|%Fn>
 
 %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|%xdp|%xdq|%xdr|%xds|%xdt|%xdu>
-%?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>
diff --git a/wps/cabbiev2/batt00-160x128x1.bmp b/wps/cabbiev2/batt00-160x128x1.bmp
deleted file mode 100644
index 92b5b65bb5..0000000000
--- a/wps/cabbiev2/batt00-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-112x64x1.bmp b/wps/cabbiev2/batt01-112x64x1.bmp
deleted file mode 100644
index 5b8442d02e..0000000000
--- a/wps/cabbiev2/batt01-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-160x128x1.bmp b/wps/cabbiev2/batt01-160x128x1.bmp
deleted file mode 100644
index f0ad8be617..0000000000
--- a/wps/cabbiev2/batt01-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-112x64x1.bmp b/wps/cabbiev2/batt02-112x64x1.bmp
deleted file mode 100644
index 46c8c0c198..0000000000
--- a/wps/cabbiev2/batt02-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-160x128x1.bmp b/wps/cabbiev2/batt02-160x128x1.bmp
deleted file mode 100644
index 15113c3845..0000000000
--- a/wps/cabbiev2/batt02-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-112x64x1.bmp b/wps/cabbiev2/batt03-112x64x1.bmp
deleted file mode 100644
index dddf1627b8..0000000000
--- a/wps/cabbiev2/batt03-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-160x128x1.bmp b/wps/cabbiev2/batt03-160x128x1.bmp
deleted file mode 100644
index 7a690cd7bc..0000000000
--- a/wps/cabbiev2/batt03-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-112x64x1.bmp b/wps/cabbiev2/batt04-112x64x1.bmp
deleted file mode 100644
index 2175f08885..0000000000
--- a/wps/cabbiev2/batt04-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-160x128x1.bmp b/wps/cabbiev2/batt04-160x128x1.bmp
deleted file mode 100644
index 33592d2f77..0000000000
--- a/wps/cabbiev2/batt04-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-112x64x1.bmp b/wps/cabbiev2/batt05-112x64x1.bmp
deleted file mode 100644
index 651bca4ce6..0000000000
--- a/wps/cabbiev2/batt05-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-160x128x1.bmp b/wps/cabbiev2/batt05-160x128x1.bmp
deleted file mode 100644
index f756ad9a4d..0000000000
--- a/wps/cabbiev2/batt05-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-112x64x1.bmp b/wps/cabbiev2/batt06-112x64x1.bmp
deleted file mode 100644
index de1e3e527a..0000000000
--- a/wps/cabbiev2/batt06-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-160x128x1.bmp b/wps/cabbiev2/batt06-160x128x1.bmp
deleted file mode 100644
index 9cd90ce29f..0000000000
--- a/wps/cabbiev2/batt06-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-160x128x1.bmp b/wps/cabbiev2/batt07-160x128x1.bmp
deleted file mode 100644
index 65a22e77e0..0000000000
--- a/wps/cabbiev2/batt07-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-112x64x1.bmp b/wps/cabbiev2/battch-112x64x1.bmp
deleted file mode 100644
index bd3137b748..0000000000
--- a/wps/cabbiev2/battch-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-160x128x1.bmp b/wps/cabbiev2/battch-160x128x1.bmp
deleted file mode 100644
index d3727505ac..0000000000
--- a/wps/cabbiev2/battch-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battery-112x64x1.bmp b/wps/cabbiev2/battery-112x64x1.bmp
new file mode 100644
index 0000000000..70a1bf3ef1
--- /dev/null
+++ b/wps/cabbiev2/battery-112x64x1.bmp
diff --git a/wps/cabbiev2/battery-160x128x1.bmp b/wps/cabbiev2/battery-160x128x1.bmp
new file mode 100644
index 0000000000..77eb624372
--- /dev/null
+++ b/wps/cabbiev2/battery-160x128x1.bmp
diff --git a/wps/cabbiev2/battpl-112x64x1.bmp b/wps/cabbiev2/battpl-112x64x1.bmp
deleted file mode 100644
index 8d81587d7d..0000000000
--- a/wps/cabbiev2/battpl-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battpl-160x128x1.bmp b/wps/cabbiev2/battpl-160x128x1.bmp
deleted file mode 100644
index 45b6c2a68b..0000000000
--- a/wps/cabbiev2/battpl-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-112x64x1.bmp b/wps/cabbiev2/ff-112x64x1.bmp
deleted file mode 100644
index ba9d00059a..0000000000
--- a/wps/cabbiev2/ff-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-160x128x1.bmp b/wps/cabbiev2/ff-160x128x1.bmp
deleted file mode 100644
index ae047eeaca..0000000000
--- a/wps/cabbiev2/ff-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lock-112x64x1.bmp b/wps/cabbiev2/lock-112x64x1.bmp
new file mode 100644
index 0000000000..f763437e1c
--- /dev/null
+++ b/wps/cabbiev2/lock-112x64x1.bmp
diff --git a/wps/cabbiev2/lock-160x128x1.bmp b/wps/cabbiev2/lock-160x128x1.bmp
new file mode 100644
index 0000000000..0912518547
--- /dev/null
+++ b/wps/cabbiev2/lock-160x128x1.bmp
diff --git a/wps/cabbiev2/lockclosed-112x64x1.bmp b/wps/cabbiev2/lockclosed-112x64x1.bmp
deleted file mode 100644
index e3eabc847a..0000000000
--- a/wps/cabbiev2/lockclosed-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockclosed-160x128x1.bmp b/wps/cabbiev2/lockclosed-160x128x1.bmp
deleted file mode 100644
index 2a702b669f..0000000000
--- a/wps/cabbiev2/lockclosed-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-160x128x1.bmp b/wps/cabbiev2/lockopen-160x128x1.bmp
deleted file mode 100644
index c0f7a55ad2..0000000000
--- a/wps/cabbiev2/lockopen-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-112x64x1.bmp b/wps/cabbiev2/pause-112x64x1.bmp
deleted file mode 100644
index 70bbac052e..0000000000
--- a/wps/cabbiev2/pause-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-160x128x1.bmp b/wps/cabbiev2/pause-160x128x1.bmp
deleted file mode 100644
index 5a166b5873..0000000000
--- a/wps/cabbiev2/pause-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-112x64x1.bmp b/wps/cabbiev2/play-112x64x1.bmp
deleted file mode 100644
index c76aa553d6..0000000000
--- a/wps/cabbiev2/play-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/play-160x128x1.bmp b/wps/cabbiev2/play-160x128x1.bmp
deleted file mode 100644
index a196fe6d6b..0000000000
--- a/wps/cabbiev2/play-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/playmode-112x64x1.bmp b/wps/cabbiev2/playmode-112x64x1.bmp
new file mode 100644
index 0000000000..1b003288ed
--- /dev/null
+++ b/wps/cabbiev2/playmode-112x64x1.bmp
diff --git a/wps/cabbiev2/playmode-160x128x1.bmp b/wps/cabbiev2/playmode-160x128x1.bmp
new file mode 100644
index 0000000000..29dc3c560f
--- /dev/null
+++ b/wps/cabbiev2/playmode-160x128x1.bmp
diff --git a/wps/cabbiev2/repeat-112x64x1.bmp b/wps/cabbiev2/repeat-112x64x1.bmp
new file mode 100644
index 0000000000..59fd11a7c7
--- /dev/null
+++ b/wps/cabbiev2/repeat-112x64x1.bmp
diff --git a/wps/cabbiev2/repeat-160x128x1.bmp b/wps/cabbiev2/repeat-160x128x1.bmp
new file mode 100644
index 0000000000..d4f4ad66b6
--- /dev/null
+++ b/wps/cabbiev2/repeat-160x128x1.bmp
diff --git a/wps/cabbiev2/repeatab-112x64x1.bmp b/wps/cabbiev2/repeatab-112x64x1.bmp
deleted file mode 100644
index 8ea7529fe0..0000000000
--- a/wps/cabbiev2/repeatab-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatab-160x128x1.bmp b/wps/cabbiev2/repeatab-160x128x1.bmp
deleted file mode 100644
index fd9375b035..0000000000
--- a/wps/cabbiev2/repeatab-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-112x64x1.bmp b/wps/cabbiev2/repeatall-112x64x1.bmp
deleted file mode 100644
index fed4917abf..0000000000
--- a/wps/cabbiev2/repeatall-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-160x128x1.bmp b/wps/cabbiev2/repeatall-160x128x1.bmp
deleted file mode 100644
index 424442d891..0000000000
--- a/wps/cabbiev2/repeatall-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-112x64x1.bmp b/wps/cabbiev2/repeatone-112x64x1.bmp
deleted file mode 100644
index 700d6d1754..0000000000
--- a/wps/cabbiev2/repeatone-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-160x128x1.bmp b/wps/cabbiev2/repeatone-160x128x1.bmp
deleted file mode 100644
index 4af13dc327..0000000000
--- a/wps/cabbiev2/repeatone-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-112x64x1.bmp b/wps/cabbiev2/repeatshuffle-112x64x1.bmp
deleted file mode 100644
index b9458c3a2d..0000000000
--- a/wps/cabbiev2/repeatshuffle-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-160x128x1.bmp b/wps/cabbiev2/repeatshuffle-160x128x1.bmp
deleted file mode 100644
index a41300c24f..0000000000
--- a/wps/cabbiev2/repeatshuffle-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-112x64x1.bmp b/wps/cabbiev2/rew-112x64x1.bmp
deleted file mode 100644
index bd99e3cda9..0000000000
--- a/wps/cabbiev2/rew-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-160x128x1.bmp b/wps/cabbiev2/rew-160x128x1.bmp
deleted file mode 100644
index ded7941073..0000000000
--- a/wps/cabbiev2/rew-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/stop-160x128x1.bmp b/wps/cabbiev2/stop-160x128x1.bmp
deleted file mode 100644
index cafe76644f..0000000000
--- a/wps/cabbiev2/stop-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-160x128x1.bmp b/wps/cabbiev2/vol0-160x128x1.bmp
deleted file mode 100644
index 0f94ab6e78..0000000000
--- a/wps/cabbiev2/vol0-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-112x64x1.bmp b/wps/cabbiev2/vol1-112x64x1.bmp
deleted file mode 100644
index 682ff8f212..0000000000
--- a/wps/cabbiev2/vol1-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-160x128x1.bmp b/wps/cabbiev2/vol1-160x128x1.bmp
deleted file mode 100644
index 2a029e1522..0000000000
--- a/wps/cabbiev2/vol1-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-112x64x1.bmp b/wps/cabbiev2/vol2-112x64x1.bmp
deleted file mode 100644
index 4b49613696..0000000000
--- a/wps/cabbiev2/vol2-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-160x128x1.bmp b/wps/cabbiev2/vol2-160x128x1.bmp
deleted file mode 100644
index 3826546540..0000000000
--- a/wps/cabbiev2/vol2-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-112x64x1.bmp b/wps/cabbiev2/vol3-112x64x1.bmp
deleted file mode 100644
index bc012488fd..0000000000
--- a/wps/cabbiev2/vol3-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-160x128x1.bmp b/wps/cabbiev2/vol3-160x128x1.bmp
deleted file mode 100644
index c56961e6d2..0000000000
--- a/wps/cabbiev2/vol3-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-112x64x1.bmp b/wps/cabbiev2/vol4-112x64x1.bmp
deleted file mode 100644
index 93c7a2f591..0000000000
--- a/wps/cabbiev2/vol4-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-160x128x1.bmp b/wps/cabbiev2/vol4-160x128x1.bmp
deleted file mode 100644
index 815e5aaad2..0000000000
--- a/wps/cabbiev2/vol4-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-112x64x1.bmp b/wps/cabbiev2/vol5-112x64x1.bmp
deleted file mode 100644
index 2c588f75a3..0000000000
--- a/wps/cabbiev2/vol5-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-160x128x1.bmp b/wps/cabbiev2/vol5-160x128x1.bmp
deleted file mode 100644
index 9d2a1e0e1b..0000000000
--- a/wps/cabbiev2/vol5-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-112x64x1.bmp b/wps/cabbiev2/vol6-112x64x1.bmp
deleted file mode 100644
index 112a54b178..0000000000
--- a/wps/cabbiev2/vol6-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-160x128x1.bmp b/wps/cabbiev2/vol6-160x128x1.bmp
deleted file mode 100644
index 25017757e6..0000000000
--- a/wps/cabbiev2/vol6-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-112x64x1.bmp b/wps/cabbiev2/vol7-112x64x1.bmp
deleted file mode 100644
index fc11096228..0000000000
--- a/wps/cabbiev2/vol7-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-160x128x1.bmp b/wps/cabbiev2/vol7-160x128x1.bmp
deleted file mode 100644
index 8fd3636e15..0000000000
--- a/wps/cabbiev2/vol7-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-112x64x1.bmp b/wps/cabbiev2/vol8-112x64x1.bmp
deleted file mode 100644
index 0042cd6d4e..0000000000
--- a/wps/cabbiev2/vol8-112x64x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-160x128x1.bmp b/wps/cabbiev2/vol8-160x128x1.bmp
deleted file mode 100644
index 84318fde22..0000000000
--- a/wps/cabbiev2/vol8-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-160x128x1.bmp b/wps/cabbiev2/vol9-160x128x1.bmp
deleted file mode 100644
index c87b3f02e9..0000000000
--- a/wps/cabbiev2/vol9-160x128x1.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/volume-112x64x1.bmp b/wps/cabbiev2/volume-112x64x1.bmp
new file mode 100644
index 0000000000..3963d1c306
--- /dev/null
+++ b/wps/cabbiev2/volume-112x64x1.bmp
diff --git a/wps/cabbiev2/volume-160x128x1.bmp b/wps/cabbiev2/volume-160x128x1.bmp
new file mode 100644
index 0000000000..c9a836a77f
--- /dev/null
+++ b/wps/cabbiev2/volume-160x128x1.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-112x64x1.bmp b/wps/cabbiev2/wpsbackdrop-112x64x1.bmp
index 12831dd304..321a617124 100644
--- a/wps/cabbiev2/wpsbackdrop-112x64x1.bmp
+++ b/wps/cabbiev2/wpsbackdrop-112x64x1.bmp