SKIN BREAK: %pb, %bl and %pv (bar types) changed so the image is the last param instead of the first. skin updater, skins and manual all updated.

NEW PARSER: add an 'N' param type which will accept any number of strings, will cause very big problems if this isnt the last param for a tag.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26727 a1c6a512-1295-4272-9138-f99709370657

51 files changed, 51 insertions, 51 deletions

diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps
index 0ca6d497d0..8ab30f3c36 100644
--- a/wps/Rockboxed.112x64x1.wps
+++ b/wps/Rockboxed.112x64x1.wps
@@ -12,7 +12,7 @@
 %al%s%ac%?id<%id|%d(1)>%ar
 %al%s%ac%?it<%it|%fn>%ar
 %ac%t(3)%ig;%ac%iy
-%pb(-,10,-,92,5)
+%pb(10,-,92,5,-)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|unknown>%ar%pt 
 %?ps<%xd(Ba)|%xd(Bb)>
 %?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>
diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps
index 142cbbf04f..579983be42 100644
--- a/wps/Rockboxed.128x128x16.wps
+++ b/wps/Rockboxed.128x128x16.wps
@@ -14,7 +14,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t(3)%ig;%ac%iy 
-%pb(pg-108.bmp,10,76,108,5)
+%pb(10,76,108,5,pg-108.bmp)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps
index 24af5b553b..1c714ab7e1 100644
--- a/wps/Rockboxed.132x80x16.wps
+++ b/wps/Rockboxed.132x80x16.wps
@@ -12,7 +12,7 @@
 %al %s%ac%?ia<%ia|%d(2)>%ar 
 %al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
-%pb(pg-108.bmp,12,43,106,5)
+%pb(12,43,106,5,pg-108.bmp)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown|nsf|speex|spc|ape|wma>%ar%pt  
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps
index fbb8fd6209..a39fcf2f3c 100644
--- a/wps/Rockboxed.138x110x2.wps
+++ b/wps/Rockboxed.138x110x2.wps
@@ -13,7 +13,7 @@
 %al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 %ac%t(3)%ig;%ac%iy 
-%pb(pg-grey-118.bmp,10,-,118,5)
+%pb(10,-,118,5,pg-grey-118.bmp)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps
index 62d265ab8a..d4178f11c1 100644
--- a/wps/Rockboxed.160x128x16.wps
+++ b/wps/Rockboxed.160x128x16.wps
@@ -14,7 +14,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t(3)%ig;%ac%iy 
-%pb(pg-140.bmp,10,76,140,5)
+%pb(10,76,140,5,pg-140.bmp)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps
index 95f4f65cbc..ca8422328a 100644
--- a/wps/Rockboxed.160x128x2.wps
+++ b/wps/Rockboxed.160x128x2.wps
@@ -14,7 +14,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t(3)%ig;%ac%iy 
-%pb(pg-grey-140.bmp,10,-,140,5)
+%pb(10,-,140,5,pg-grey-140.bmp)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps
index aa1e24ed84..cc85088697 100644
--- a/wps/Rockboxed.176x132x16.wps
+++ b/wps/Rockboxed.176x132x16.wps
@@ -14,7 +14,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t(3)%ig;%ac%iy
-%pb(pg-156.bmp,10,75,156,5)
+%pb(10,75,156,5,pg-156.bmp)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps
index 231a8f63da..71fe50042f 100644
--- a/wps/Rockboxed.176x220x16.wps
+++ b/wps/Rockboxed.176x220x16.wps
@@ -22,7 +22,7 @@
 
 
 
-%pb(pg-156.bmp,10,171,156,5)
+%pb(10,171,156,5,pg-156.bmp)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps
index 86cd6a14e2..76183d7c2e 100644
--- a/wps/Rockboxed.220x176x16.wps
+++ b/wps/Rockboxed.220x176x16.wps
@@ -16,7 +16,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t(3)%ig;%ac%iy 
-%pb(pg-200.bmp,10,116,200,5)
+%pb(10,116,200,5,pg-200.bmp)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps
index dab77880f9..d1e5593e2e 100644
--- a/wps/Rockboxed.240x320x16.wps
+++ b/wps/Rockboxed.240x320x16.wps
@@ -21,7 +21,7 @@
 
 %ac%t(3)%ig;%ac%iy 
 
