--- /home/jonno/Downloads/r00009/240X320/rockbox/wps/cabbiev2.wps	2012-02-17 00:06:02.000000000 +1100
+++ /home/jonno/.config/rockbox.org/wps/cabbiev2.wps	2012-02-21 00:02:10.365605354 +1100
@@ -36,7 +36,9 @@
 #
 # VIEWPORT CONDITIONS
 #
-%?C<%Vd(albumart-viewport)%?vg(variable)<%Vd(current-track-albumart-viewport)%Vd(next-track-albumart-viewport)|%Vd(popup-viewport)|%Vd(volume-popup-viewport)>|%Vd(current-track-no-albumart-viewport)%?vg(variable)<%Vd(next-track-no-albumart-viewport)|%Vd(popup-viewport)|%Vd(volume-popup-viewport)>>
+%?C<%Vd(albumart-viewport)%?vl(variable, 4.0)<%?vg(variable)<%Vd(current-track-albumart-viewport)%Vd(next-track-albumart-viewport)|
+        %Vd(popup-viewport)|
+        %Vd(volume-popup-viewport)>>|%Vd(current-track-no-albumart-viewport)%?vg(variable)<%Vd(next-track-no-albumart-viewport)|%Vd(popup-viewport)|%Vd(volume-popup-viewport)>>
 #
 # ALBUM ART
 #
@@ -51,7 +53,7 @@
 
 
 
-%?Tl(albumart-touch,4.0)<%vs(variable,set,2)|%vs(variable,set,1)>
+%?Tl(albumart-touch)<%vs(variable,set,2)>
 #
 # CURRENT TRACK INFO - ALBUM ART
 #
@@ -76,7 +78,7 @@
 
 
 
-%?Tl(current-track-no-albumart-touch,4.0)<%vs(variable,set,2)|%vs(variable,set,1)>
+%?Tl(current-track-no-albumart-touch,4.0)<%vs(variable,set,2)>
 #
 # FASTFORWARD/NEXT
 #
@@ -153,7 +155,7 @@
 # TIME ELAPSED/REMAINING
 #
 %V(20,272,200,16,3)
-%al%pc%ac%?mv(2.0)<%?Sr<dB%pv :%Sx(Volume)|%Sx(Volume): %pvdB>|%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%ar-%pr
+%al%pc%ac%?mv(2.0)<%vs(variable,set,3)%?Sr<dB%pv :%Sx(Volume)|%Sx(Volume): %pvdB>|%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%ar-%pr
 #
 # VOLUME
 #
@@ -166,7 +168,7 @@
 
 
 
-%?Tl(volume-touch,4.0)<%vs(variable,set,3)|%?mv<%vs(variable,set,3)|%vs(variable,set,1)>>
+%?Tl(volume-touch)<%vs(variable,set,3)>
 #
 # VOLUME POPUP
 #