1 files changed, 50 insertions, 17 deletions

diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 978a547572..c1d85c2b7c 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -1,33 +1,66 @@
-# cabbie 2.0 default for the Sansa c200 Series by Marc Guay
-# derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# Cabbie 2.0 default
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# Derived from "cabbie" (C) Yohann Misquitta
+# Ported to Sansa c200 Series by Marc Guay
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-132x80x16.bmp)
-%xl(A,lock-132x80x16.bmp,36,69,2)
-%xl(B,battery-132x80x16.bmp,51,69,10)
-%xl(C,volume-132x80x16.bmp,69,69,10)
-%xl(D,shuffle-132x80x16.bmp,86,69)
-%xl(E,repeat-132x80x16.bmp,105,67,4)
-%xl(F,playmode-132x80x16.bmp,118,67,5)
-%ax%Cl(3,14,40,40,c,c)
-%pb(2,58,127,6,pb-132x80x16.bmp)
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-#Images
+#
+# Preload Images
+%xl(A,lock-132x80x16.bmp,0,0,2)
+%xl(B,battery-132x80x16.bmp,0,0,10)
+%xl(C,volume-132x80x16.bmp,0,0,10)
+%xl(D,shuffle-132x80x16.bmp,0,0)
+%xl(E,repeat-132x80x16.bmp,0,0,4)
+%xl(F,playmode-132x80x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(2,58,127,6,-)
+%pb(0,0,127,6,pb-132x80x16.bmp)
+#
+# Hold
+%V(36,69,12,9,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(51,69,16,9,-)
 %?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(69,69,13,9,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(86,69,16,8-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(105,67,9,12,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(118,67,10,11,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-
-#NowPlaying - aa
+#
+# Album Art
+%ax%Vl(a,3,14,40,40,-)
+%Cl(0,0,40,40,c,c)
+%Cd
+#
+# Track Info - Album Art
 %ax%Vl(a,48,10,-,48,1)
 %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:) %?It<%It|%Fn>
-
-#NowPlaying - no aa
+#
+# Track Info - No Album Art
 %Vl(b,0,10,-,48,1)
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>