-%pb(pg-220.bmp,10,256,220,5)
+%pb(10,256,220,5,pg-220.bmp)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps
index 1f3a34e7fd..304e5763c0 100644
--- a/wps/Rockboxed.320x240x16.wps
+++ b/wps/Rockboxed.320x240x16.wps
@@ -17,7 +17,7 @@
 
 
 %ac%t(3)%ig;%ac%iy 
-%pb(pg-300.bmp,10,178,300,5)
+%pb(10,178,300,5,pg-300.bmp)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
 %?ps<%xd(B)>
 %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps
index 3be3066c51..1aefde64d4 100644
--- a/wps/UniCatcher.128x96x1.wps
+++ b/wps/UniCatcher.128x96x1.wps
@@ -3,7 +3,7 @@
 %t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
-%pb(-,11,-,106,4)
+%pb(11,-,106,4,-)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %xl(A,battery-s.bmp,109,3,5)
diff --git a/wps/UniCatcher.160x128x16.wps b/wps/UniCatcher.160x128x16.wps
index 28fa7db619..5285e976c0 100644
--- a/wps/UniCatcher.160x128x16.wps
+++ b/wps/UniCatcher.160x128x16.wps
@@ -6,7 +6,7 @@
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %al %fbKbps
-%pb(-,10,-,140,4)
+%pb(10,-,140,4,-)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %xl(A,battery.bmp,135,8,5)
diff --git a/wps/UniCatcher.160x128x2.wps b/wps/UniCatcher.160x128x2.wps
index 1e3418b83e..d25ce44ee3 100644
--- a/wps/UniCatcher.160x128x2.wps
+++ b/wps/UniCatcher.160x128x2.wps
@@ -6,7 +6,7 @@
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %al %fbKbps
-%pb(-,10,-,140,4)
+%pb(10,-,140,4,-)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %xl(A,battery-g.bmp,135,8,5)
diff --git a/wps/UniCatcher.176x132x16.wps b/wps/UniCatcher.176x132x16.wps
index 155f51c1f7..164c6f4aa6 100644
--- a/wps/UniCatcher.176x132x16.wps
+++ b/wps/UniCatcher.176x132x16.wps
@@ -6,7 +6,7 @@
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %al %fbKbps
-%pb(-,10,-,156,4)
+%pb(10,-,156,4,-)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %xl(A,battery.bmp,151,8,5)
diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps
index c221ffcebb..badca5371c 100644
--- a/wps/UniCatcher.176x220x16.wps
+++ b/wps/UniCatcher.176x220x16.wps
@@ -11,7 +11,7 @@
 
 
 %al %fbKbps
-%pb(-,10,-,156,4)
+%pb(10,-,156,4,-)
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
 %xl(A,battery.bmp,151,8,5)
diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps
index 7b66e86434..296fb4640f 100644
--- a/wps/UniCatcher.220x176x16.wps
+++ b/wps/UniCatcher.220x176x16.wps
@@ -8,7 +8,7 @@
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 %al %fbKbps
-%pb(-,11,-,198,6)
+%pb(11,-,198,6,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps
index 7f705f151a..0cd370d754 100644
--- a/wps/UniCatcher.240x320x16.wps
+++ b/wps/UniCatcher.240x320x16.wps
@@ -16,7 +16,7 @@
 
 
 %al %fbKbps
-%pb(-,11,-,218,7)
+%pb(11,-,218,7,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps
index cd58bc1ffb..b299f182e1 100644
--- a/wps/UniCatcher.320x240x16.wps
+++ b/wps/UniCatcher.320x240x16.wps
@@ -11,7 +11,7 @@
 
 
 %al %fbKbps
-%pb(-,11,-,298,7)
+%pb(11,-,298,7,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps
index df507b28dc..11f800a923 100644
--- a/wps/boxes.220x176x16.wps
+++ b/wps/boxes.220x176x16.wps
@@ -26,7 +26,7 @@
 
   %fbk
 
-%pb(pb-220.bmp,0,-,208,8)
+%pb(0,-,208,8,pb-220.bmp)
 
 
 %ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index 9f5055fd2d..c1923ecfe3 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -14,7 +14,7 @@
 %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)
+%pb(1,42,110,4,pb-112x64x1.bmp)
 %pc%ar%pr
 #Bottom status bar
 %?mh<%xd(Aa)|%xd(Ab)>
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index caca739b5a..8fa5938b0e 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -10,7 +10,7 @@
 %xl(E,repeat-128x128x16.bmp,97,110,4)
 %xl(F,playmode-128x128x16.bmp,111,110,5)
 %ax%Cl(4,12,60,60)
-%pb(pb-128x128x16.bmp,3,87,122,6)
+%pb(3,87,122,6,pb-128x128x16.bmp)
 # images all in the default viewport
 %?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)|%xd(Bj)>>
diff --git a/wps/cabbiev2.128x128x2.wps b/wps/cabbiev2.128x128x2.wps
index 17dfcfa88a..717290a932 100644
--- a/wps/cabbiev2.128x128x2.wps
+++ b/wps/cabbiev2.128x128x2.wps
@@ -10,7 +10,7 @@
 %xl(E,repeat-160x128x2.bmp,93,113,4)
 %xl(F,playmode-160x128x2.bmp,112,114,5)
 %ax%Cl(4,12,60,60)
-%pb(pb-128x96x2.bmp,1,87,125,7)
+%pb(1,87,125,7,pb-128x96x2.bmp)
 # images all in the default viewport
 %?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)|%xd(Bj)>>
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index f5b89d24e6..2461e48dd6 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -6,7 +6,7 @@
 # progressbar viewport
 %V(0,0,128,6,1)
 %x(a,pbbackground-128x64x1.bmp,1,0)
-%pb(pb-128x64x1.bmp,2,1,124,4)
+%pb(2,1,124,4,pb-128x64x1.bmp)
 
 %V(0,8,128,8,1)
 %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps
index 32b35f512b..4a649763fb 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -8,7 +8,7 @@
 %xl(D,shuffle-160x128x2.bmp,72,2)
 %xl(E,repeat-160x128x2.bmp,93,0,4)
 %xl(F,playmode-160x128x2.bmp,112,1,5)
-%pb(pb-128x96x2.bmp,1,61,125,7)
+%pb(1,61,125,7,pb-128x96x2.bmp)
 %V(0,83,128,13,1)%Vf(0)%Vb(3)
 %?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)|%xd(Bj)>>
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 29342dfdac..978a547572 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -9,7 +9,7 @@
 %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(pb-132x80x16.bmp,2,58,127,6)
+%pb(2,58,127,6,pb-132x80x16.bmp)
 %?C<%Cd%Vd(a)|%Vd(b)>
 
 #Images
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 081e38d84f..6930d8c428 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -11,7 +11,7 @@
 %xl(E,repeat-160x128x2.bmp,102,97,4)
 %xl(F,playmode-160x128x2.bmp,123,98,5)
 %ax%Cl(5,15,55,55)
-%pb(pb-138x110x2.bmp,2,75,134,6)
+%pb(2,75,134,6,pb-138x110x2.bmp)
 #images
 %?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)|%xd(Bj)>>
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps
index 6c7891151b..122c49cc0f 100644
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -11,7 +11,7 @@
 %xl(D,shuffle-160x128x1.bmp,107,115)
 %xl(E,repeat-160x128x1.bmp,127,113,4)
 %xl(F,playmode-160x128x1.bmp,145,114,5)
-%pb(pb-160x128x1.bmp,1,86,158,8)
+%pb(1,86,158,8,pb-160x128x1.bmp)
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index b1477b452f..2a0a03afb6 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -10,7 +10,7 @@
 %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(pb-160x128x16.bmp,6,86,149,8)
+%pb(6,86,149,8,pb-160x128x16.bmp)
 %?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)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 39876c9073..b47275a53e 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -12,7 +12,7 @@
 %xl(E,repeat-160x128x2.bmp,127,113,4)
 %xl(F,playmode-160x128x2.bmp,145,114,5)
 %ax%Cl(2,16,64,64)
