1 files changed, 54 insertions, 21 deletions

diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 2a0a03afb6..7255b35946 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -1,42 +1,75 @@
-# cabbie 2.0 default
+# Cabbie 2.0 default
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-#derived from "cabbie" (C) Yohann Misquitta
+# Derived from "cabbie" (C) Yohann Misquitta
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-160x128x16.bmp)
-%xl(A,lock-160x128x16.bmp,48,114,2)
-%xl(B,battery-160x128x16.bmp,66,115,10)
-%xl(C,volume-160x128x16.bmp,86,115,10)
-%xl(D,shuffle-160x128x16.bmp,104,116)
-%xl(E,repeat-160x128x16.bmp,125,112,4)
-%xl(F,playmode-160x128x16.bmp,142,114,5)
-%ax%Cl(7,16,65,65,c,c)
-%pb(6,86,149,8,pb-160x128x16.bmp)
+#
+# Preload Images
+%xl(A,lock-160x128x16.bmp,0,0,2)
+%xl(B,battery-160x128x16.bmp,0,0,10)
+%xl(C,volume-160x128x16.bmp,0,0,10)
+%xl(D,shuffle-160x128x16.bmp,0,0)
+%xl(E,repeat-160x128x16.bmp,0,0,4)
+%xl(F,playmode-160x128x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(6,86,149,8,-)
+%pb(0,0,149,8,pb-160x128x16.bmp)
+#
+# Hold
+%V(48,114,13,10,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(66,115,25,13,-)
 %?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(86,115,19,13,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(104,116,15,8,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(125,112,11,15,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(142,114,10,11,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-# NowPlaying - AA
-%ax%Vl(a,77,10,-,75,1)
+#
+# Time Elapsed/Remaining
+%V(6,96,149,10,-)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,7,16,65,65,-)
+%Cl(0,0,65,65,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,77,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%)>>
 
 %Sx(Next Track:)
 %s%?It<%It|%Fn>
-
-# NowPlaying - no AA
-%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%)>>
 
 %Sx(Next Track:)
 %s%?It<%It|%Fn>
-
-%V(6,96,149,10,1)
-%al%pc%ac%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr%ar%pr
-