3 files changed, 13 insertions, 12 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 312160b0ad..e8748eea7d 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -271,7 +271,7 @@ Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange
 
 # Preferred font (including .fnt extension - leave blank for player):
 Font.320x240x16: helvR12.fnt
-Font.240x320x16: helvR14.fnt
+Font.240x320x16: helvR12.fnt
 Font.220x176x16: helvR10.fnt
 Font.176x220x16: helvR10.fnt
 Font.176x132x16: helvR10.fnt
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 87e4cb286b..0e520c5beb 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -3,7 +3,7 @@
 # (C) Keith Perri (kperri) ported to (Gigabeat)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%ac%ca, %cb %cd, %?cf<%cH:%cM:%cS|%cl:%cM:%cS %cP>
+
 %X|wpsbackdrop-240x320x16.bmp|0|0|
 %P|pb-240x320x16.bmp|
 %xl|A|lockclosed-240x320x16.bmp|11|292|
@@ -26,7 +26,7 @@
 %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|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|
@@ -38,24 +38,25 @@
 %xl|X|pause-240x320x16.bmp|206|292|
 %xl|Y|ff-240x320x16.bmp|206|292|
 %xl|Z|rew-240x320x16.bmp|206|292|
-%Cl|50|35|sc140|sc140|
-%pb|13|22|221|241|
+%Cl|55|30|sc130|sc130|
+%pb|13|22|221|254|
 %?C<|>
-%?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
 %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
 %?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
 %?C<|%ac%?iy<%iy|>>
 %?C<|>
-%?C<|%ac%?fv<(vbr) |>%fb kB/s %fc>
-%?C<|>
-%?C<%s%ac%?it<%it|%fn>|%acNext Track:>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%ac%s%It>
-%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%s%ac%?It<%Ia|%Fn>>
+%?C<|%ac%?ig<%ig|>>
+%?C<|%ac%?fv<(vbr) |>%fb kbit/s %fc>
 %?C<|>
+%?C<%s%ac%?it<%it|%fn>|>
+%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%acNext Track:>
+%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%ac%s%It>
+%?C<|%s%ac%?It<%Ia|%Fn>>
+%?C<%s%ac%?Ia<Next: %Ia - |%?Fn<Next: %Fn|>>%It|>
+
 
      %pc%ac%pp of %pe%ar%pr     
-%?C<%s%ac%?Ia<Next: %Ia - |%?Fn<Next: %Fn|>>%It|>
 
 %?mh<%xdA|%xdB>
 %?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
diff --git a/wps/cabbiev2/wpsbackdrop-240x320x16.bmp b/wps/cabbiev2/wpsbackdrop-240x320x16.bmp
index c00dbde0ac..a9ece0259b 100644
--- a/wps/cabbiev2/wpsbackdrop-240x320x16.bmp
+++ b/wps/cabbiev2/wpsbackdrop-240x320x16.bmp