-%pb(pb-160x128x2.bmp,1,86,158,8)
+%pb(1,86,158,8,pb-160x128x2.bmp)
 %?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)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 3be806d902..53ab87f453 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -11,7 +11,7 @@
 %xl(E,repeat-176x132x16.bmp,139,113,4)
 %xl(F,playmode-176x132x16.bmp,156,115,5)
 %ax%Cl(9,16,65,65)
-%pb(pb-176x132x16.bmp,8,86,160,8)
+%pb(8,86,160,8,pb-176x132x16.bmp)
 %?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)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 5a3416876d..c0c7cfc827 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -9,7 +9,7 @@
 %xl(E,repeat-176x220x16.bmp,144,204,4)
 %xl(F,playmode-176x220x16.bmp,159,204,5)
 %Cl(29,20,120,120,c,c)
-%pb(pb-176x220x16.bmp,5,182,166,8)
+%pb(5,182,166,8,pb-176x220x16.bmp)
 #NowPlaying
 
 
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index c88c74b1ef..0c42f637a3 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -10,7 +10,7 @@
 %xl(E,repeat-220x176x16.bmp,182,151,4)
 %xl(F,playmode-220x176x16.bmp,200,152,5)
 %ax%Cl(15,32,75,75)
-%pb(pb-220x176x16.bmp,11,121,199,8)
+%pb(11,121,199,8,pb-220x176x16.bmp)
 %?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)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
diff --git a/wps/cabbiev2.240x320x16.mini2440.wps b/wps/cabbiev2.240x320x16.mini2440.wps
index 8733ac41a8..8eba53e6f8 100644
--- a/wps/cabbiev2.240x320x16.mini2440.wps
+++ b/wps/cabbiev2.240x320x16.mini2440.wps
@@ -17,7 +17,7 @@
 %xl(E,repeat-240x320x16.bmp,182,292,4)
 %xl(F,playmode-240x320x16.bmp,206,292,5)
 %Cl(55,30,130,130,c,c)
-%pb(pb-240x320x16.bmp,22,254,199,13)
+%pb(22,254,199,13,pb-240x320x16.bmp)
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
 %?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index b667e6b0eb..435e713e6c 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -12,7 +12,7 @@
 %xl(E,repeat-240x320x16.bmp,182,292,4)
 %xl(F,playmode-240x320x16.bmp,206,292,5)
 %Cl(55,30,130,130,c,c)
-%pb(pb-240x320x16.bmp,22,254,199,13)
+%pb(22,254,199,13,pb-240x320x16.bmp)
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
 %?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index 94c7109d98..a64fa6fcf7 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -6,7 +6,7 @@
 %wd
 %X(wpsbackdrop-240x400x16.bmp)
 %Cl(55,50,130,130,c,c)
-%pb(pb-240x320x16.bmp,22,284,199,13)
+%pb(22,284,199,13,pb-240x320x16.bmp)
 %T(22,284,199,13,progressbar)
 %T(90,238,60,20,playlist)
 %?Tl(2.5)<%Vd(t)|%Vd(u)>
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index f6e70d52f3..0d9e2cc0a2 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -19,7 +19,7 @@
 %?Tl(2.5)<%Vd(t)|%Vd(u)>
 
 %Cl(16,32,120,120)
-%pb(pb-320x240x16.bmp,10,162,300,15)
+%pb(10,162,300,15,pb-320x240x16.bmp)
 %?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)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index 1c6ddb6383..f84c52eece 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -10,7 +10,7 @@
 %xl(E,repeat-320x240x16.bmp,261,207,4)
 %xl(F,playmode-320x240x16.bmp,286,207,5)
 %ax%Cl(16,32,120,120)
-%pb(pb-320x240x16.bmp,10,162,300,15)
+%pb(10,162,300,15,pb-320x240x16.bmp)
 %?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)|%xd(Bj)>>
 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps
index d3154b12b5..458b1a5a3f 100644
--- a/wps/iCatcher.112x64x1.wps
+++ b/wps/iCatcher.112x64x1.wps
@@ -5,7 +5,7 @@
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb(-,11,-,90,3)
+%pb(11,-,90,3,-)
 %t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>;%t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>
 
 %xl(A,battery-s.bmp,93,3,5)
diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps
index f4ca8efecf..2e3d83e905 100644
--- a/wps/iCatcher.128x128x16.wps
+++ b/wps/iCatcher.128x128x16.wps
@@ -11,7 +11,7 @@
 
 
 %al %fbKbps
-%pb(-,11,-,106,4)
+%pb(11,-,106,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.128x64x1.160x128x2.wps b/wps/iCatcher.128x64x1.160x128x2.wps
index 55eb1ff51f..801aecafb5 100644
--- a/wps/iCatcher.128x64x1.160x128x2.wps
+++ b/wps/iCatcher.128x64x1.160x128x2.wps
@@ -4,7 +4,7 @@
 %t(1) %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t(1) %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
-%pb(-,11,-,106,4)
+%pb(11,-,106,4,-)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %xl(A,battery-s.bmp,109,3,5)
diff --git a/wps/iCatcher.128x96x1.wps b/wps/iCatcher.128x96x1.wps
index 2c19ae21b0..7a63817d6b 100644
--- a/wps/iCatcher.128x96x1.wps
+++ b/wps/iCatcher.128x96x1.wps
@@ -6,7 +6,7 @@
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb(-,11,-,106,4)
+%pb(11,-,106,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps
index e35a062887..8d1fcf6a33 100644
--- a/wps/iCatcher.132x80x16.wps
+++ b/wps/iCatcher.132x80x16.wps
@@ -6,7 +6,7 @@
 %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb(-,11,-,106,4)
+%pb(11,-,106,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps
index 6c2658c9d2..8af79c66b5 100644
--- a/wps/iCatcher.138x110x2.wps
+++ b/wps/iCatcher.138x110x2.wps
@@ -10,7 +10,7 @@
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb(-,10,-,118,4)
+%pb(10,-,118,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps
index 60e0edca0f..e33030f359 100644
--- a/wps/iCatcher.160x128x16.wps
+++ b/wps/iCatcher.160x128x16.wps
@@ -11,7 +11,7 @@
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb(-,10,-,140,4)
+%pb(10,-,140,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps
index bb6276944c..cffbd1c46c 100644
--- a/wps/iCatcher.160x128x2.wps
+++ b/wps/iCatcher.160x128x2.wps
@@ -11,7 +11,7 @@
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb(-,10,-,140,4)
+%pb(10,-,140,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps
index c743eef8da..51bcbbf95b 100644
--- a/wps/iCatcher.176x132x16.wps
+++ b/wps/iCatcher.176x132x16.wps
@@ -11,7 +11,7 @@
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb(-,10,-,156,4)
+%pb(10,-,156,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps
index 9066482dc5..db19c1e503 100644
--- a/wps/iCatcher.176x220x16.wps
+++ b/wps/iCatcher.176x220x16.wps
@@ -15,7 +15,7 @@
 
 
 %al %fbKbps
-%pb(-,10,-,156,4)
+%pb(10,-,156,4,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps
index c0efa9ca8a..03f15287b3 100644
--- a/wps/iCatcher.220x176x16.wps
+++ b/wps/iCatcher.220x176x16.wps
@@ -9,7 +9,7 @@
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb(-,11,-,198,6)
+%pb(11,-,198,6,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
index 0bf5249af7..31e3b606f7 100644
--- a/wps/iCatcher.240x320x16.wps
+++ b/wps/iCatcher.240x320x16.wps
@@ -13,7 +13,7 @@
 
 
 %al %fbKbps
-%pb(-,11,-,218,7)
+%pb(11,-,218,7,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
index 4437cc3a11..0c192f18d9 100644
--- a/wps/iCatcher.320x240x16.wps
+++ b/wps/iCatcher.320x240x16.wps
@@ -9,7 +9,7 @@
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb(-,11,-,298,7)
+%pb(11,-,298,7,-)
 
 %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>