From 48f7d7d057ac2dd5b0237aa3afe9b23819f9b65e Mon Sep 17 00:00:00 2001
From: Marianne Arnold <pixelma@rockbox.org>
Date: Sat, 22 Mar 2008 14:17:28 +0000
Subject: Cabbiev2 cleanup and a few corrections: (1) Get rid of two completely
 unused bitmaps. (2) Combine the two bitmaps used as background on the Iriver
 remote into one, name it consistently and change the .wps file accordingly.
 (3) Add the missing '0dB' volume image to the greyscale versions, including
 .wps file changes. Rename those greyscale volume images while at it, so that
 they are consistent with the rest - the 'vol08' one is now 'vol-9', because
 it is used for above line level. (4) Use the %X tag correctly, currently
 there were coordinates specified with it in most .wps files. (5) Set the
 bitmap's mime-type correctly for conformity.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16742 a1c6a512-1295-4272-9138-f99709370657
---
 wps/cabbiev2.128x128x16.wps              |   2 +-
 wps/cabbiev2.128x64x1.wps                |  23 ++++----
 wps/cabbiev2.128x96x2.wps                |   3 +-
 wps/cabbiev2.132x80x16.wps               |   2 +-
 wps/cabbiev2.138x110x2.wps               |  87 ++++++++++++++---------------
 wps/cabbiev2.160x128x1.wps               |   2 +-
 wps/cabbiev2.160x128x16.wps              |   2 +-
 wps/cabbiev2.160x128x2.wps               |  91 ++++++++++++++++---------------
 wps/cabbiev2.176x132x16.wps              |   2 +-
 wps/cabbiev2.176x220x16.wps              |   2 +-
 wps/cabbiev2.220x176x16.wps              |   2 +-
 wps/cabbiev2.240x320x16.wps              |   2 +-
 wps/cabbiev2.320x240x16.wps              |   2 +-
 wps/cabbiev2/background-128x96x2.bmp     | Bin 12358 -> 0 bytes
 wps/cabbiev2/ebar-128x64x1.bmp           | Bin 192 -> 0 bytes
 wps/cabbiev2/npbar-128x64x1.bmp          | Bin 192 -> 0 bytes
 wps/cabbiev2/vol0-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol00-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol01-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol01.bmp                   | Bin 250 -> 0 bytes
 wps/cabbiev2/vol02-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol03-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol04-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol05-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol06-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol07-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol08-160x128x2.bmp         | Bin 250 -> 0 bytes
 wps/cabbiev2/vol1-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol2-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol3-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol4-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol5-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol6-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol7-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol8-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/vol9-160x128x2.bmp          | Bin 0 -> 250 bytes
 wps/cabbiev2/wpsbackdrop-128x64x1.bmp    | Bin 0 -> 1088 bytes
 wps/cabbiev2/wpsbackdrop-128x96x2.bmp    | Bin 0 -> 12358 bytes
 wps/cabbiev2/wpsbackdrop-176x132x16U.bmp | Bin 69752 -> 0 bytes
 39 files changed, 111 insertions(+), 111 deletions(-)
 delete mode 100644 wps/cabbiev2/background-128x96x2.bmp
 delete mode 100644 wps/cabbiev2/ebar-128x64x1.bmp
 delete mode 100644 wps/cabbiev2/npbar-128x64x1.bmp
 create mode 100644 wps/cabbiev2/vol0-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol00-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol01-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol01.bmp
 delete mode 100644 wps/cabbiev2/vol02-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol03-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol04-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol05-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol06-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol07-160x128x2.bmp
 delete mode 100644 wps/cabbiev2/vol08-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol1-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol2-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol3-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol4-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol5-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol6-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol7-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol8-160x128x2.bmp
 create mode 100644 wps/cabbiev2/vol9-160x128x2.bmp
 create mode 100644 wps/cabbiev2/wpsbackdrop-128x64x1.bmp
 create mode 100644 wps/cabbiev2/wpsbackdrop-128x96x2.bmp
 delete mode 100644 wps/cabbiev2/wpsbackdrop-176x132x16U.bmp

diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index 3a50ba6e53..1bddf1f905 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -2,7 +2,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-128x128x16.bmp|0|0|
+%X|wpsbackdrop-128x128x16.bmp|
 %P|pb-128x128x16.bmp|
 %xl|A|lockclosed-128x128x16.bmp|3|110|
 %xl|B|lockopen-128x128x16.bmp|3|110|
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index 744011fb56..a8287330dc 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -1,14 +1,13 @@
-# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
-# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
-%wd
-%P|pbar-128x64x1.bmp|
-%x|A|ebar-128x64x1.bmp|4|38|
-%xl|B|npbar-128x64x1.bmp|4|2|
-%pb|8|4|123|38|
-%s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-
-%al   %pc%ar%pr   
-
+# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
+# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
+%wd
+%P|pbar-128x64x1.bmp|
+%x|A|wpsbackdrop-128x64x1.bmp|0|0|
+%pb|8|4|123|38|
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%?d2<%d2|(root)>>
+
+%al   %pc%ar%pr   
+
 %xdB  
 
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps
index 6b1ac40b82..2e8a794f6a 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -1,7 +1,7 @@
 # cabbie 2.0 default for the iAudio X5 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|background-128x96x2.bmp|0|0|
+%X|wpsbackdrop-128x96x2.bmp|
 %P|pb-128x96x2.bmp|
 %pb|8|4|122|76|
 %s%ac%?it<%it|%fn>
@@ -11,4 +11,3 @@
 %sNext: %ac%It
 
 %al   %pc%ar%pr   
-
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 57736bf043..0cc33dc356 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -1,7 +1,7 @@
 # cabbie 2.0 default for the Sansa c200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-132x80x16.bmp|0|0|
+%X|wpsbackdrop-132x80x16.bmp|
 %P|pb-132x80x16.bmp|
 %xl|A|lockclosed-132x80x16.bmp|36|69|
 %xl|B|lockopen-132x80x16.bmp|36|69|
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 22595c6d3b..22b4f6f339 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -1,53 +1,54 @@
 # cabbie 2.0 default
 # ported from 160*128 greyscale port by Mark Fawcus (yapper)
-# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# derived from "cabbie" (C) Yohann Misquitta
-%wd
-%X|wpsbackdrop-138x110x2.bmp|0|0|
-%P|pb-138x110x2.bmp|
-%xl|A|lockclosed-160x128x2.bmp|2|96|
-%xl|B|lockopen-160x128x2.bmp|2|96|
-%xl|C|battpl-160x128x2.bmp|26|98|
-%xl|D|battch-160x128x2.bmp|26|98|
-%xl|E|batt00-160x128x2.bmp|26|98|
-%xl|F|batt01-160x128x2.bmp|26|98|
-%xl|G|batt02-160x128x2.bmp|26|98|
-%xl|H|batt03-160x128x2.bmp|26|98|
-%xl|I|batt04-160x128x2.bmp|26|98|
-%xl|J|batt05-160x128x2.bmp|26|98|
-%xl|K|batt06-160x128x2.bmp|26|98|
-%xl|L|batt07-160x128x2.bmp|26|98|
-%xl|M|vol00-160x128x2.bmp|54|98|
-%xl|N|vol01-160x128x2.bmp|54|98|
-%xl|O|vol02-160x128x2.bmp|54|98|
-%xl|P|vol03-160x128x2.bmp|54|98|
-%xl|p|vol04-160x128x2.bmp|54|98|
-%xl|q|vol05-160x128x2.bmp|54|98|
-%xl|r|vol06-160x128x2.bmp|54|98|
-%xl|s|vol07-160x128x2.bmp|54|98|
-%xl|t|vol08-160x128x2.bmp|54|98|
-%xl|Q|shuffle-160x128x2.bmp|86|97|
-%xl|R|repeatall-160x128x2.bmp|107|95|
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# derived from "cabbie" (C) Yohann Misquitta
+%wd
+%X|wpsbackdrop-138x110x2.bmp|
+%P|pb-138x110x2.bmp|
+%xl|A|lockclosed-160x128x2.bmp|2|96|
+%xl|B|lockopen-160x128x2.bmp|2|96|
+%xl|C|battpl-160x128x2.bmp|26|98|
+%xl|D|battch-160x128x2.bmp|26|98|
+%xl|E|batt00-160x128x2.bmp|26|98|
+%xl|F|batt01-160x128x2.bmp|26|98|
+%xl|G|batt02-160x128x2.bmp|26|98|
+%xl|H|batt03-160x128x2.bmp|26|98|
+%xl|I|batt04-160x128x2.bmp|26|98|
+%xl|J|batt05-160x128x2.bmp|26|98|
+%xl|K|batt06-160x128x2.bmp|26|98|
+%xl|L|batt07-160x128x2.bmp|26|98|
+%xl|M|vol0-160x128x2.bmp|54|98|
+%xl|N|vol1-160x128x2.bmp|54|98|
+%xl|O|vol2-160x128x2.bmp|54|98|
+%xl|P|vol3-160x128x2.bmp|54|98|
+%xl|p|vol4-160x128x2.bmp|54|98|
+%xl|q|vol5-160x128x2.bmp|54|98|
+%xl|r|vol6-160x128x2.bmp|54|98|
+%xl|s|vol7-160x128x2.bmp|54|98|
+%xl|t|vol8-160x128x2.bmp|54|98|
+%xl|u|vol9-160x128x2.bmp|54|98|
+%xl|Q|shuffle-160x128x2.bmp|86|97|
+%xl|R|repeatall-160x128x2.bmp|107|95|
 %xl|S|repeatone-160x128x2.bmp|107|95|
