1 files changed, 55 insertions, 21 deletions

diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index b47275a53e..6091d1b91d 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -1,42 +1,76 @@
-# cabbie 2.0 default
-# 160*128 greyscale port by Mark Fawcus (yapper)
-# works with 64*64 album art if present
+# Cabbie 2.0 default
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# derived from "cabbie" (C) Yohann Misquitta
+# Derived from "cabbie" (C) Yohann Misquitta
+# Ported to 160x128 greyscale by Mark Fawcus (yapper)
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-160x128x2.bmp)
-%xl(A,lock-160x128x2.bmp,48,114,2)
-%xl(B,battery-160x128x2.bmp,66,115,10)
-%xl(C,volume-160x128x2.bmp,87,114,10)
-%xl(D,shuffle-160x128x2.bmp,107,115)
-%xl(E,repeat-160x128x2.bmp,127,113,4)
-%xl(F,playmode-160x128x2.bmp,145,114,5)
-%ax%Cl(2,16,64,64)
-%pb(1,86,158,8,pb-160x128x2.bmp)
+#
+# Preload Images
+%xl(A,lock-160x128x2.bmp,0,0,2)
+%xl(B,battery-160x128x2.bmp,0,0,10)
+%xl(C,volume-160x128x2.bmp,0,0,10)
+%xl(D,shuffle-160x128x2.bmp,0,0)
+%xl(E,repeat-160x128x2.bmp,0,0,4)
+%xl(F,playmode-160x128x2.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(1,86,158,8,-)
+%pb(0,0,158,8,pb-160x128x2.bmp)
+#
+# Hold
+%V(48,114,14,11,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(66,115,17,10,-)
 %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+#
+# Volume
+%V(87,114,16,11,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+%V(107,115,16,9,-)
+# Shuffle
 %?ps<%xd(D)>
+#
+%V(127,113,12,13,-)
+# Repeat
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+%V(145,114,11,11,-)
+# Playmode
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-%ax%Vl(a,70,10,-,75,1)
+#
+# Time Elapsed/Remaining
+%V(1,96,158,10,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,2,16,64,64,-)
+%Cl(0,0,64,64,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,70,10,-,75,-)
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-
-%Vl(b,0,10,-,75,1)
+#
+# Track Info - No Album Art
+%Vl(b,0,10,-,75,-)
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %s%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-
-%V(1,96,158,10,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
-