diff --git a/docs/CREDITS b/docs/CREDITS
index 3683bc0..216ebda 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -554,6 +554,7 @@
 Martin Sägmüller
 Joshua Hulst
 Pierre-Yves Roosens
+Hayden Pearce
 
 The libmad team
 The wavpack team
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index 8fa5938..4837e0f 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -1,43 +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-128x128x16.bmp)
-%xl(A,lock-128x128x16.bmp,3,110,2)
-%xl(B,battery-128x128x16.bmp,23,110,10)
-%xl(C,volume-128x128x16.bmp,51,110,10)
-%xl(D,shuffle-128x128x16.bmp,74,110)
-%xl(E,repeat-128x128x16.bmp,97,110,4)
-%xl(F,playmode-128x128x16.bmp,111,110,5)
-%ax%Cl(4,12,60,60)
-%pb(3,87,122,6,pb-128x128x16.bmp)
-# images all in the default viewport
+#
+# Preload Images
+%xl(A,lock-128x128x16.bmp,0,0,2)
+%xl(B,battery-128x128x16.bmp,0,0,10)
+%xl(C,volume-128x128x16.bmp,0,0,10)
+%xl(D,shuffle-128x128x16.bmp,0,0)
+%xl(E,repeat-128x128x16.bmp,0,0,4)
+%xl(F,playmode-128x128x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(3,87,122,6,-)
+%pb(0,0,122,6,pb-128x128x16.bmp)
+#
+# Hold
+%V(3,110,17,13,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(23,110,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(51,110,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(74,110,20,13,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(74,110,10,13,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(111,110,14,13,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-
-#NowPlaying - with AA
+#
+# Next Track Info
+%V(3,70,122,12,-)
+%s%ac%Sx(Next:) %?It<%It|%Fn>
+#
+# Time Elapsed/Remaining
+%V(3,95,122,12,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,4,12,60,60,-)
+%Cl(0,0,60,60,c,c)
+%Cd
+#
+# Track Info - Album Art
 %ax%Vl(a,70,12,-,50,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%iy
-
-#NowPlaying - without AA
+%s%al%?iy<%iy>
+#
+# Track Info - No Album Art
 %Vl(b,0,12,-,50,1)
 %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%iy
-
-#next and playlist
-%V(3,70,122,12,1)
-%s%ac%Sx(Next:) %?It<%It|%Fn>
-%V(3,95,122,12,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+%s%ac%?iy<%iy>
diff --git a/wps/cabbiev2.128x128x2.wps b/wps/cabbiev2.128x128x2.wps
index 717290a..1cc4c39 100644
--- a/wps/cabbiev2.128x128x2.wps
+++ b/wps/cabbiev2.128x128x2.wps
@@ -1,43 +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-128x128x2.bmp)
-%xl(A,lock-160x128x2.bmp,3,114,2)
-%xl(B,battery-160x128x2.bmp,26,115,10)
-%xl(C,volume-160x128x2.bmp,49,114,10)
-%xl(D,shuffle-160x128x2.bmp,72,115)
-%xl(E,repeat-160x128x2.bmp,93,113,4)
-%xl(F,playmode-160x128x2.bmp,112,114,5)
-%ax%Cl(4,12,60,60)
-%pb(1,87,125,7,pb-128x96x2.bmp)
-# images all in the default viewport
+#
+# 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,87,125,7,-)
+%pb(0,0,125,7,pb-128x96x2.bmp)
+#
+# Hold
+%V(3,114,14,10,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(26,115,17,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(49,114,16,10,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(72,115,16,9,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(93,113,12,13,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(112,114,11,11,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-
-#NowPlaying - with AA
-%ax%Vl(a,70,12,-,50,1)
+#
+# Next Track Info
+%V(3,70,122,12,-)
+%s%ac%Sx(Next:) %?It<%It|%Fn>
+#
+# Time Elapsed/Remaining
+%V(3,96,122,12,-)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,4,12,60,60,-)
+%Cl(0,0,60,60,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,70,12,-,50,-)
 %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%iy
-
-#NowPlaying - without AA
-%Vl(b,0,12,-,50,1)
+%s%al%?iy<%iy>
+#
+# Track Info - No Album Art
+%Vl(b,0,12,-,50,-)
 %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%iy
-
-#next and playlist
-%V(3,70,122,12,1)
-%s%ac%Sx(Next:) %?It<%It|%Fn>
-%V(3,96,122,12,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+%s%ac%?iy<%iy>
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 978a547..c1d85c2 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%)>>
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 6930d8c..c4db5ec 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -1,39 +1,74 @@
-# cabbie 2.0 default
-# ported from 160*128 greyscale port by Mark Fawcus (yapper)
+# Cabbie 2.0 default
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-# derived from "cabbie" (C) Yohann Misquitta
+# Derived from "cabbie" (C) Yohann Misquitta
+# Ported to 138x110 greyscale by Mark Fawcus (yapper)
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-138x110x2.bmp)
-%xl(A,lock-160x128x2.bmp,4,98,2)
-%xl(B,battery-160x128x2.bmp,28,99,10)
-%xl(C,volume-160x128x2.bmp,53,98,10)
-%xl(D,shuffle-160x128x2.bmp,78,97)
-%xl(E,repeat-160x128x2.bmp,102,97,4)
-%xl(F,playmode-160x128x2.bmp,123,98,5)
-%ax%Cl(5,15,55,55)
-%pb(2,75,134,6,pb-138x110x2.bmp)
-#images
+#
+# 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(2,75,134,6,-)
+%pb(0,0,134,6,pb-138x110x2.bmp)
+#
+# Hold
+%V(4,98,16,10,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(28,99,17,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(53,98,16,10,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(78,97,16,9,1)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(102,97,12,13,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(123,98,11,11,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-%ax%Vl(a,65,10,-,60,1)
+#
+# Time Elapsed/Remaining
+%V(2,82,134,13,-)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,5,15,55,55,-)
+%Cl(0,0,55,55,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,65,10,-,60,-)
 %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,-,60,1)
+#
+# Track Info - No Album Art
+%Vl(b,0,10,-,60,-)
 %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(2,82,134,13,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 2a0a03a..7255b35 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
-
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index b47275a..6091d1b 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
-
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 53ab87f..0ac083d 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -1,26 +1,63 @@
-# cabbie 2.0 default
+# Cabbie 2.0 default
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
-#derived from "cabbie" (C) Yohann Misquitta
-#Ported to nano by crzyboyster
+# Derived from "cabbie" (C) Yohann Misquitta
+# Ported to Apple iPod Nano by crzyboyster
+#
+# Disable Status Bar
 %wd
+#
+# Load Backdrop
 %X(wpsbackdrop-176x132x16.bmp)
-%xl(A,lock-176x132x16.bmp,65,116,2)
-%xl(B,battery-176x132x16.bmp,83,117,10)
-%xl(C,volume-176x132x16.bmp,102,117,10)
-%xl(D,shuffle-176x132x16.bmp,120,117)
-%xl(E,repeat-176x132x16.bmp,139,113,4)
-%xl(F,playmode-176x132x16.bmp,156,115,5)
-%ax%Cl(9,16,65,65)
-%pb(8,86,160,8,pb-176x132x16.bmp)
+#
+# Preload Images
+%xl(A,lock-176x132x16.bmp,0,0,2)
+%xl(B,battery-176x132x16.bmp,0,0,10)
+%xl(C,volume-176x132x16.bmp,0,0,10)
+%xl(D,shuffle-176x132x16.bmp,0,0)
+%xl(E,repeat-176x132x16.bmp,0,0,4)
+%xl(F,playmode-176x132x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(8,86,160,8,-)
+%pb(0,0,160,8,pb-176x132x16.bmp)
+#
+# Hold
+%V(65,116,13,10,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(83,117,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(102,117,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(120,117,15,8,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(139,113,11,15,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(156,115,10,11,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%Cd%Vd(a)|%Vd(b)>
-
-#NowPlaying
+#
+# Time Elapsed/Remaining
+%V(8,96,160,12,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,9,16,65,65,-)
+%Cl(0,0,65,65,c,c)
+%Cd
+#
+# Track Info - Album Art
 %ax%Vl(a,81,12,-,74,1)
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
@@ -28,7 +65,8 @@
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-
+#
+# Track Info - No Album Art
 %Vl(b,0,12,-,74,1)
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
@@ -36,6 +74,3 @@
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-
-%V(8,96,160,12,1)
-%al%pc%ac%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr%ar%pr
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 0c42f63..821ccfb 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.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-220x176x16.bmp)
-%xl(A,lock-220x176x16.bmp,88,152,2)
-%xl(B,battery-220x176x16.bmp,110,153,10)
-%xl(C,volume-220x176x16.bmp,134,153,10)
-%xl(D,shuffle-220x176x16.bmp,155,153)
-%xl(E,repeat-220x176x16.bmp,182,151,4)
-%xl(F,playmode-220x176x16.bmp,200,152,5)
-%ax%Cl(15,32,75,75)
-%pb(11,121,199,8,pb-220x176x16.bmp)
+#
+# Preload Images
+%xl(A,lock-220x176x16.bmp,0,0,2)
+%xl(B,battery-220x176x16.bmp,0,0,10)
+%xl(C,volume-220x176x16.bmp,0,0,10)
+%xl(D,shuffle-220x176x16.bmp,0,0)
+%xl(E,repeat-220x176x16.bmp,0,0,4)
+%xl(F,playmode-220x176x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(11,121,199,8,-)
+%pb(0,0,199,8,pb-220x176x16.bmp)
+#
+# Hold
+%V(88,152,17,26,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(110,153,20,11,-)
 %?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(134,153,16,11,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(155,153,20,10,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(182,151,11,15,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(200,152,12,13,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-
-#NowPlaying
-%?C<%Vd(a)%Cd|%Vd(b)>
-
-%ax%Vl(a,105,30,-,90,1)
+#
+# Time Elapsed/Remaining
+%V(11,130,199,20,-)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,15,32,75,75,-)
+%Cl(0,0,75,75,c,c)
+%Cd
+#
+# Track Info - Album Art
+%ax%Vl(a,105,30,-,90,-)
 %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,30,-,90,1)
+#
+# Track Info - No Album Art
+%Vl(b,0,30,-,90,-)
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-
-
-%V(11,130,199,20,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index f84c52e..dd216c9 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -1,46 +1,79 @@
-# 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-320x240x16.bmp)
-%xl(A,lock-320x240x16.bmp,91,207,2)
-%xl(B,battery-320x240x16.bmp,126,207,10)
-%xl(C,volume-320x240x16.bmp,177,207,10)
-%xl(D,shuffle-320x240x16.bmp,218,211)
-%xl(E,repeat-320x240x16.bmp,261,207,4)
-%xl(F,playmode-320x240x16.bmp,286,207,5)
-%ax%Cl(16,32,120,120)
-%pb(10,162,300,15,pb-320x240x16.bmp)
+#
+# Preload Images
+%xl(A,lock-320x240x16.bmp,0,0,2)
+%xl(B,battery-320x240x16.bmp,0,0,10)
+%xl(C,volume-320x240x16.bmp,0,0,10)
+%xl(D,shuffle-320x240x16.bmp,0,0)
+%xl(E,repeat-320x240x16.bmp,0,0,4)
+%xl(F,playmode-320x240x16.bmp,0,0,5)
+#
+# Album Art/Info Viewport Conditional
+%?C<%Vd(a)|%Vd(b)>
+#
+# Progress Bar
+%V(10,162,300,15,-)
+%pb(0,0,300,15,pb-320x240x16.bmp)
+#
+# Hold
+%V(91,207,30,13,-)
 %?mh<%xd(Aa)|%xd(Ab)>
+#
+# Battery
+%V(126,207,44,23,-)
 %?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(177,207,34,23,-)
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+#
+# Shuffle
+%V(218,211,37,16,-)
 %?ps<%xd(D)>
+#
+# Repeat
+%V(261,207,18,23,-)
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+#
+# Playmode
+%V(286,207,24,23,-)
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-
-%?C<%Vd(a)%Cd|%Vd(b)>
-#NowPlaying
-
+#
+# Time Elapsed/Remaining
+%V(10,180,300,20,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
+#
+# Album Art
+%ax%Vl(a,16,32,120,120,-)
+%Cl(0,0,120,120,c,c)
+%Cd
+#
+# Track Info - Album Art
 %ax%Vl(a,153,30,-,130,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%iy
+%s%al%?iy<%iy>
 
 %s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
-%s%al%Ia
-
+%s%al%?Ia<%Ia>
+#
+# Track Info - No Album Art
 %ax%Vl(b,0,30,-,130,1)
 %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%iy
+%s%ac%?iy<%iy>
 
 %ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
-%s%ac%Ia
-
-%V(10,180,300,20,1)
-%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
-
+%s%ac%?Ia<%Ia>