-%xl|T|repeatshuffle-160x128x2.bmp|107|95|
-%xl|U|repeatab-160x128x2.bmp|107|95|
-%xl|V|stop-160x128x2.bmp|124|97|
-%xl|W|play-160x128x2.bmp|124|97|
-%xl|X|pause-160x128x2.bmp|124|97|
-%xl|Y|ff-160x128x2.bmp|124|97|
-%xl|Z|rew-160x128x2.bmp|124|97|
-%Cl|5|15|s55|s55|
-%pb|6|2|136|75|
-%?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
+%xl|T|repeatshuffle-160x128x2.bmp|107|95|
+%xl|U|repeatab-160x128x2.bmp|107|95|
+%xl|V|stop-160x128x2.bmp|124|97|
+%xl|W|play-160x128x2.bmp|124|97|
+%xl|X|pause-160x128x2.bmp|124|97|
+%xl|Y|ff-160x128x2.bmp|124|97|
+%xl|Z|rew-160x128x2.bmp|124|97|
+%Cl|5|15|s55|s55|
+%pb|6|2|136|75|
+%?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
 %?C<%s%m|65|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<%s%m|65|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 %?C<%s%m|65|%alNext Track:|%acNext Track:>
-%?C<%s%m|65|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
-
-%al %pc%ac%pp of %pe%ar%pr 
-%?mh<%xdA|%xdB>
+%?C<%s%m|65|%al%?It<%It|%Fn>|%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>
+%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt|%xdu>
 %?ps<%xdQ>
 %?mm<|%xdR|%xdS|%xdT|%xdU>
 %?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps
index bab8182ee3..7d08f87171 100755
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -4,7 +4,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 # derived from "cabbie" (C) Yohann Misquitta
 %wd
-%x|z|wpsbackdrop-160x128x1.bmp|0|0|
+%X|wpsbackdrop-160x128x2.bmp|
 %P|pb-160x128x1.bmp|
 %xl|A|lockclosed-160x128x1.bmp|48|114|
 %xl|B|lockopen-160x128x1.bmp|48|114|
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index b4dc983dc7..0b71436f2e 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -3,7 +3,7 @@
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 %P|pb-160x128x16.bmp|
-%X|wpsbackdrop-160x128x16.bmp|0|0|
+%X|wpsbackdrop-160x128x16.bmp|
 %xl|A|lockclosed-160x128x16.bmp|48|114|
 %xl|B|lockopen-160x128x16.bmp|47|114|
 %xl|C|battpl-160x128x16.bmp|66|115|
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 5d271b3b94..e57675c5d7 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -1,45 +1,46 @@
 # cabbie 2.0 default
 # 160*128 greyscale port by Mark Fawcus (yapper)
 # works with 64*64 album art if present
-# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# derived from "cabbie" (C) Yohann Misquitta
-%wd
-%X|wpsbackdrop-160x128x2.bmp|0|0|
-%P|pb-160x128x2.bmp|
-%xl|A|lockclosed-160x128x2.bmp|56|114|
-%xl|B|lockopen-160x128x2.bmp|56|114|
-%xl|C|battpl-160x128x2.bmp|74|115|
-%xl|D|battch-160x128x2.bmp|74|115|
-%xl|E|batt00-160x128x2.bmp|74|115|
-%xl|F|batt01-160x128x2.bmp|74|115|
-%xl|G|batt02-160x128x2.bmp|74|115|
-%xl|H|batt03-160x128x2.bmp|74|115|
-%xl|I|batt04-160x128x2.bmp|74|115|
-%xl|J|batt05-160x128x2.bmp|74|115|
-%xl|K|batt06-160x128x2.bmp|74|115|
-%xl|L|batt07-160x128x2.bmp|74|115|
-%xl|M|vol00-160x128x2.bmp|95|115|
-%xl|N|vol01-160x128x2.bmp|95|115|
-%xl|O|vol02-160x128x2.bmp|95|115|
-%xl|P|vol03-160x128x2.bmp|95|115|
-%xl|p|vol04-160x128x2.bmp|95|115|
-%xl|q|vol05-160x128x2.bmp|95|115|
-%xl|r|vol06-160x128x2.bmp|95|115|
-%xl|s|vol07-160x128x2.bmp|95|115|
-%xl|t|vol08-160x128x2.bmp|95|115|
-%xl|Q|shuffle-160x128x2.bmp|117|115|
-%xl|R|repeatall-160x128x2.bmp|131|113|
-%xl|S|repeatone-160x128x2.bmp|131|113|
-%xl|T|repeatshuffle-160x128x2.bmp|131|113|
-%xl|U|repeatab-160x128x2.bmp|131|114|
-%xl|V|stop-160x128x2.bmp|145|114|
-%xl|W|play-160x128x2.bmp|145|114|
-%xl|X|pause-160x128x2.bmp|145|114|
-%xl|Y|ff-160x128x2.bmp|145|114|
-%xl|Z|rew-160x128x2.bmp|145|114|
-%Cl|2|16|s64|s64|
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# derived from "cabbie" (C) Yohann Misquitta
+%wd
+%X|wpsbackdrop-160x128x2.bmp|
+%P|pb-160x128x2.bmp|
+%xl|A|lockclosed-160x128x2.bmp|56|114|
+%xl|B|lockopen-160x128x2.bmp|56|114|
+%xl|C|battpl-160x128x2.bmp|74|115|
+%xl|D|battch-160x128x2.bmp|74|115|
+%xl|E|batt00-160x128x2.bmp|74|115|
+%xl|F|batt01-160x128x2.bmp|74|115|
+%xl|G|batt02-160x128x2.bmp|74|115|
+%xl|H|batt03-160x128x2.bmp|74|115|
+%xl|I|batt04-160x128x2.bmp|74|115|
+%xl|J|batt05-160x128x2.bmp|74|115|
+%xl|K|batt06-160x128x2.bmp|74|115|
+%xl|L|batt07-160x128x2.bmp|74|115|
+%xl|M|vol0-160x128x2.bmp|95|115|
+%xl|N|vol1-160x128x2.bmp|95|115|
+%xl|O|vol2-160x128x2.bmp|95|115|
+%xl|P|vol3-160x128x2.bmp|95|115|
+%xl|p|vol4-160x128x2.bmp|95|115|
+%xl|q|vol5-160x128x2.bmp|95|115|
+%xl|r|vol6-160x128x2.bmp|95|115|
+%xl|s|vol7-160x128x2.bmp|95|115|
+%xl|t|vol8-160x128x2.bmp|95|115|
+%xl|u|vol9-160x128x2.bmp|95|115|
+%xl|Q|shuffle-160x128x2.bmp|117|115|
+%xl|R|repeatall-160x128x2.bmp|131|113|
+%xl|S|repeatone-160x128x2.bmp|131|113|
+%xl|T|repeatshuffle-160x128x2.bmp|131|113|
+%xl|U|repeatab-160x128x2.bmp|131|114|
+%xl|V|stop-160x128x2.bmp|145|114|
+%xl|W|play-160x128x2.bmp|145|114|
+%xl|X|pause-160x128x2.bmp|145|114|
+%xl|Y|ff-160x128x2.bmp|145|114|
+%xl|Z|rew-160x128x2.bmp|145|114|
+%Cl|2|16|s64|s64|
 %pb|8|1|159|86|
