1 files changed, 17 insertions, 17 deletions

diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index 4f8078c2b3..9f5055fd2d 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -1,25 +1,25 @@
 # cabbie 2.0 default for the Archos Series by Marianne Arnold
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%x|z|wpsbackdrop-112x64x1.bmp|0|0|
-%xl|A|lock-112x64x1.bmp|4|56|2|
-%xl|B|battery-112x64x1.bmp|22|56|9|
-%xl|C|volume-112x64x1.bmp|41|56|9|
-%xl|D|shuffle-112x64x1.bmp|59|56|
-%xl|E|repeat-112x64x1.bmp|81|56|4|
-%xl|F|playmode-112x64x1.bmp|98|56|5|
+%x(z,wpsbackdrop-112x64x1.bmp,0,0)
+%xl(A,lock-112x64x1.bmp,4,56,2)
+%xl(B,battery-112x64x1.bmp,22,56,9)
+%xl(C,volume-112x64x1.bmp,41,56,9)
+%xl(D,shuffle-112x64x1.bmp,59,56)
+%xl(E,repeat-112x64x1.bmp,81,56,4)
+%xl(F,playmode-112x64x1.bmp,98,56,5)
 #NowPlaying
 
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
-%t5%ac%s%?Fn<%Sx|Next:| %?It<%It|%Fn>|%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>>;%t5%ac%s%?Fn<%Sx|Next:| %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>>
-%pb|pb-112x64x1.bmp|1|42|110|4|
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>
+%pb(pb-112x64x1.bmp,1,42,110,4)
 %pc%ar%pr
 #Bottom status bar
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>