11 files changed, 17 insertions, 51 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 79a3b56063..08171aad16 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -208,13 +208,10 @@ Author: Jens Arnold
 
 <wps>
 Name: cabbiev2.wps
+RWPS: cabbiev2.rwps
 # Real name of the creator of the WPS
 Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
 
-#remote WPS settings
-rwps: cabbiev2.rwps-128x96x2.rwps
-rwps: cabbiev2.rwps-128x64x2.rwps
-
 # Preferred font (including .fnt extension - leave blank for player):
 Font.320x240x16: helvR12.fnt
 Font.240x320x16: helvR14.fnt
@@ -222,7 +219,7 @@ Font.220x176x16: helvR10.fnt
 Font.176x220x16: helvR10.fnt
 Font.176x132x16: helvR10.fnt
 Font.160x128x16: helvR10.fnt
-Font.160x128x2: mix12.fnt
+Font.160x128x2: helvR10.fnt
 Font.138x110x2: helvR10.fnt
 Font.128x128x16: helvR10.fnt
 Font.132x80x16: Sazanami-Mincho-Regular-11.fnt
@@ -283,43 +280,12 @@ viewers iconset.220x176x16: /.rockbox/icons/tango_small_viewers.bmp
 viewers iconset.240x320x16: /.rockbox/icons/tango_small_viewers.bmp 
 
 # Whether the WPS is designed to have the statusbar on or off
-Statusbar.320x240x16: on
-Statusbar.240x320x16: on
-Statusbar.220x176x16: on
-Statusbar.176x220x16: on
-Statusbar.176x132x16: on
-Statusbar.160x128x16: on
-Statusbar.160x128x2: on
-Statusbar.138x110x2: on
-Statusbar.128x128x16: on
-Statusbar.132x80x16: on
-Statusbar.112x64x1: on
-
-# The minimum required pixel height for the WPS
-# 176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player
-Height.320x240x16: 240
-Height.240x320x16: 320
-Height.220x176x16: 176
-Height.176x220x16: 220
-Height.176x132x16: 132
-Height.160x128x16: 128
-Height.160x128x2: 128
-Height.138x110x2: 110
-Height.128x128x16: 128
-Height.132x80x16: 80
-Height.112x64x1: 64
-
-# The minimum required pixel width for the WPS (160 for iRiver,
-# 220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player
-Width.320x240x16: 320
-Width.240x320x16: 240
-Width.220x176x16: 220
-Width.176x220x16: 176
-Width.176x132x16: 176
-Width.160x128x16: 160
-Width.160x128x2: 160
-Width.138x110x2: 138
-Width.128x128x16: 128
-Width.132x80x16: 132
-Width.112x64x1: 112
+Statusbar: on
 </wps>
+
+<rwps>
+Name: cabbiev2.rwps
+Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
+Font: helvR10.fnt
+Statusbar: on
+</rwps>
diff --git a/wps/cabbiev2.rwps-128x64x1.rwps b/wps/cabbiev2.128x64x1.wps
index 744011fb56..744011fb56 100644
--- a/wps/cabbiev2.rwps-128x64x1.rwps
+++ b/wps/cabbiev2.128x64x1.wps
diff --git a/wps/cabbiev2.rwps-128x96x2.rwps b/wps/cabbiev2.128x96x2.wps
index 6b1ac40b82..6b1ac40b82 100644
--- a/wps/cabbiev2.rwps-128x96x2.rwps
+++ b/wps/cabbiev2.128x96x2.wps
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 95c32f74dc..5d271b3b94 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -38,15 +38,15 @@
 %xl|Y|ff-160x128x2.bmp|145|114|
 %xl|Z|rew-160x128x2.bmp|145|114|
 %Cl|2|16|s64|s64|
-%pb|8|1|159|88|
+%pb|8|1|159|86|
 %?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)>>>
 
-%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
+%?C<%s%m|70|%alNext Track:|%s%acNext Track:>
+%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
 
-%al %pc%ac%pp of %pe%ar%pr 
-
+%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>
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index d343db8b11..9303dc3e7c 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -23,8 +23,7 @@
 %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|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|
@@ -37,8 +36,9 @@
 %xl|Y|ff-176x220x16.bmp|159|204|
 %xl|Z|rew-176x220x16.bmp|159|204|
 %Cl|29|20|c120|c120|
-%pb|8|9|171|182|
+%pb|8|5|171|182|
 #NowPlaying
+
 
 %?C<|%s%ac%?it<%it|%fn>>
 %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
diff --git a/wps/cabbiev2/background-128x96x2.bmp b/wps/cabbiev2/background-128x96x2.bmp
index e1bfa875de..61b0b9490e 100644
--- a/wps/cabbiev2/background-128x96x2.bmp
+++ b/wps/cabbiev2/background-128x96x2.bmp
diff --git a/wps/cabbiev2/lockclosed-160x128x2.bmp b/wps/cabbiev2/lockclosed-160x128x2.bmp
index 47c2985ede..6af64f246c 100644
--- a/wps/cabbiev2/lockclosed-160x128x2.bmp
+++ b/wps/cabbiev2/lockclosed-160x128x2.bmp
diff --git a/wps/cabbiev2/lockopen-160x128x2.bmp b/wps/cabbiev2/lockopen-160x128x2.bmp
index f7f62f97c4..b458a25c68 100644
--- a/wps/cabbiev2/lockopen-160x128x2.bmp
+++ b/wps/cabbiev2/lockopen-160x128x2.bmp
diff --git a/wps/cabbiev2/pb-176x220x16.bmp b/wps/cabbiev2/pb-176x220x16.bmp
index 75362128d8..614759a2a4 100644
--- a/wps/cabbiev2/pb-176x220x16.bmp
+++ b/wps/cabbiev2/pb-176x220x16.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp
index b6ade7dd32..f82b45cd23 100644
--- a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp
+++ b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-176x220x16.bmp b/wps/cabbiev2/wpsbackdrop-176x220x16.bmp
index b526140391..a367e77950 100644
--- a/wps/cabbiev2/wpsbackdrop-176x220x16.bmp
+++ b/wps/cabbiev2/wpsbackdrop-176x220x16.bmp