-%?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
+%?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
 %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 
@@ -47,10 +48,10 @@
 %?C<%s%m|70|%al%?It<%It|%Fn>|%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>
-%?ps<%xdQ>
-%?mm<|%xdR|%xdS|%xdT|%xdU>
-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
-%?C<%C>
+%?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>
+%?C<%C>
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index f2ec257490..30729b29ac 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -4,7 +4,7 @@
 #Ported to nano by crzyboyster
 %wd
 %P|pb-176x132x16.bmp|
-%X|wpsbackdrop-176x132x16.bmp|0|0|
+%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|
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 9303dc3e7c..fa0df0af2a 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -1,7 +1,7 @@
 # cabbie 2.0 default for the Sansa e200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-176x220x16.bmp|0|0|
+%X|wpsbackdrop-176x220x16.bmp|
 %P|pb-176x220x16.bmp|
 %xl|A|lockclosed-176x220x16.bmp|51|204|
 %xl|B|lockopen-176x220x16.bmp|51|204|
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 5ea1874494..cab8e11edd 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -2,7 +2,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-220x176x16.bmp|0|0|
+%X|wpsbackdrop-220x176x16.bmp|
 %P|pb-220x176x16.bmp|
 %xl|A|lockclosed-220x176x16.bmp|88|152|
 %xl|B|lockopen-220x176x16.bmp|88|152|
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 0e520c5beb..87a73e5b33 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -4,7 +4,7 @@
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 
-%X|wpsbackdrop-240x320x16.bmp|0|0|
+%X|wpsbackdrop-240x320x16.bmp|
 %P|pb-240x320x16.bmp|
 %xl|A|lockclosed-240x320x16.bmp|11|292|
 %xl|B|lockopen-240x320x16.bmp|11|292|
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index 8794349c36..48d751cf40 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -2,7 +2,7 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-320x240x16.bmp|0|0|
+%X|wpsbackdrop-320x240x16.bmp|
 %P|pb-320x240x16.bmp|
 %xl|A|lockclosed-320x240x16.bmp|91|207|
 %xl|B|lockopen-320x240x16.bmp|91|207|
diff --git a/wps/cabbiev2/background-128x96x2.bmp b/wps/cabbiev2/background-128x96x2.bmp
deleted file mode 100644
index 61b0b9490e..0000000000
Binary files a/wps/cabbiev2/background-128x96x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/ebar-128x64x1.bmp b/wps/cabbiev2/ebar-128x64x1.bmp
deleted file mode 100644
index df6209767c..0000000000
Binary files a/wps/cabbiev2/ebar-128x64x1.bmp and /dev/null differ
diff --git a/wps/cabbiev2/npbar-128x64x1.bmp b/wps/cabbiev2/npbar-128x64x1.bmp
deleted file mode 100644
index 648a509851..0000000000
Binary files a/wps/cabbiev2/npbar-128x64x1.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol0-160x128x2.bmp b/wps/cabbiev2/vol0-160x128x2.bmp
new file mode 100644
index 0000000000..3ce5fbdc6b
Binary files /dev/null and b/wps/cabbiev2/vol0-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol00-160x128x2.bmp b/wps/cabbiev2/vol00-160x128x2.bmp
deleted file mode 100644
index 3ce5fbdc6b..0000000000
Binary files a/wps/cabbiev2/vol00-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol01-160x128x2.bmp b/wps/cabbiev2/vol01-160x128x2.bmp
deleted file mode 100644
index 5ae018cf1b..0000000000
Binary files a/wps/cabbiev2/vol01-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol01.bmp b/wps/cabbiev2/vol01.bmp
deleted file mode 100644
index 5ae018cf1b..0000000000
Binary files a/wps/cabbiev2/vol01.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol02-160x128x2.bmp b/wps/cabbiev2/vol02-160x128x2.bmp
deleted file mode 100644
index 113515ae23..0000000000
Binary files a/wps/cabbiev2/vol02-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol03-160x128x2.bmp b/wps/cabbiev2/vol03-160x128x2.bmp
deleted file mode 100644
index ee0ba1ed4b..0000000000
Binary files a/wps/cabbiev2/vol03-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol04-160x128x2.bmp b/wps/cabbiev2/vol04-160x128x2.bmp
deleted file mode 100644
index 70d0089d99..0000000000
Binary files a/wps/cabbiev2/vol04-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol05-160x128x2.bmp b/wps/cabbiev2/vol05-160x128x2.bmp
deleted file mode 100644
index 1bdf439fc3..0000000000
Binary files a/wps/cabbiev2/vol05-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol06-160x128x2.bmp b/wps/cabbiev2/vol06-160x128x2.bmp
deleted file mode 100644
index a49abf0d79..0000000000
Binary files a/wps/cabbiev2/vol06-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol07-160x128x2.bmp b/wps/cabbiev2/vol07-160x128x2.bmp
deleted file mode 100644
index 96d6a83b0c..0000000000
Binary files a/wps/cabbiev2/vol07-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol08-160x128x2.bmp b/wps/cabbiev2/vol08-160x128x2.bmp
deleted file mode 100644
index b2579560c5..0000000000
Binary files a/wps/cabbiev2/vol08-160x128x2.bmp and /dev/null differ
diff --git a/wps/cabbiev2/vol1-160x128x2.bmp b/wps/cabbiev2/vol1-160x128x2.bmp
new file mode 100644
index 0000000000..5ae018cf1b
Binary files /dev/null and b/wps/cabbiev2/vol1-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol2-160x128x2.bmp b/wps/cabbiev2/vol2-160x128x2.bmp
new file mode 100644
index 0000000000..113515ae23
Binary files /dev/null and b/wps/cabbiev2/vol2-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol3-160x128x2.bmp b/wps/cabbiev2/vol3-160x128x2.bmp
new file mode 100644
index 0000000000..ee0ba1ed4b
Binary files /dev/null and b/wps/cabbiev2/vol3-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol4-160x128x2.bmp b/wps/cabbiev2/vol4-160x128x2.bmp
new file mode 100644
index 0000000000..70d0089d99
Binary files /dev/null and b/wps/cabbiev2/vol4-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol5-160x128x2.bmp b/wps/cabbiev2/vol5-160x128x2.bmp
new file mode 100644
index 0000000000..1bdf439fc3
Binary files /dev/null and b/wps/cabbiev2/vol5-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol6-160x128x2.bmp b/wps/cabbiev2/vol6-160x128x2.bmp
new file mode 100644
index 0000000000..a49abf0d79
Binary files /dev/null and b/wps/cabbiev2/vol6-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol7-160x128x2.bmp b/wps/cabbiev2/vol7-160x128x2.bmp
new file mode 100644
index 0000000000..96d6a83b0c
Binary files /dev/null and b/wps/cabbiev2/vol7-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol8-160x128x2.bmp b/wps/cabbiev2/vol8-160x128x2.bmp
new file mode 100644
index 0000000000..70812b4d45
Binary files /dev/null and b/wps/cabbiev2/vol8-160x128x2.bmp differ
diff --git a/wps/cabbiev2/vol9-160x128x2.bmp b/wps/cabbiev2/vol9-160x128x2.bmp
new file mode 100644
index 0000000000..b2579560c5
Binary files /dev/null and b/wps/cabbiev2/vol9-160x128x2.bmp differ
diff --git a/wps/cabbiev2/wpsbackdrop-128x64x1.bmp b/wps/cabbiev2/wpsbackdrop-128x64x1.bmp
new file mode 100644
index 0000000000..b65163a1b6
Binary files /dev/null and b/wps/cabbiev2/wpsbackdrop-128x64x1.bmp differ
diff --git a/wps/cabbiev2/wpsbackdrop-128x96x2.bmp b/wps/cabbiev2/wpsbackdrop-128x96x2.bmp
new file mode 100644
index 0000000000..61b0b9490e
Binary files /dev/null and b/wps/cabbiev2/wpsbackdrop-128x96x2.bmp differ
diff --git a/wps/cabbiev2/wpsbackdrop-176x132x16U.bmp b/wps/cabbiev2/wpsbackdrop-176x132x16U.bmp
deleted file mode 100644
index 63095d1879..0000000000
Binary files a/wps/cabbiev2/wpsbackdrop-176x132x16U.bmp and /dev/null differ
-- 
cgit v1.2.3