Remove all themes but Cabbiev2.

As discussed remove all other themes from svn since they are available through
the theme website so there is no need to ship them with every Rockbox download
/ installation.

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

268 files changed, 0 insertions, 1664 deletions

diff --git a/wps/AUTHORS b/wps/AUTHORS
index 60b1820e72..069e684e4d 100644
--- a/wps/AUTHORS
+++ b/wps/AUTHORS
@@ -6,9 +6,6 @@ COPYING in this directory.
 
 AUTHORS
 
-boxes
-    Christi Scarborough
-
 cabbiev2:
     Jerry Lange
     Mark Fawcus
@@ -21,35 +18,3 @@ cabbiev2:
     Bertrik Sikken
     Keith Perri
     Yohann Misquitta
-
-DancePuffDuo:
-    Chris Oxtoby
-    Thomas Martitz
-
-engineer2:
-    Magnus Westerlund
-
-boxes:
-    Magnus Westerlund
-
-iAmp:
-    Raymond Hoh
-
-iCatcher:
-    Ioannis Koutoulakis
-
-Unicatcher:
-    Ioannis Koutoulakis
-
-ipodVOL:
-    Erik Fredericks
-
-progressive:
-    Jens Arnold
-
-Rockboxed
-    Roan Horning
-
-zezayer:
-    Dominik Riebeling
-    Jake Owen
diff --git a/wps/DancePuffDuo.128x64x1.wps b/wps/DancePuffDuo.128x64x1.wps
deleted file mode 100644
index 6157772367..0000000000
--- a/wps/DancePuffDuo.128x64x1.wps
+++ /dev/null
@@ -1,14 +0,0 @@
-%x(a,bg-r.bmp,0,0)
-%xl(A,playmode.bmp,59,0,5)
-%xl(B,repeat.bmp,114,0,4)
-%xl(C,Shf.bmp,101,0)
-%xl(D,Pow.bmp,5,53)
-%xl(E,battery.bmp,0,53,5)
-%xl(F,HoldM.bmp,36,0)
-%xl(G,HoldR.bmp,47,0)
-%wd
-%al   %pv%?mh<%xd(F)|>%?mr<%xd(G)|>%ac%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
-%ac%s%?in<%in. |>%?it<%it|%fn>
-%t(3)%ac%s%?ia<%ia|%d(2)>;%t(3)%ac%s%?id<%id|%d(1)>
-%pb
-%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>     %bl%%%ar%pc/%pt
diff --git a/wps/DancePuffDuo.160x128x1.wps b/wps/DancePuffDuo.160x128x1.wps
deleted file mode 100644
index cd7f9556e1..0000000000
--- a/wps/DancePuffDuo.160x128x1.wps
+++ /dev/null
@@ -1,27 +0,0 @@
-%x(a,bg.bmp,0,0)
-%xl(A,playmode.bmp,72,0,5)
-%xl(B,repeat.bmp,145,0,4)
-%xl(C,Shf.bmp,132,0)
-%xl(D,Pow.bmp,5,118)
-%xl(E,battery.bmp,0,118,5)
-%xl(F,DancePuff.bmp,129,65,4)
-%xl(G,DancePuff.bmp,5,65,4)
-%xl(H,HoldM.bmp,45,0)
-%xl(I,HoldR.bmp,56,0)
-%xl(J,rating.bmp,34,66,11)
-%xl(K,codec.bmp,70,66,22)
-%wd
-%al   %pv
-%ac%s%?in<%in. |>%?it<%it|%fn>
-%ac%s%?ia<%ia|%d(2)>
-%ac%s%?id<%id|%d(1)>
-%ac%s%t(2)%?ig<%ig|> %?iy<%(%iy%)|>
-
-%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt;%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt
-%pb
-%ac%s%?In<%In. |>%?It<%It - |%Fn >%?Id<%Id |%D(1) >
-%?bt<     %bt>%ar%?pp<[%pp/%pe]>
-%?mh<%xd(H)|>%?mr<%xd(I)|>%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
-%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>
-%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>#escape line ending to not break drawing but break long line
-%?fc<%xd(Ka)|%xd(Kb)|%xd(Kc)|%xd(Kd)|%xd(Ke)|%xd(Kf)|%xd(Kg)|%xd(Kh)|%xd(Ki)|%xd(Kj)|%xd(Kk)|%xd(Kl)|%xd(Km)|%xd(Kn)|%xd(Ko)|%xd(Kp)|%xd(Kq)|%xd(Kr)|%xd(Ks)|%xd(Kt)|%xd(Ku)|%xd(Kv)>
diff --git a/wps/DancePuffDuo.176x220x1.wps b/wps/DancePuffDuo.176x220x1.wps
deleted file mode 100644
index d137b806c9..0000000000
--- a/wps/DancePuffDuo.176x220x1.wps
+++ /dev/null
@@ -1,38 +0,0 @@
-%x(a,bg-176x220.bmp,0,0)
-%xl(A,playmode.bmp,82,0,5)
-%xl(B,repeat.bmp,205,0,4)
-%xl(C,Shf.bmp,192,0)
-%xl(D,Pow.bmp,5,157)
-%xl(E,battery.bmp,0,209,5)
-%xl(F,DancePuff.bmp,140,90,4)
-%xl(G,DancePuff.bmp,9,90,4)
-%xl(H,HoldM.bmp,45,0)
-%xl(I,HoldR.bmp,56,0)
-%xl(J,rating.bmp,42,90,11)
-%xl(K,codec.bmp,78,90,22)
-%wd
-%al   %pv
-
-%ac%s%?in<%in. |>%?it<%it|%fn>
-%ac%s%?ia<%ia|%d(2)>
-%ac%s%?id<%id|%d(1)>
-%ac%s%t(2)%?ig<%ig|> %?iy<%(%iy%)|>
-
-
-%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt;%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt
-%pb
-
-%ac%s%Sx(Next Track:)
-%ac%s%?In<%In. |>%?It<%It|%Fn>
-%ac%s%?Ia<%Ia|%D(2)>
-%ac%s%?Id<%Id|%D(1)>
-
-%?bt<     %bt>%ar%?pp<[%pp/%pe]>
-
-
-
-
-%?mh<%xd(H)|>%?mr<%xd(I)|>%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
-%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>
-%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>#escape line ending to not break drawing but break long line
-%?fc<%xd(Ka)|%xd(Kb)|%xd(Kc)|%xd(Kd)|%xd(Ke)|%xd(Kf)|%xd(Kg)|%xd(Kh)|%xd(Ki)|%xd(Kj)|%xd(Kk)|%xd(Kl)|%xd(Km)|%xd(Kn)|%xd(Ko)|%xd(Kp)|%xd(Kq)|%xd(Kr)|%xd(Ks)|%xd(Kt)|%xd(Ku)|%xd(Kv)>
diff --git a/wps/DancePuffDuo.220x176x1.wps b/wps/DancePuffDuo.220x176x1.wps
deleted file mode 100644
index 34f58112b8..0000000000
--- a/wps/DancePuffDuo.220x176x1.wps
+++ /dev/null
@@ -1,30 +0,0 @@
-%x(a,bg-220x176.bmp,0,0)
-%xl(A,playmode.bmp,102,0,5)
-%xl(B,repeat.bmp,205,0,4)
-%xl(C,Shf.bmp,192,0)
-%xl(D,Pow.bmp,5,157)
-%xl(E,battery.bmp,0,157,5)
-%xl(F,DancePuff.bmp,180,90,4)
-%xl(G,DancePuff.bmp,14,90,4)
-%xl(H,HoldM.bmp,45,0)
-%xl(I,HoldR.bmp,56,0)
-%xl(J,rating.bmp,64,90,11)
-%xl(K,codec.bmp,100,90,22)
-%wd
-%al   %pv
-
-%ac%s%?in<%in. |>%?it<%it|%fn>
-%ac%s%?ia<%ia|%d(2)>
-%ac%s%?id<%id|%d(1)>
-%ac%s%t(2)%?ig<%ig|> %?iy<%(%iy%)|>
-
-
-%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt;%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt
-%pb
-%ac%s%?In<%In. |>%?It<%It - |%Fn >%?Id<%Id |%D(1) >
-
-%?bt<     %bt>%ar%?pp<[%pp/%pe]>
-%?mh<%xd(H)|>%?mr<%xd(I)|>%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
-%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>
-%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>#escape line ending to not break drawing but break long line
-%?fc<%xd(Ka)|%xd(Kb)|%xd(Kc)|%xd(Kd)|%xd(Ke)|%xd(Kf)|%xd(Kg)|%xd(Kh)|%xd(Ki)|%xd(Kj)|%xd(Kk)|%xd(Kl)|%xd(Km)|%xd(Kn)|%xd(Ko)|%xd(Kp)|%xd(Kq)|%xd(Kr)|%xd(Ks)|%xd(Kt)|%xd(Ku)|%xd(Kv)>
diff --git a/wps/DancePuffDuo/DancePuff.bmp b/wps/DancePuffDuo/DancePuff.bmp
deleted file mode 100644
index 97295d0ca6..0000000000
--- a/wps/DancePuffDuo/DancePuff.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/HoldM.bmp b/wps/DancePuffDuo/HoldM.bmp
deleted file mode 100644
index 4518a32ffa..0000000000
--- a/wps/DancePuffDuo/HoldM.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/HoldR.bmp b/wps/DancePuffDuo/HoldR.bmp
deleted file mode 100644
index 123b065bea..0000000000
--- a/wps/DancePuffDuo/HoldR.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/Pow.bmp b/wps/DancePuffDuo/Pow.bmp
deleted file mode 100644
index 00887efa72..0000000000
--- a/wps/DancePuffDuo/Pow.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/Shf.bmp b/wps/DancePuffDuo/Shf.bmp
deleted file mode 100644
index 261332addd..0000000000
--- a/wps/DancePuffDuo/Shf.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/battery.bmp b/wps/DancePuffDuo/battery.bmp
deleted file mode 100644
index 63b464d9ce..0000000000
--- a/wps/DancePuffDuo/battery.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/bg-176x220.bmp b/wps/DancePuffDuo/bg-176x220.bmp
deleted file mode 100644
index 88588a79c7..0000000000
--- a/wps/DancePuffDuo/bg-176x220.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/bg-220x176.bmp b/wps/DancePuffDuo/bg-220x176.bmp
deleted file mode 100644
index 95d5a5c0d0..0000000000
--- a/wps/DancePuffDuo/bg-220x176.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/bg-r.bmp b/wps/DancePuffDuo/bg-r.bmp
deleted file mode 100644
index 0f3828c519..0000000000
--- a/wps/DancePuffDuo/bg-r.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/bg.bmp b/wps/DancePuffDuo/bg.bmp
deleted file mode 100644
index a4f4389620..0000000000
--- a/wps/DancePuffDuo/bg.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/codec.bmp b/wps/DancePuffDuo/codec.bmp
deleted file mode 100644
index 330c581a33..0000000000
--- a/wps/DancePuffDuo/codec.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/playmode.bmp b/wps/DancePuffDuo/playmode.bmp
deleted file mode 100644
index 8c5643adb6..0000000000
--- a/wps/DancePuffDuo/playmode.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/rating.bmp b/wps/DancePuffDuo/rating.bmp
deleted file mode 100644
index 59e423f83e..0000000000
--- a/wps/DancePuffDuo/rating.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo/repeat.bmp b/wps/DancePuffDuo/repeat.bmp
deleted file mode 100644
index 2c57b72cd5..0000000000
--- a/wps/DancePuffDuo/repeat.bmp
+++ /dev/null
diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps
deleted file mode 100644
index 8ab30f3c36..0000000000
--- a/wps/Rockboxed.112x64x1.wps
+++ /dev/null
@@ -1,23 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%x(a,bg-mono-small.bmp,42,49)
-%wd
-%xl(A,mode-mono-small.bmp,57,49,5)
-%xl(B,shuffle-mono-small.bmp,29,49,2)
-%xl(C,volume-mono-small.bmp,0,49,10)
-%xl(D,battery-mono-small.bmp,93,49,11)
-%xl(E,repeat-mono-small.bmp,43,49,5)
-%xl(F,lock-mono-small.bmp,70,49,2)
-%al%s%ac%?ia<%ia|%d(2)>%ar
-%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,-)
-%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)>
-%?mm<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>
-%?mh<%xd(Fa)|%xd(Fb)>
-%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)>
-
diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps
deleted file mode 100644
index 579983be42..0000000000
--- a/wps/Rockboxed.128x128x16.wps
+++ /dev/null
@@ -1,24 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-128x128x16.bmp)
-%xl(A,mode-color-small.bmp,62,109,4)
-%xl(B,shuffle-color-small.bmp,34,109)
-%xl(C,volume-color-small.bmp,15,111,9)
-%xl(D,battery-color-small.bmp,101,113,12)
-%xl(E,repeat-color-small.bmp,47,109,4)
-%xl(F,lock-color.bmp,78,109)
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-%ac%t(3)%ig;%ac%iy 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps
deleted file mode 100644
index 1c714ab7e1..0000000000
--- a/wps/Rockboxed.132x80x16.wps
+++ /dev/null
@@ -1,22 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-132x80x16.bmp)
-%xl(A,mode-color-small.bmp,62,65,4)
-%xl(B,shuffle-color-small.bmp,34,65)
-%xl(C,volume-color-small.bmp,15,67,9)
-%xl(D,battery-color-small.bmp,105,69,12)
-%xl(E,repeat-color-small.bmp,47,65,4)
-%xl(F,lock-color.bmp,82,65)
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps
deleted file mode 100644
index a39fcf2f3c..0000000000
--- a/wps/Rockboxed.138x110x2.wps
+++ /dev/null
@@ -1,23 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-138x110x2.bmp)
-%xl(A,mode-grey.bmp,68,91,4)
-%xl(B,shuffle-grey-medium.bmp,35,91)
-%xl(C,volume-grey.bmp,15,93,9)
-%xl(D,battery-grey-medium.bmp,111,95,11)
-%xl(E,repeat-grey-medium.bmp,51,91,4)
-%xl(F,lock-grey.bmp,88,90)
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-%ac%t(3)%ig;%ac%iy 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%?bl<|%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)>
diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps
deleted file mode 100644
index d4178f11c1..0000000000
--- a/wps/Rockboxed.160x128x16.wps
+++ /dev/null
@@ -1,24 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-160x128x16.bmp)
-%xl(A,mode-color-big.bmp,72,109,4)
-%xl(B,shuffle-color-big.bmp,36,109)
-%xl(C,volume-color-medium.bmp,15,111,9)
-%xl(D,battery-color-big.bmp,123,113,12)
-%xl(E,repeat-color-big.bmp,53,109,4)
-%xl(F,lock-color.bmp,95,108)
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-%ac%t(3)%ig;%ac%iy 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps
deleted file mode 100644
index ca8422328a..0000000000
--- a/wps/Rockboxed.160x128x2.wps
+++ /dev/null
@@ -1,24 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-160x128x2.bmp)
-%xl(A,mode-grey.bmp,72,109,4)
-%xl(B,shuffle-grey-big.bmp,36,109)
-%xl(C,volume-grey.bmp,15,111,9)
-%xl(D,battery-grey-big.bmp,123,113,11)
-%xl(E,repeat-grey-big.bmp,53,109,4)
-%xl(F,lock-grey.bmp,95,108)
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-%ac%t(3)%ig;%ac%iy 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%?bl<|%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)>
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps
deleted file mode 100644
index cc85088697..0000000000
--- a/wps/Rockboxed.176x132x16.wps
+++ /dev/null
@@ -1,24 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-176x132x16.bmp)
-%xl(A,mode-color-big.bmp,81,113,4)
-%xl(B,shuffle-color-big.bmp,40,113)
-%xl(C,volume-color-big.bmp,15,115,11)
-%xl(D,battery-color-big.bmp,139,117,12)
-%xl(E,repeat-color-big.bmp,60,113,4)
-%xl(F,lock-color.bmp,110,112)
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-%ac%t(3)%ig;%ac%iy
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps
deleted file mode 100644
index 71fe50042f..0000000000
--- a/wps/Rockboxed.176x220x16.wps
+++ /dev/null
@@ -1,32 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-176x220x16.bmp)
-%xl(A,mode-color-big.bmp,81,201,4)
-%xl(B,shuffle-color-big.bmp,40,201)
-%xl(C,volume-color-big.bmp,15,203,11)
-%xl(D,battery-color-big.bmp,139,205,12)
-%xl(E,repeat-color-big.bmp,60,201,4)
-%xl(F,lock-color.bmp,107,201)
-
-
-
-
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-%ac%t(3)%ig;%ac%iy
-
-
-
-
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps
deleted file mode 100644
index 76183d7c2e..0000000000
--- a/wps/Rockboxed.220x176x16.wps
+++ /dev/null
@@ -1,26 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-220x176x16.bmp)
-%xl(A,mode-color-big.bmp,102,156,4)
-%xl(B,shuffle-color-big.bmp,57,156)
-%xl(C,volume-color-big.bmp,15,158,11)
-%xl(D,battery-color-big.bmp,183,160,12)
-%xl(E,repeat-color-big.bmp,77,156,4)
-%xl(F,lock-color.bmp,142,156)
-
-
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-%ac%t(3)%ig;%ac%iy 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps
deleted file mode 100644
index d1e5593e2e..0000000000
--- a/wps/Rockboxed.240x320x16.wps
+++ /dev/null
@@ -1,31 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-240x320x16.bmp)
-%xl(A,mode-color-big.bmp,112,300,4)
-%xl(B,shuffle-color-big.bmp,57,300)
-%xl(C,volume-color-big.bmp,15,302,11)
-%xl(D,battery-color-big.bmp,203,304,12)
-%xl(E,repeat-color-big.bmp,77,300,4)
-%xl(F,lock-color.bmp,152,300)
-
-
-
-
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-
-
-%ac%t(3)%ig;%ac%iy 
-
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps
deleted file mode 100644
index 304e5763c0..0000000000
--- a/wps/Rockboxed.320x240x16.wps
+++ /dev/null
@@ -1,27 +0,0 @@
-# (C) 2007, Roan Horning <roan@horning.us>
-# License: GNU GPL v2 or later.
-%wd
-%X(bg-320x240x16.bmp)
-%xl(A,mode-color-big.bmp,153,220,4)
-%xl(B,shuffle-color-big.bmp,113,220)
-%xl(C,volume-color-big.bmp,15,222,11)
-%xl(D,battery-color-big.bmp,283,224,12)
-%xl(E,repeat-color-big.bmp,131,220,4)
-%xl(F,lock-color.bmp,220,220)
-
-
-
-%al %s%ac%?ia<%ia|%d(2)>%ar 
-%al %s%ac%?id<%id|%d(1)>%ar 
-%al %s%ac%?it<%it|%fn>%ar 
-
-
-%ac%t(3)%ig;%ac%iy 
-%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)>
-%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%?mh<%xd(F)>
-%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
-%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed/battery-color-big.bmp b/wps/Rockboxed/battery-color-big.bmp
deleted file mode 100644
index 8d54fbbb3d..0000000000
--- a/wps/Rockboxed/battery-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/battery-color-small.bmp b/wps/Rockboxed/battery-color-small.bmp
deleted file mode 100644
index 10aa8ed12c..0000000000
--- a/wps/Rockboxed/battery-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/battery-grey-big.bmp b/wps/Rockboxed/battery-grey-big.bmp
deleted file mode 100644
index 70953f5edf..0000000000
--- a/wps/Rockboxed/battery-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/battery-grey-medium.bmp b/wps/Rockboxed/battery-grey-medium.bmp
deleted file mode 100644
index 1cf41ca253..0000000000
--- a/wps/Rockboxed/battery-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/battery-mono-small.bmp b/wps/Rockboxed/battery-mono-small.bmp
deleted file mode 100644
index fa21f54b57..0000000000
--- a/wps/Rockboxed/battery-mono-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-128x128x16.bmp b/wps/Rockboxed/bg-128x128x16.bmp
deleted file mode 100644
index cea0e25fa1..0000000000
--- a/wps/Rockboxed/bg-128x128x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-132x80x16.bmp b/wps/Rockboxed/bg-132x80x16.bmp
deleted file mode 100644
index 9de6b3739e..0000000000
--- a/wps/Rockboxed/bg-132x80x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-138x110x2.bmp b/wps/Rockboxed/bg-138x110x2.bmp
deleted file mode 100644
index 6950169385..0000000000
--- a/wps/Rockboxed/bg-138x110x2.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-160x128x16.bmp b/wps/Rockboxed/bg-160x128x16.bmp
deleted file mode 100644
index 7c8b38ad55..0000000000
--- a/wps/Rockboxed/bg-160x128x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-160x128x2.bmp b/wps/Rockboxed/bg-160x128x2.bmp
deleted file mode 100644
index 0e7b2c92a3..0000000000
--- a/wps/Rockboxed/bg-160x128x2.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-176x132x16.bmp b/wps/Rockboxed/bg-176x132x16.bmp
deleted file mode 100644
index b9bc0dca78..0000000000
--- a/wps/Rockboxed/bg-176x132x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-176x220x16.bmp b/wps/Rockboxed/bg-176x220x16.bmp
deleted file mode 100644
index bc7b00d277..0000000000
--- a/wps/Rockboxed/bg-176x220x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-220x176x16.bmp b/wps/Rockboxed/bg-220x176x16.bmp
deleted file mode 100644
index 9c2bad8bb1..0000000000
--- a/wps/Rockboxed/bg-220x176x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-240x320x16.bmp b/wps/Rockboxed/bg-240x320x16.bmp
deleted file mode 100644
index 640d51163c..0000000000
--- a/wps/Rockboxed/bg-240x320x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-320x240x16.bmp b/wps/Rockboxed/bg-320x240x16.bmp
deleted file mode 100644
index 4691a97539..0000000000
--- a/wps/Rockboxed/bg-320x240x16.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bg-mono-small.bmp b/wps/Rockboxed/bg-mono-small.bmp
deleted file mode 100644
index 30fdd801c9..0000000000
--- a/wps/Rockboxed/bg-mono-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/lock-color.bmp b/wps/Rockboxed/lock-color.bmp
deleted file mode 100644
index 1090326d6e..0000000000
--- a/wps/Rockboxed/lock-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/lock-grey.bmp b/wps/Rockboxed/lock-grey.bmp
deleted file mode 100644
index e8d7e3f8d6..0000000000
--- a/wps/Rockboxed/lock-grey.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/lock-mono-small.bmp b/wps/Rockboxed/lock-mono-small.bmp
deleted file mode 100644
index 69b3a92368..0000000000
--- a/wps/Rockboxed/lock-mono-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/mode-color-big.bmp b/wps/Rockboxed/mode-color-big.bmp
deleted file mode 100644
index 7137189697..0000000000
--- a/wps/Rockboxed/mode-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/mode-color-small.bmp b/wps/Rockboxed/mode-color-small.bmp
deleted file mode 100644
index 650b9da26e..0000000000
--- a/wps/Rockboxed/mode-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/mode-grey.bmp b/wps/Rockboxed/mode-grey.bmp
deleted file mode 100644
index 31c8c84c8f..0000000000
--- a/wps/Rockboxed/mode-grey.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/mode-mono-small.bmp b/wps/Rockboxed/mode-mono-small.bmp
deleted file mode 100644
index 72e4c28db3..0000000000
--- a/wps/Rockboxed/mode-mono-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-108.bmp b/wps/Rockboxed/pg-108.bmp
deleted file mode 100644
index 72b22ca3a9..0000000000
--- a/wps/Rockboxed/pg-108.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-140.bmp b/wps/Rockboxed/pg-140.bmp
deleted file mode 100644
index 2f93e8ad4a..0000000000
--- a/wps/Rockboxed/pg-140.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-156.bmp b/wps/Rockboxed/pg-156.bmp
deleted file mode 100644
index 823af1da75..0000000000
--- a/wps/Rockboxed/pg-156.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-164.bmp b/wps/Rockboxed/pg-164.bmp
deleted file mode 100644
index 5b19590e6e..0000000000
--- a/wps/Rockboxed/pg-164.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-200.bmp b/wps/Rockboxed/pg-200.bmp
deleted file mode 100644
index 6477044c23..0000000000
--- a/wps/Rockboxed/pg-200.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-220.bmp b/wps/Rockboxed/pg-220.bmp
deleted file mode 100644
index 26c41ccf90..0000000000
--- a/wps/Rockboxed/pg-220.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-300.bmp b/wps/Rockboxed/pg-300.bmp
deleted file mode 100644
index fd085e8482..0000000000
--- a/wps/Rockboxed/pg-300.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-grey-118.bmp b/wps/Rockboxed/pg-grey-118.bmp
deleted file mode 100644
index ab8d328654..0000000000
--- a/wps/Rockboxed/pg-grey-118.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pg-grey-140.bmp b/wps/Rockboxed/pg-grey-140.bmp
deleted file mode 100644
index 6cbd60f3b5..0000000000
--- a/wps/Rockboxed/pg-grey-140.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-color-big.bmp b/wps/Rockboxed/repeat-color-big.bmp
deleted file mode 100644
index 14941829e5..0000000000
--- a/wps/Rockboxed/repeat-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-color-small.bmp b/wps/Rockboxed/repeat-color-small.bmp
deleted file mode 100644
index 5ee500c10a..0000000000
--- a/wps/Rockboxed/repeat-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-grey-big.bmp b/wps/Rockboxed/repeat-grey-big.bmp
deleted file mode 100644
index 59a0a06419..0000000000
--- a/wps/Rockboxed/repeat-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-grey-medium.bmp b/wps/Rockboxed/repeat-grey-medium.bmp
deleted file mode 100644
index e4e22aec1a..0000000000
--- a/wps/Rockboxed/repeat-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-mono-small.bmp b/wps/Rockboxed/repeat-mono-small.bmp
deleted file mode 100644
index bd58241a58..0000000000
--- a/wps/Rockboxed/repeat-mono-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/shuffle-color-big.bmp b/wps/Rockboxed/shuffle-color-big.bmp
deleted file mode 100644
index 68ab6b1eb5..0000000000
--- a/wps/Rockboxed/shuffle-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/shuffle-color-small.bmp b/wps/Rockboxed/shuffle-color-small.bmp
deleted file mode 100644
index 23d597ec72..0000000000
--- a/wps/Rockboxed/shuffle-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/shuffle-grey-big.bmp b/wps/Rockboxed/shuffle-grey-big.bmp
deleted file mode 100644
index 211c44ad26..0000000000
--- a/wps/Rockboxed/shuffle-grey-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/shuffle-grey-medium.bmp b/wps/Rockboxed/shuffle-grey-medium.bmp
deleted file mode 100644
index a4bfd06dd2..0000000000
--- a/wps/Rockboxed/shuffle-grey-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/shuffle-mono-small.bmp b/wps/Rockboxed/shuffle-mono-small.bmp
deleted file mode 100644
index 731518eeea..0000000000
--- a/wps/Rockboxed/shuffle-mono-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-color-big.bmp b/wps/Rockboxed/volume-color-big.bmp
deleted file mode 100644
index 331a85cdff..0000000000
--- a/wps/Rockboxed/volume-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-color-medium.bmp b/wps/Rockboxed/volume-color-medium.bmp
deleted file mode 100644
index 29bc3d6664..0000000000
--- a/wps/Rockboxed/volume-color-medium.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-color-small.bmp b/wps/Rockboxed/volume-color-small.bmp
deleted file mode 100644
index 57bf6f2143..0000000000
--- a/wps/Rockboxed/volume-color-small.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-grey.bmp b/wps/Rockboxed/volume-grey.bmp
deleted file mode 100644
index e7634fd42a..0000000000
--- a/wps/Rockboxed/volume-grey.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-mono-small.bmp b/wps/Rockboxed/volume-mono-small.bmp
deleted file mode 100644
index 20a2bc99d1..0000000000
--- a/wps/Rockboxed/volume-mono-small.bmp
+++ /dev/null
diff --git a/wps/UniCatcher.128x64x1.wps b/wps/UniCatcher.128x64x1.wps
deleted file mode 100644
index 3177c7ea95..0000000000
--- a/wps/UniCatcher.128x64x1.wps
+++ /dev/null
@@ -1,18 +0,0 @@
-%wd
-
-%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%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery-s.bmp,109,3,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-s.bmp,86,2,3)
-%xl(C,repeat-s.bmp,66,2,4)
-%xl(D,shuffle-s.bmp,46,4,2)
-%xl(E,playmode-s.bmp,3,3,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-s.bmp,16,1,9)
-%xl(G,animation-s.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%x(W,line1-128.bmp,0,0)
-%x(X,line2-128.bmp,0,13)
diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps
deleted file mode 100644
index 1aefde64d4..0000000000
--- a/wps/UniCatcher.128x96x1.wps
+++ /dev/null
@@ -1,21 +0,0 @@
-%wd
-
-%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,-)
-%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery-s.bmp,109,3,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-s.bmp,86,2,3)
-%xl(C,repeat-s.bmp,66,2,4)
-%xl(D,shuffle-s.bmp,46,4,2)
-%xl(E,playmode-s.bmp,3,3,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-s.bmp,16,1,9)
-%xl(G,animation-s.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%x(W,line1-128.bmp,0,0)
-%x(X,line2-128.bmp,0,13)
-%x(Y,line1-128.bmp,0,79)
diff --git a/wps/UniCatcher.160x128x16.wps b/wps/UniCatcher.160x128x16.wps
deleted file mode 100644
index 5285e976c0..0000000000
--- a/wps/UniCatcher.160x128x16.wps
+++ /dev/null
@@ -1,26 +0,0 @@
-%wd
-%X(bg-160x128x16-u.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%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,-)
-%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery.bmp,135,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,106,5,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,83,6,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,58,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,24,3,9)
-%xl(G,animation.bmp,24,3,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,115,82,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.160x128x2.wps b/wps/UniCatcher.160x128x2.wps
deleted file mode 100644
index d25ce44ee3..0000000000
--- a/wps/UniCatcher.160x128x2.wps
+++ /dev/null
@@ -1,26 +0,0 @@
-%wd
-%X(bg-160x128x2-u.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%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,-)
-%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery-g.bmp,135,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-g.bmp,106,5,3)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>
-%xl(C,repeat-g.bmp,83,6,4)
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%xl(D,shuffle-g.bmp,58,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-g.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-g.bmp,24,4,9)
-%xl(G,animation-g.bmp,24,4,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-g.bmp,115,82,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.176x132x16.wps b/wps/UniCatcher.176x132x16.wps
deleted file mode 100644
index 164c6f4aa6..0000000000
--- a/wps/UniCatcher.176x132x16.wps
+++ /dev/null
@@ -1,26 +0,0 @@
-%wd
-%X(bg-176x132x16-u.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%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,-)
-%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery.bmp,151,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,122,5,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,91,6,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,66,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,24,3,9)
-%xl(G,animation.bmp,24,3,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,131,82,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps
deleted file mode 100644
index badca5371c..0000000000
--- a/wps/UniCatcher.176x220x16.wps
+++ /dev/null
@@ -1,31 +0,0 @@
-%wd
-%X(bg-176x220x16-u.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al   %bl%%%ar%pp/%pe 
-
-%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>
-
-
-%al %fbKbps
-%pb(10,-,156,4,-)
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery.bmp,151,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,122,5,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,91,6,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,66,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,24,3,9)
-%xl(G,animation.bmp,24,3,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,131,164,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps
deleted file mode 100644
index 296fb4640f..0000000000
--- a/wps/UniCatcher.220x176x16.wps
+++ /dev/null
@@ -1,29 +0,0 @@
-%wd
-%X(bg-220x176x16-u.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al  %bl%%%ar%pp/%pe 
-%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>
-%al %fbKbps
-%pb(11,-,198,6,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery.bmp,194,9,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,165,6,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,114,7,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,89,8,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,8,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,25,4,9)
-%xl(G,animation.bmp,25,4,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,173,115,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps
deleted file mode 100644
index 0cd370d754..0000000000
--- a/wps/UniCatcher.240x320x16.wps
+++ /dev/null
@@ -1,37 +0,0 @@
-%wd
-%X(bg-240x320x16-u.bmp)
-
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al   %bl%%%ar%pp/%pe 
-
-
-
-%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>
-
-
-
-
-%al %fbKbps
-%pb(11,-,218,7,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-b.bmp,204,12,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-b.bmp,164,8,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat-b.bmp,126,9,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle-b.bmp,91,11,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-b.bmp,11,10,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-b.bmp,34,5,9)
-%xl(G,animation-b.bmp,34,5,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-b.bmp,168,236,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps
deleted file mode 100644
index b299f182e1..0000000000
--- a/wps/UniCatcher.320x240x16.wps
+++ /dev/null
@@ -1,32 +0,0 @@
-%wd
-%X(bg-320x240x16-u.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al   %bl%%%ar%pp/%pe 
-
-%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>
-
-
-%al %fbKbps
-%pb(11,-,298,7,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-b.bmp,284,12,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-b.bmp,244,8,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat-b.bmp,166,9,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle-b.bmp,131,11,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-b.bmp,11,10,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-b.bmp,34,5,9)
-%xl(G,animation-b.bmp,34,5,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-b.bmp,248,158,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher/animation-b.bmp b/wps/UniCatcher/animation-b.bmp
deleted file mode 100644
index e73dbdb794..0000000000
--- a/wps/UniCatcher/animation-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/animation-g.bmp b/wps/UniCatcher/animation-g.bmp
deleted file mode 100644
index c0ba9f7ada..0000000000
--- a/wps/UniCatcher/animation-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/animation-s.bmp b/wps/UniCatcher/animation-s.bmp
deleted file mode 100644
index 4827ffa708..0000000000
--- a/wps/UniCatcher/animation-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/animation.bmp b/wps/UniCatcher/animation.bmp
deleted file mode 100644
index 1ae59cb670..0000000000
--- a/wps/UniCatcher/animation.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/battery-b.bmp b/wps/UniCatcher/battery-b.bmp
deleted file mode 100644
index bda4d8e15d..0000000000
--- a/wps/UniCatcher/battery-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/battery-g.bmp b/wps/UniCatcher/battery-g.bmp
deleted file mode 100644
index 3c75a91129..0000000000
--- a/wps/UniCatcher/battery-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/battery-s.bmp b/wps/UniCatcher/battery-s.bmp
deleted file mode 100644
index 56ccdb1df4..0000000000
--- a/wps/UniCatcher/battery-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/battery.bmp b/wps/UniCatcher/battery.bmp
deleted file mode 100644
index 1d5785ed9b..0000000000
--- a/wps/UniCatcher/battery.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-160x128x16-u.bmp b/wps/UniCatcher/bg-160x128x16-u.bmp
deleted file mode 100644
index 7a8ca79c43..0000000000
--- a/wps/UniCatcher/bg-160x128x16-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-160x128x2-u.bmp b/wps/UniCatcher/bg-160x128x2-u.bmp
deleted file mode 100644
index c333135bc5..0000000000
--- a/wps/UniCatcher/bg-160x128x2-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-176x132x16-u.bmp b/wps/UniCatcher/bg-176x132x16-u.bmp
deleted file mode 100644
index 4368b0f24b..0000000000
--- a/wps/UniCatcher/bg-176x132x16-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-176x220x16-u.bmp b/wps/UniCatcher/bg-176x220x16-u.bmp
deleted file mode 100644
index 27ac32734a..0000000000
--- a/wps/UniCatcher/bg-176x220x16-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-220x176x16-u.bmp b/wps/UniCatcher/bg-220x176x16-u.bmp
deleted file mode 100644
index e17fc96bb9..0000000000
--- a/wps/UniCatcher/bg-220x176x16-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-240x320x16-u.bmp b/wps/UniCatcher/bg-240x320x16-u.bmp
deleted file mode 100644
index 3108da2758..0000000000
--- a/wps/UniCatcher/bg-240x320x16-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/bg-320x240x16-u.bmp b/wps/UniCatcher/bg-320x240x16-u.bmp
deleted file mode 100644
index bd5e99b32b..0000000000
--- a/wps/UniCatcher/bg-320x240x16-u.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/codec-b.bmp b/wps/UniCatcher/codec-b.bmp
deleted file mode 100644
index 4a6b4aaa4a..0000000000
--- a/wps/UniCatcher/codec-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/codec-g.bmp b/wps/UniCatcher/codec-g.bmp
deleted file mode 100644
index 45be05a430..0000000000
--- a/wps/UniCatcher/codec-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/codec.bmp b/wps/UniCatcher/codec.bmp
deleted file mode 100644
index b45b6245d3..0000000000
--- a/wps/UniCatcher/codec.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/hold-b.bmp b/wps/UniCatcher/hold-b.bmp
deleted file mode 100644
index 5d9b545981..0000000000
--- a/wps/UniCatcher/hold-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/hold-g.bmp b/wps/UniCatcher/hold-g.bmp
deleted file mode 100644
index 4c0d3873fa..0000000000
--- a/wps/UniCatcher/hold-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/hold-s.bmp b/wps/UniCatcher/hold-s.bmp
deleted file mode 100644
index 9d0d446235..0000000000
--- a/wps/UniCatcher/hold-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/hold.bmp b/wps/UniCatcher/hold.bmp
deleted file mode 100644
index 48183fe64f..0000000000
--- a/wps/UniCatcher/hold.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/line1-128.bmp b/wps/UniCatcher/line1-128.bmp
deleted file mode 100644
index 257bebadba..0000000000
--- a/wps/UniCatcher/line1-128.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/line2-128.bmp b/wps/UniCatcher/line2-128.bmp
deleted file mode 100644
index bb9a9dae10..0000000000
--- a/wps/UniCatcher/line2-128.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/playmode-b.bmp b/wps/UniCatcher/playmode-b.bmp
deleted file mode 100644
index fd6233a943..0000000000
--- a/wps/UniCatcher/playmode-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/playmode-g.bmp b/wps/UniCatcher/playmode-g.bmp
deleted file mode 100644
index 3e890d2527..0000000000
--- a/wps/UniCatcher/playmode-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/playmode-s.bmp b/wps/UniCatcher/playmode-s.bmp
deleted file mode 100644
index de06a250ba..0000000000
--- a/wps/UniCatcher/playmode-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/playmode.bmp b/wps/UniCatcher/playmode.bmp
deleted file mode 100644
index a3c5450976..0000000000
--- a/wps/UniCatcher/playmode.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/repeat-b.bmp b/wps/UniCatcher/repeat-b.bmp
deleted file mode 100644
index 384f374dc2..0000000000
--- a/wps/UniCatcher/repeat-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/repeat-g.bmp b/wps/UniCatcher/repeat-g.bmp
deleted file mode 100644
index e127e0c5cd..0000000000
--- a/wps/UniCatcher/repeat-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/repeat-s.bmp b/wps/UniCatcher/repeat-s.bmp
deleted file mode 100644
index 78dd2c2a2b..0000000000
--- a/wps/UniCatcher/repeat-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/repeat.bmp b/wps/UniCatcher/repeat.bmp
deleted file mode 100644
index 04036dc65c..0000000000
--- a/wps/UniCatcher/repeat.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/shuffle-b.bmp b/wps/UniCatcher/shuffle-b.bmp
deleted file mode 100644
index 6dc3613c45..0000000000
--- a/wps/UniCatcher/shuffle-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/shuffle-g.bmp b/wps/UniCatcher/shuffle-g.bmp
deleted file mode 100644
index de51aadc53..0000000000
--- a/wps/UniCatcher/shuffle-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/shuffle-s.bmp b/wps/UniCatcher/shuffle-s.bmp
deleted file mode 100644
index e43ae93c91..0000000000
--- a/wps/UniCatcher/shuffle-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/shuffle.bmp b/wps/UniCatcher/shuffle.bmp
deleted file mode 100644
index f09c0bd098..0000000000
--- a/wps/UniCatcher/shuffle.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/volume-b.bmp b/wps/UniCatcher/volume-b.bmp
deleted file mode 100644
index 73d4c0fe0b..0000000000
--- a/wps/UniCatcher/volume-b.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/volume-g.bmp b/wps/UniCatcher/volume-g.bmp
deleted file mode 100644
index 175170befa..0000000000
--- a/wps/UniCatcher/volume-g.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/volume-s.bmp b/wps/UniCatcher/volume-s.bmp
deleted file mode 100644
index b827998784..0000000000
--- a/wps/UniCatcher/volume-s.bmp
+++ /dev/null
diff --git a/wps/UniCatcher/volume.bmp b/wps/UniCatcher/volume.bmp
deleted file mode 100644
index d75f144522..0000000000
--- a/wps/UniCatcher/volume.bmp
+++ /dev/null
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 2649b1c435..6533a43eb3 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -19,101 +19,6 @@
 #
 # All sections should list what font and status bar setting they "like".
 
-<wps>
-# Name of the WPS _including_ extension
-Name: ipodVOL.wps
-# default RWPS for the theme (to be loaded with the same theme file)
-RWPS: rockbox_default.rwps
-# Name of the creator of the WPS
-Author: xameius
-# preferred font
-Font: 12-Nimbus.fnt
-# whether the WPS is designed to have the statusbar present or not
-Statusbar: on
-# whether a menu backdrop should be set
-# needs to be declared as empty if there should be none (the default sets one)
-backdrop:
-# reference to the built-in icon set
-iconset:
-# reference to the default viewers icon set
-viewers iconset:
-# preferred selector type
-selector type: bar (inverse)
-</wps>
-
-<wps>
-Name: boxes.wps
-rwps: boxes.rwps
-SBS:
-RSBS:
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: 08-Schumacher-Clean.fnt
-Statusbar: top
-# themes with colour screen versions need to set the colours too
-Foreground Color: 000000
-Background Color: B6C6E5
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<wps>
-Name: engineeer2.wps
-RWPS: engineeer2.rwps
-SBS:
-RSBS:
-Author: Magnus Westerlund
-Font: 08-Nedore.fnt
-Statusbar: top
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<wps>
-Name: iAmp.wps
-RWPS: iAmp.rwps
-SBS:
-RSBS:
-Author: Raymond Hoh
-Font: 12-Nimbus.fnt
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-Statusbar: top
-ui viewport:
-remote ui viewport:
-</wps>
-
-<wps>
-Name: zezayer.wps
-RWPS: zezayer.rwps
-SBS:
-RSBS:
-Author: Jake Owen
-Font: 08-Nedore.fnt
-Statusbar: top
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<rwps>
-Name: zezayer.rwps
-Author: Dominik Riebeling
-Font: 08-Nedore.fnt
-Statusbar: top
-</rwps>
 
 <rwps>
 Name: rockbox_default.rwps
@@ -122,150 +27,6 @@ Font: 08-Schumacher-Clean.fnt
 Statusbar: top
 </rwps>
 
-<rwps>
-Name: iAmp.rwps
-Author: Raymond Hoh
-Font: 12-Nimbus.fnt
-Statusbar: top
-</rwps>
-
-<rwps>
-Name: boxes.rwps
-Author: Christi Scarborough
-Font: 08-Schumacher-Clean.fnt
-Statusbar: top
-</rwps>
-
-<rwps>
-Name: engineeer2.rwps
-Author: Magnus Westerlund
-Font: 08-Nedore.fnt
-Statusbar: top
-</rwps>
-
-<wps>
-Name: DancePuffDuo.wps
-RWPS: DancePuffDuo.rwps
-SBS:
-RSBS:
-Author: Chris Oxtoby
-Font: 13-Nimbus.fnt
-Statusbar: top
-Foreground Color: 000000
-Background Color: B6C6E5
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<rwps>
-Name: DancePuffDuo.rwps
-Author: Chris Oxtoby
-Font: 13-Nimbus.fnt
-Statusbar: top
-</rwps>
-
-<wps>
-Name: iCatcher.wps
-RWPS: iCatcher.rwps
-SBS:
-RSBS:
-Author: Ioannis Koutoulakis
-Font.112x64x1: 08-Rockfont.fnt
-Font.128x64x1: 08-Rockfont.fnt
-Font.128x128x16: 09-Nedore.fnt
-Font.132x80x16: 09-Nedore.fnt
-Font.138x110x2: 08-Nedore.fnt
-Font.160x128x2: 09-Nedore.fnt
-Font.160x128x16: 09-Nedore.fnt
-Font.176x132x16: 09-Nedore.fnt
-Font.176x220x16: 12-Nimbus.fnt
-Font.220x176x16: 14-Nimbus.fnt
-Font.240x320x16: 19-Nimbus.fnt
-Font.240x400x16: 19-Nimbus.fnt
-Font.320x240x16: 19-Nimbus.fnt
-Foreground Color: 000000
-Background Color: FFFFFF
-Statusbar: top
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<rwps>
-Name: iCatcher.rwps
-Author: Ioannis Koutoulakis
-Font.160x128x2: 09-Nedore.fnt
-Font.220x176x16: 14-Nimbus.fnt
-Statusbar: top
-</rwps>
-
-<wps>
-Name: UniCatcher.wps
-RWPS: UniCatcher.rwps
-SBS:
-RSBS:
-Author: Ioannis Koutoulakis
-Font: 16-GNU-Unifont.fnt
-Foreground Color: 000000
-Background Color: FFFFFF
-Statusbar: top
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<rwps>
-Name: UniCatcher.rwps
-Author: Ioannis Koutoulakis
-Font: 16-GNU-Unifont.fnt
-Statusbar: top
-</rwps>
-
-<wps>
-Name: Rockboxed.wps
-RWPS: rockbox_default.rwps
-SBS:
-RSBS:
-Author: Roan Horning
-Font.112x64x1: 08-Schumacher-Clean.fnt
-Font.128x64x1: 08-Schumacher-Clean.fnt
-Font.128x128x16: 12-Nimbus.fnt
-Font.132x80x16: 10-Nimbus.fnt
-Font.138x110x2: 12-Nimbus.fnt
-Font.160x128x16: 12-Nimbus.fnt
-Font.160x128x2: 12-Nimbus.fnt
-Font.176x132x16: 12-Nimbus.fnt
-Font.176x220x16: 12-Nimbus.fnt
-Font.220x176x16: 14-Nimbus.fnt
-Font.240x320x16: 19-Nimbus.fnt
-Font.240x400x16: 19-Nimbus.fnt
-Font.320x240x16: 19-Nimbus.fnt
-Foreground Color: 000000
-Background Color: FFC000
-Statusbar: top
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-ui viewport:
-remote ui viewport:
-</wps>
-
-<wps>
-Name: progressive.wps
-Author: Jens Arnold
-</wps>
-
 <wps>
 Name: cabbiev2.wps
 RWPS: cabbiev2.rwps
diff --git a/wps/boxes.112x64x1.wps b/wps/boxes.112x64x1.wps
deleted file mode 100644
index c29658ec73..0000000000
--- a/wps/boxes.112x64x1.wps
+++ /dev/null
@@ -1,19 +0,0 @@
-%x(a,bg-112x64.bmp,0,0)
-%xl(A,volume.bmp,12,1,11)
-%xl(B,battery-small.bmp,92,0,6)
-%xl(C,repeat-small.bmp,0,6,4)
-%xl(D,navi.bmp,68,2,5)
-%xl(E,shf.bmp,14,6)
-%wd
-
-
-%ac%t(5)%s%?it<%it|%fn>;%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>
-%ac%t(5)%pc / %pt;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-%pb
-
-%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
-%?pv<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)>
-%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
diff --git a/wps/boxes.128x64x1.wps b/wps/boxes.128x64x1.wps
deleted file mode 100644
index a578285906..0000000000
--- a/wps/boxes.128x64x1.wps
+++ /dev/null
@@ -1,23 +0,0 @@
-%x(a,r-bg.bmp,0,0)
-%xl(A,volume.bmp,12,1,11)
-%xl(B,battery-small.bmp,109,0,6)
-%xl(C,repeat-small.bmp,0,6,4)
-%xl(D,navi.bmp,68,2,5)
-%xl(E,shf.bmp,14,6)
-%xl(F,lock-m.bmp,86,0)
-%xl(G,lock-r.bmp,98,0)
-%wd
-
-
-%ac%t(5)%s%?it<%it|%fn>;%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>
-%ac%t(5)%pc / %pt;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-%pb
-
-%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
-%?pv<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)>
-%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
diff --git a/wps/boxes.160x128x1.wps b/wps/boxes.160x128x1.wps
deleted file mode 100644
index d35e30137e..0000000000
--- a/wps/boxes.160x128x1.wps
+++ /dev/null
@@ -1,37 +0,0 @@
-%x(a,bg-160x128.bmp,0,0)
-%xl(A,codec.bmp,40,70,22)
-%xl(B,encoding.bmp,40,76,2)
-%xl(C,repeat.bmp,99,0,4)
-%xl(D,navi.bmp,68,3,5)
-%xl(E,shf.bmp,99,17)
-%xl(F,lock-m.bmp,87,0)
-%xl(G,lock-r.bmp,87,12)
-%xl(H,volume.bmp,12,1,11)
-%xl(I,battery.bmp,149,1,6)
-%xl(J,rating.bmp,91,68,11)
-%wd
-
-
-
-
-%ac%s%?it<%it|%fn>
-%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>;%ac%t(5)%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
-
-%ac%t(5)%pc / %pt;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-
- %fbk
-
-%pb
-
-
-%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
-%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
-%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
-%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-%?fv<%xd(Ba)|%xd(Bb)>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
-%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>
diff --git a/wps/boxes.176x132x16.wps b/wps/boxes.176x132x16.wps
deleted file mode 100644
index 07e599100c..0000000000
--- a/wps/boxes.176x132x16.wps
+++ /dev/null
@@ -1,37 +0,0 @@
-%X(backdrop-176x132.bmp)
-%xl(A,codec.bmp,40,70,22)
-%xl(B,encoding.bmp,40,76,2)
-%xl(C,repeat.bmp,99,0,4)
-%xl(D,navi-colour.bmp,68,3,5)
-%xl(E,shf.bmp,99,17)
-%xl(F,lock-m.bmp,87,0)
-%xl(G,lock-r.bmp,87,12)
-%xl(H,volume-colour.bmp,12,1,11)
-%xl(I,battery-colour.bmp,149,1,6)
-%xl(J,rating-colour.bmp,91,68,11)
-%wd
-
-
-
-
-%ac%s%?it<%it|%fn>
-%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>;%ac%t(5)%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
-
-%ac%t(5)%pc / %pt;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-
- %fbk
-
-%pb
-
-
-%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
-%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
-%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
-%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-%?fv<%xd(Ba)|%xd(Bb)>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
-%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps
deleted file mode 100644
index 11f800a923..0000000000
--- a/wps/boxes.220x176x16.wps
+++ /dev/null
@@ -1,45 +0,0 @@
-%X(backdrop-220x176.bmp)
-%xl(A,codec.bmp,40,102,22)
-%xl(B,encoding.bmp,40,108,2)
-%xl(C,repeat.bmp,124,10,4)
-%xl(D,navi-colour.bmp,83,11,5)
-%xl(E,shf.bmp,124,24)
-%xl(F,lock-m.bmp,104,10)
-%xl(G,lock-r.bmp,104,21)
-%xl(H,volume-colour.bmp,12,3,11)
-%xl(I,battery-colour.bmp,198,10,6)
-%xl(J,led-colour.bmp,186,12)
-%wd
-%V(6,0,208,176,1)%Vf(000000)%Vb(B6C6E5)
-%ar%ca%, %cb %cd %cH:%cM
-
-
-
-
-
-%ac%s%?it<%it|%fn>
-%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>;%ac%t(5)%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
-
-%ac%t(5)%pc / %pt;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-
-
-
-  %fbk
-
-%pb(0,-,208,8,pb-220.bmp)
-
-
-%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
-
-
-%pm
-%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
-%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
-%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-%?fv<%xd(Ba)|%xd(Bb)>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
-%?lh<%xd(J)|>
diff --git a/wps/boxes.320x240x16.wps b/wps/boxes.320x240x16.wps
deleted file mode 100644
index 1f4651a240..0000000000
--- a/wps/boxes.320x240x16.wps
+++ /dev/null
@@ -1,41 +0,0 @@
-%X(backdrop-320x240.bmp)
-%xl(A,codec.bmp,40,86,22)
-%xl(B,encoding.bmp,40,92,2)
-%xl(C,repeat.bmp,110,1,4)
-%xl(D,shf.bmp,110,17)
-%xl(E,navi-colour.bmp,83,3,5)
-%xl(F,lock-m.bmp,87,0)
-%xl(G,lock-r.bmp,87,12)
-%xl(H,volume-colour.bmp,12,1,11)
-%xl(I,battery-colour.bmp,240,1,6)
-%xl(J,rating-colour.bmp,230,84,11)
-%wd
-
-
-
-
-%ac%s%?it<%it|%fn>
-%ac%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>
-%ac%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
-
-%acTrack %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-%ac%pc / %pt %(-%pr%)
-
- %fbk
-
-%pb
-
-
-%ac%s%?It<%It|%Fn>
-%ac%s%?Ia<%Ia|%D(2)>
-%ac%s%?Id<%Id|%D(1)>
-%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
-%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
-%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-%?fv<%xd(Ba)|%xd(Bb)>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>
-%?ps<%xd(D)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
-%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>
diff --git a/wps/boxes/backdrop-176x132.bmp b/wps/boxes/backdrop-176x132.bmp
deleted file mode 100644
index ab9a0da6b2..0000000000
--- a/wps/boxes/backdrop-176x132.bmp
+++ /dev/null
diff --git a/wps/boxes/backdrop-220x176.bmp b/wps/boxes/backdrop-220x176.bmp
deleted file mode 100644
index d54baef5cc..0000000000
--- a/wps/boxes/backdrop-220x176.bmp
+++ /dev/null
diff --git a/wps/boxes/backdrop-320x240.bmp b/wps/boxes/backdrop-320x240.bmp
deleted file mode 100644
index fd57d8a6fa..0000000000
--- a/wps/boxes/backdrop-320x240.bmp
+++ /dev/null
diff --git a/wps/boxes/battery-colour.bmp b/wps/boxes/battery-colour.bmp
deleted file mode 100644
index 4ececa92d2..0000000000
--- a/wps/boxes/battery-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/battery-small.bmp b/wps/boxes/battery-small.bmp
deleted file mode 100644
index 084243dcfd..0000000000
--- a/wps/boxes/battery-small.bmp
+++ /dev/null
diff --git a/wps/boxes/battery.bmp b/wps/boxes/battery.bmp
deleted file mode 100644
index b5caa0d70f..0000000000
--- a/wps/boxes/battery.bmp
+++ /dev/null
diff --git a/wps/boxes/bg-112x64.bmp b/wps/boxes/bg-112x64.bmp
deleted file mode 100644
index 1056ebb304..0000000000
--- a/wps/boxes/bg-112x64.bmp
+++ /dev/null
diff --git a/wps/boxes/bg-160x128.bmp b/wps/boxes/bg-160x128.bmp
deleted file mode 100644
index b9a3d2be81..0000000000
--- a/wps/boxes/bg-160x128.bmp
+++ /dev/null
diff --git a/wps/boxes/codec.bmp b/wps/boxes/codec.bmp
deleted file mode 100644
index 665e1b3dd7..0000000000
--- a/wps/boxes/codec.bmp
+++ /dev/null
diff --git a/wps/boxes/encoding.bmp b/wps/boxes/encoding.bmp
deleted file mode 100644
index ba48caa81b..0000000000
--- a/wps/boxes/encoding.bmp
+++ /dev/null
diff --git a/wps/boxes/led-colour.bmp b/wps/boxes/led-colour.bmp
deleted file mode 100644
index acf9d9347e..0000000000
--- a/wps/boxes/led-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/lock-m.bmp b/wps/boxes/lock-m.bmp
deleted file mode 100644
index d0355546a3..0000000000
--- a/wps/boxes/lock-m.bmp
+++ /dev/null
diff --git a/wps/boxes/lock-r.bmp b/wps/boxes/lock-r.bmp
deleted file mode 100644
index 43eae6adb9..0000000000
--- a/wps/boxes/lock-r.bmp
+++ /dev/null
diff --git a/wps/boxes/navi-colour.bmp b/wps/boxes/navi-colour.bmp
deleted file mode 100644
index 02b146c46e..0000000000
--- a/wps/boxes/navi-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/navi.bmp b/wps/boxes/navi.bmp
deleted file mode 100644
index fe349a949a..0000000000
--- a/wps/boxes/navi.bmp
+++ /dev/null
diff --git a/wps/boxes/pb-220.bmp b/wps/boxes/pb-220.bmp
deleted file mode 100644
index 9260113851..0000000000
--- a/wps/boxes/pb-220.bmp
+++ /dev/null
diff --git a/wps/boxes/r-bg.bmp b/wps/boxes/r-bg.bmp
deleted file mode 100644
index 7716ffdf9c..0000000000
--- a/wps/boxes/r-bg.bmp
+++ /dev/null
diff --git a/wps/boxes/rating-colour.bmp b/wps/boxes/rating-colour.bmp
deleted file mode 100644
index 7c1a806c68..0000000000
--- a/wps/boxes/rating-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/rating.bmp b/wps/boxes/rating.bmp
deleted file mode 100644
index d48cd87bcb..0000000000
--- a/wps/boxes/rating.bmp
+++ /dev/null
diff --git a/wps/boxes/repeat-small.bmp b/wps/boxes/repeat-small.bmp
deleted file mode 100644
index 39f2203cd3..0000000000
--- a/wps/boxes/repeat-small.bmp
+++ /dev/null
diff --git a/wps/boxes/repeat.bmp b/wps/boxes/repeat.bmp
deleted file mode 100644
index 4b6869620f..0000000000
--- a/wps/boxes/repeat.bmp
+++ /dev/null
diff --git a/wps/boxes/shf.bmp b/wps/boxes/shf.bmp
deleted file mode 100644
index 8821ac3fb2..0000000000
--- a/wps/boxes/shf.bmp
+++ /dev/null
diff --git a/wps/boxes/volume-colour.bmp b/wps/boxes/volume-colour.bmp
deleted file mode 100644
index edcacf0e6e..0000000000
--- a/wps/boxes/volume-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/volume.bmp b/wps/boxes/volume.bmp
deleted file mode 100644
index 0d7205c143..0000000000
--- a/wps/boxes/volume.bmp
+++ /dev/null
diff --git a/wps/engineeer2.128x64x1.wps b/wps/engineeer2.128x64x1.wps
deleted file mode 100644
index e35d2b55ea..0000000000
--- a/wps/engineeer2.128x64x1.wps
+++ /dev/null
@@ -1,26 +0,0 @@
-%x(a,background_r.bmp,0,0)
-%xl(A,codec.bmp,8,46,22)
-%xl(B,encoding.bmp,9,52,2)
-%xl(C,repeat.bmp,41,1,4)
-%xl(D,playmode_r.bmp,6,12,5)
-%xl(E,shuffle.bmp,26,1)
-%xl(F,lock_main.bmp,73,0)
-%xl(G,lock_remote.bmp,81,0)
-%xl(H,volume_r.bmp,0,0,10)
-%xl(I,battery.bmp,112,0,6)
-%wd
-
-
-
-%s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%d(2)>
-%ar%pc/%pt %?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-        %fbk
-%?fv<%xd(Ba)|%xd(Bb)>
-%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)>
-%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>;%t(0.2)%?bp<%xd(Ia)|%?bl<|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>;%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)||%xd(Id)|%xd(Ie)|%xd(If)>>;%t(0.2)%?bp<%xd(Ia)|%?bl<||%xd(Id)|%xd(Ie)|%xd(If)>>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
diff --git a/wps/engineeer2.160x128x1.wps b/wps/engineeer2.160x128x1.wps
deleted file mode 100644
index 028265667a..0000000000
--- a/wps/engineeer2.160x128x1.wps
+++ /dev/null
@@ -1,35 +0,0 @@
-%x(a,background.bmp,0,0)
-%xl(A,codec.bmp,9,70,22)
-%xl(B,encoding.bmp,9,76,2)
-%xl(C,repeat.bmp,60,1,4)
-%xl(D,playmode.bmp,6,17,5)
-%xl(E,shuffle.bmp,43,1)
-%xl(F,lock_main.bmp,97,0)
-%xl(G,lock_remote.bmp,108,0)
-%xl(H,volume.bmp,0,0,10)
-%xl(I,battery.bmp,144,0,6)
-%wd
-
-
-
-
-%s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%d(2)>
-
-%ac%pc / %pt
-
-        %fbk
-
-
-
-
-%ac%t(3)%?It<%It|%Fn>;%ac%t(3)%?Ia<%Ia|%D(2)>
-%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)>
-%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>;%t(0.2)%?bp<%xd(Ia)|%?bl<|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>;%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)||%xd(Id)|%xd(Ie)|%xd(If)>>;%t(0.2)%?bp<%xd(Ia)|%?bl<||%xd(Id)|%xd(Ie)|%xd(If)>>
-%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-%?fv<%xd(Ba)|%xd(Bb)>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
-%?ps<%xd(E)|>
-%?mh<%xd(F)|>
-%?mr<%xd(G)|>
diff --git a/wps/engineeer2/background.bmp b/wps/engineeer2/background.bmp
deleted file mode 100644
index ec14a4d9bb..0000000000
--- a/wps/engineeer2/background.bmp
+++ /dev/null
diff --git a/wps/engineeer2/background_r.bmp b/wps/engineeer2/background_r.bmp
deleted file mode 100644
index f352b55cc5..0000000000
--- a/wps/engineeer2/background_r.bmp
+++ /dev/null
diff --git a/wps/engineeer2/battery.bmp b/wps/engineeer2/battery.bmp
deleted file mode 100644
index 8dcc4d4453..0000000000
--- a/wps/engineeer2/battery.bmp
+++ /dev/null
diff --git a/wps/engineeer2/codec.bmp b/wps/engineeer2/codec.bmp
deleted file mode 100644
index 240f9423eb..0000000000
--- a/wps/engineeer2/codec.bmp
+++ /dev/null
diff --git a/wps/engineeer2/encoding.bmp b/wps/engineeer2/encoding.bmp
deleted file mode 100644
index ba48caa81b..0000000000
--- a/wps/engineeer2/encoding.bmp
+++ /dev/null
diff --git a/wps/engineeer2/lock_main.bmp b/wps/engineeer2/lock_main.bmp
deleted file mode 100644
index a8b5695a86..0000000000
--- a/wps/engineeer2/lock_main.bmp
+++ /dev/null
diff --git a/wps/engineeer2/lock_remote.bmp b/wps/engineeer2/lock_remote.bmp
deleted file mode 100644
index 35c22a3463..0000000000
--- a/wps/engineeer2/lock_remote.bmp
+++ /dev/null
diff --git a/wps/engineeer2/playmode.bmp b/wps/engineeer2/playmode.bmp
deleted file mode 100644
index 819feabe67..0000000000
--- a/wps/engineeer2/playmode.bmp
+++ /dev/null
diff --git a/wps/engineeer2/playmode_r.bmp b/wps/engineeer2/playmode_r.bmp
deleted file mode 100644
index d78dcd84b5..0000000000
--- a/wps/engineeer2/playmode_r.bmp
+++ /dev/null
diff --git a/wps/engineeer2/repeat.bmp b/wps/engineeer2/repeat.bmp
deleted file mode 100644
index dc4692ab57..0000000000
--- a/wps/engineeer2/repeat.bmp
+++ /dev/null
diff --git a/wps/engineeer2/shuffle.bmp b/wps/engineeer2/shuffle.bmp
deleted file mode 100644
index cbe50bedc8..0000000000
--- a/wps/engineeer2/shuffle.bmp
+++ /dev/null
diff --git a/wps/engineeer2/volume.bmp b/wps/engineeer2/volume.bmp
deleted file mode 100644
index 25ac436349..0000000000
--- a/wps/engineeer2/volume.bmp
+++ /dev/null
diff --git a/wps/engineeer2/volume_r.bmp b/wps/engineeer2/volume_r.bmp
deleted file mode 100644
index 41b2ffd884..0000000000
--- a/wps/engineeer2/volume_r.bmp
+++ /dev/null
diff --git a/wps/iAmp.128x64x1.wps b/wps/iAmp.128x64x1.wps
deleted file mode 100644
index 973b97f597..0000000000
--- a/wps/iAmp.128x64x1.wps
+++ /dev/null
@@ -1,20 +0,0 @@
-%x(a,iAmp.bmp,100,0)
-%x(b,line-r.bmp,0,11)
-%x(c,pb.bmp,96,40)
-%wd
-
-%s%?ia<%ia|%d(1)>
-%s%?it<%?in<%in. >%it|%fn>
-%pb
-%xl(A,codec.bmp,102,48,21)
-%pc/%pt %ar%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%t(5);%pc/%pt%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)>%t(3);%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t(3)
-%xl(B,battery-small.bmp,0,0,6)
-%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
-%xl(C,volume.bmp,24,0,9)
-%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
-%xl(D,repeatshuffle-small.bmp,54,1,6)
-%?mm<%?ps<%xd(Da)>|%?ps<%xd(Db)|%xd(Dc)>|%xd(Dd)|%?ps<%xd(De)|%xd(Dc)>|%xd(Df)>
-%xl(E,lock-small.bmp,79,0,3)
-%?mh<%?mr<%xd(Ea)|%xd(x)>|%?mr<%xd(y)|>>
-%xl(F,playmode-small.bmp,74,48,3)
-%?mp<||%xd(Fa)|%xd(Fb)|%xd(Fc)>
diff --git a/wps/iAmp.160x128x1.wps b/wps/iAmp.160x128x1.wps
deleted file mode 100644
index 5136e0813d..0000000000
--- a/wps/iAmp.160x128x1.wps
+++ /dev/null
@@ -1,27 +0,0 @@
-%x(a,pb.bmp,128,100)
-%x(b,vl.bmp,27,1)
-%x(c,iAmp.bmp,129,3)
-%x(d,line.bmp,0,14)
-%wd
-            %pv
-
-%ac%s%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d(1)<%d(1)|Unknown Artist>>
-
-%ac%s%?id<%?in<Track %#%in From The LP|From The Album>%t(8)|%t(0)>;%?ic<%acComposed by:%t(6)|%t(0)>;%ac%sTrack Info:%t(6)
-%ac%s%?id<"%id"%?iy< %(%iy%)>%t(8)|%t(0)>;%?ic<%ac%s%ic%t(6)|%t(0)>;%s%ac%fb kbps%?fv< VBR>%, %ff Hz%t(6)
-
-%pb
-%pc/%pt %ar%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
-%xl(A,codec.bmp,68,87,22)
-%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
-%xl(B,battery.bmp,1,1,6)
-%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
-%xl(C,lock.bmp,114,1,3)
-%?mh<%?mr<%xd(Ca)|%xd(Cb)>|%?mr<%xd(Cc)|>>
-%xl(D,repeatshuffle.bmp,90,1,6)
-%?mm<%?ps<%xd(Da)>|%?ps<%xd(Db)|%xd(Dc)>|%xd(Dd)|%?ps<%xd(De)|%xd(Dc)>|%xd(Df)>
-%xl(E,playmode-bar.bmp,0,120,3)
-%xl(F,playmode.bmp,76,1,5)
-%?mp<||%xd(Ea)|%xd(Eb)|%xd(Ec)>
-%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
diff --git a/wps/iAmp/battery-small.bmp b/wps/iAmp/battery-small.bmp
deleted file mode 100644
index 63257b1d47..0000000000
--- a/wps/iAmp/battery-small.bmp
+++ /dev/null
diff --git a/wps/iAmp/battery.bmp b/wps/iAmp/battery.bmp
deleted file mode 100644
index 97a8c4eff4..0000000000
--- a/wps/iAmp/battery.bmp
+++ /dev/null
diff --git a/wps/iAmp/codec.bmp b/wps/iAmp/codec.bmp
deleted file mode 100644
index d78cc48a1b..0000000000
--- a/wps/iAmp/codec.bmp
+++ /dev/null
diff --git a/wps/iAmp/iAmp.bmp b/wps/iAmp/iAmp.bmp
deleted file mode 100644
index 53fa4d545b..0000000000
--- a/wps/iAmp/iAmp.bmp
+++ /dev/null
diff --git a/wps/iAmp/line-r.bmp b/wps/iAmp/line-r.bmp
deleted file mode 100644
index ce17499819..0000000000
--- a/wps/iAmp/line-r.bmp
+++ /dev/null
diff --git a/wps/iAmp/line.bmp b/wps/iAmp/line.bmp
deleted file mode 100644
index 7f22a155f2..0000000000
--- a/wps/iAmp/line.bmp
+++ /dev/null
diff --git a/wps/iAmp/lock-small.bmp b/wps/iAmp/lock-small.bmp
deleted file mode 100644
index 5675376c7a..0000000000
--- a/wps/iAmp/lock-small.bmp
+++ /dev/null
diff --git a/wps/iAmp/lock.bmp b/wps/iAmp/lock.bmp
deleted file mode 100644
index 7d74b0dbc7..0000000000
--- a/wps/iAmp/lock.bmp
+++ /dev/null
diff --git a/wps/iAmp/pb.bmp b/wps/iAmp/pb.bmp
deleted file mode 100644
index 43ff73d28a..0000000000
--- a/wps/iAmp/pb.bmp
+++ /dev/null
diff --git a/wps/iAmp/playmode-bar.bmp b/wps/iAmp/playmode-bar.bmp
deleted file mode 100644
index d242b71f9e..0000000000
--- a/wps/iAmp/playmode-bar.bmp
+++ /dev/null
diff --git a/wps/iAmp/playmode-small.bmp b/wps/iAmp/playmode-small.bmp
deleted file mode 100644
index f2b30d8f16..0000000000
--- a/wps/iAmp/playmode-small.bmp
+++ /dev/null
diff --git a/wps/iAmp/playmode.bmp b/wps/iAmp/playmode.bmp
deleted file mode 100644
index a922cf1d4a..0000000000
--- a/wps/iAmp/playmode.bmp
+++ /dev/null
diff --git a/wps/iAmp/repeatshuffle-small.bmp b/wps/iAmp/repeatshuffle-small.bmp
deleted file mode 100644
index ac4591bb17..0000000000
--- a/wps/iAmp/repeatshuffle-small.bmp
+++ /dev/null
diff --git a/wps/iAmp/repeatshuffle.bmp b/wps/iAmp/repeatshuffle.bmp
deleted file mode 100644
index 7013c56a37..0000000000
--- a/wps/iAmp/repeatshuffle.bmp
+++ /dev/null
diff --git a/wps/iAmp/vl.bmp b/wps/iAmp/vl.bmp
deleted file mode 100644
index e56bb91098..0000000000
--- a/wps/iAmp/vl.bmp
+++ /dev/null
diff --git a/wps/iAmp/volume.bmp b/wps/iAmp/volume.bmp
deleted file mode 100644
index d558e91831..0000000000
--- a/wps/iAmp/volume.bmp
+++ /dev/null
diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps
deleted file mode 100644
index 458b1a5a3f..0000000000
--- a/wps/iCatcher.112x64x1.wps
+++ /dev/null
@@ -1,23 +0,0 @@
-%wd
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%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,-)
-%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)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold1-s.bmp,80,2)
-%xl(C,repeat-s.bmp,58,2,4)
-%xl(D,shuffle-s.bmp,38,4,2)
-%xl(E,playmode-s.bmp,3,3,4)
-%?mh<%xd(B)|>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-s.bmp,16,1,9)
-%xl(G,animation-s.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%x(W,line1-112.bmp,0,0)
-%x(X,line2-112.bmp,0,13)
-%x(Y,line1-112.bmp,0,54)
diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps
deleted file mode 100644
index 2e3d83e905..0000000000
--- a/wps/iCatcher.128x128x16.wps
+++ /dev/null
@@ -1,29 +0,0 @@
-%wd
-%X(bg-128x128x16.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al    %bl%%%ar%pp/%pe 
-
-%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>
-
-
-%al %fbKbps
-%pb(11,-,106,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-sc.bmp,111,5,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-sc.bmp,86,2,4)
-%xl(C,repeat-sc.bmp,66,2,5)
-%xl(D,shuffle-sc.bmp,46,4,2)
-%xl(E,playmode-sc.bmp,3,3,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-sc.bmp,16,1,9)
-%xl(G,animation-sc.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-sc.bmp,92,88,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.128x64x1.160x128x2.wps b/wps/iCatcher.128x64x1.160x128x2.wps
deleted file mode 100644
index 801aecafb5..0000000000
--- a/wps/iCatcher.128x64x1.160x128x2.wps
+++ /dev/null
@@ -1,22 +0,0 @@
-%wd
-
-
-%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,-)
-%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery-s.bmp,109,3,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-s.bmp,86,2,3)
-%xl(C,repeat-s.bmp,66,2,4)
-%xl(D,shuffle-s.bmp,46,4,2)
-%xl(E,playmode-s.bmp,3,3,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-s.bmp,16,1,9)
-%xl(G,animation-s.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%x(W,line1-128.bmp,0,0)
-%x(X,line2-128.bmp,0,13)
-%x(Y,line1-128.bmp,0,52)
diff --git a/wps/iCatcher.128x64x1.220x176x16.wps b/wps/iCatcher.128x64x1.220x176x16.wps
deleted file mode 100644
index b13a5850d9..0000000000
--- a/wps/iCatcher.128x64x1.220x176x16.wps
+++ /dev/null
@@ -1,18 +0,0 @@
-%wd
-
-%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%?in<%in|%pp> - %?it<%it|%fn>
-
-%xl(A,battery-s.bmp,109,2,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-s.bmp,86,1,3)
-%xl(C,repeat-s.bmp,66,1,4)
-%xl(D,shuffle-s.bmp,46,3,2)
-%xl(E,playmode-s.bmp,3,2,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-s.bmp,16,0,9)
-%xl(G,animation-s.bmp,16,0,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%x(X,line2-128.bmp,0,12)
-%x(Y,line1-128.bmp,0,57)
diff --git a/wps/iCatcher.128x96x1.wps b/wps/iCatcher.128x96x1.wps
deleted file mode 100644
index 7a63817d6b..0000000000
--- a/wps/iCatcher.128x96x1.wps
+++ /dev/null
@@ -1,25 +0,0 @@
-%wd
-
-
-%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>>
-%s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb(11,-,106,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-s.bmp,109,3,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-s.bmp,86,2,3)
-%xl(C,repeat-s.bmp,66,2,4)
-%xl(D,shuffle-s.bmp,46,4,2)
-%xl(E,playmode-s.bmp,3,3,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-s.bmp,16,1,9)
-%xl(G,animation-s.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%x(W,line1-128.bmp,0,0)
-%x(X,line2-128.bmp,0,13)
-%x(Y,line1-128.bmp,0,77)
diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps
deleted file mode 100644
index 8d1fcf6a33..0000000000
--- a/wps/iCatcher.132x80x16.wps
+++ /dev/null
@@ -1,22 +0,0 @@
-%wd
-%X(bg-132x80x16.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%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,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-sc.bmp,115,5,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-sc.bmp,90,2,4)
-%xl(C,repeat-sc.bmp,68,2,5)
-%xl(D,shuffle-sc.bmp,48,4,2)
-%xl(E,playmode-sc.bmp,3,3,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-sc.bmp,16,1,9)
-%xl(G,animation-sc.bmp,16,1,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps
deleted file mode 100644
index 8af79c66b5..0000000000
--- a/wps/iCatcher.138x110x2.wps
+++ /dev/null
@@ -1,31 +0,0 @@
-%wd
-%X(bg-138x110x2.bmp)
-
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%al    %bl%%%ar%pp/%pe 
-%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>
-
-%al %fbKbps
-%pb(10,-,118,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-g.bmp,116,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-g.bmp,88,5,3)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>
-%xl(C,repeat-g.bmp,65,6,4)
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%xl(D,shuffle-g.bmp,40,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-g.bmp,4,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-g.bmp,19,4,9)
-%xl(G,animation-g.bmp,19,4,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-g.bmp,95,66,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps
deleted file mode 100644
index e33030f359..0000000000
--- a/wps/iCatcher.160x128x16.wps
+++ /dev/null
@@ -1,32 +0,0 @@
-%wd
-%X(bg-160x128x16.bmp)
-
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al    %bl%%%ar%pp/%pe 
-
-%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>
-
-%al %fbKbps
-%pb(10,-,140,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery.bmp,135,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,106,5,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,83,6,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,58,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,24,3,9)
-%xl(G,animation.bmp,24,3,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,115,85,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps
deleted file mode 100644
index cffbd1c46c..0000000000
--- a/wps/iCatcher.160x128x2.wps
+++ /dev/null
@@ -1,32 +0,0 @@
-%wd
-%X(bg-160x128x2.bmp)
-
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%al    %bl%%%ar%pp/%pe 
-
-%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>
-
-%al %fbKbps
-%pb(10,-,140,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-g.bmp,135,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-g.bmp,106,5,3)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>
-%xl(C,repeat-g.bmp,83,6,4)
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
-%xl(D,shuffle-g.bmp,58,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-g.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-g.bmp,24,4,9)
-%xl(G,animation-g.bmp,24,4,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-g.bmp,115,85,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps
deleted file mode 100644
index 51bcbbf95b..0000000000
--- a/wps/iCatcher.176x132x16.wps
+++ /dev/null
@@ -1,32 +0,0 @@
-%wd
-%X(bg-176x132x16.bmp)
-
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al    %bl%%%ar%pp/%pe 
-
-%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>
-
-%al %fbKbps
-%pb(10,-,156,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery.bmp,151,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,122,5,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,91,6,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,66,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,24,3,9)
-%xl(G,animation.bmp,24,3,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,131,85,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps
deleted file mode 100644
index db19c1e503..0000000000
--- a/wps/iCatcher.176x220x16.wps
+++ /dev/null
@@ -1,36 +0,0 @@
-%wd
-%X(bg-176x220x16.bmp)
-
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al   %bl%%%ar%pp/%pe 
-
-
-%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>
-
-
-
-
-%al %fbKbps
-%pb(10,-,156,4,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery.bmp,151,8,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,122,5,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,91,6,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,66,7,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,6,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,24,3,9)
-%xl(G,animation.bmp,24,3,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,131,167,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps
deleted file mode 100644
index 03f15287b3..0000000000
--- a/wps/iCatcher.220x176x16.wps
+++ /dev/null
@@ -1,30 +0,0 @@
-%wd
-%X(bg-220x176x16.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al    %bl%%%ar%pp/%pe 
-%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>
-
-%al %fbKbps
-%pb(11,-,198,6,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery.bmp,194,9,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold.bmp,165,6,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat.bmp,114,7,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle.bmp,89,8,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode.bmp,8,7,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume.bmp,25,4,9)
-%xl(G,animation.bmp,25,4,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec.bmp,173,112,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
deleted file mode 100644
index 31e3b606f7..0000000000
--- a/wps/iCatcher.240x320x16.wps
+++ /dev/null
@@ -1,34 +0,0 @@
-%wd
-%X(bg-240x320x16.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al   %bl%%%ar%pp/%pe 
-
-
-%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>
-
-
-
-%al %fbKbps
-%pb(11,-,218,7,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-b.bmp,204,12,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-b.bmp,164,8,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat-b.bmp,126,9,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle-b.bmp,91,11,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-b.bmp,11,10,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-b.bmp,34,5,9)
-%xl(G,animation-b.bmp,34,5,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-b.bmp,168,229,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
deleted file mode 100644
index 0c192f18d9..0000000000
--- a/wps/iCatcher.320x240x16.wps
+++ /dev/null
@@ -1,30 +0,0 @@
-%wd
-%X(bg-320x240x16.bmp)
-
-
-%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%al   %bl%%%ar%pp/%pe 
-%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>
-
-%al %fbKbps
-%pb(11,-,298,7,-)
-
-%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
-
-%xl(A,battery-b.bmp,284,12,5)
-%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
-%xl(B,hold-b.bmp,244,8,4)
-%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
-%xl(C,repeat-b.bmp,166,9,5)
-%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
-%xl(D,shuffle-b.bmp,131,11,2)
-%?ps<%xd(Da)|%xd(Db)>
-%xl(E,playmode-b.bmp,11,10,4)
-%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
-%xl(F,volume-b.bmp,34,5,9)
-%xl(G,animation-b.bmp,34,5,8)
-%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
-%xl(H,codec-b.bmp,248,153,22)
-%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher/animation-b.bmp b/wps/iCatcher/animation-b.bmp
deleted file mode 100644
index e73dbdb794..0000000000
--- a/wps/iCatcher/animation-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/animation-g.bmp b/wps/iCatcher/animation-g.bmp
deleted file mode 100644
index c0ba9f7ada..0000000000
--- a/wps/iCatcher/animation-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/animation-s.bmp b/wps/iCatcher/animation-s.bmp
deleted file mode 100644
index 4827ffa708..0000000000
--- a/wps/iCatcher/animation-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/animation-sc.bmp b/wps/iCatcher/animation-sc.bmp
deleted file mode 100644
index 7d564b4217..0000000000
--- a/wps/iCatcher/animation-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/animation.bmp b/wps/iCatcher/animation.bmp
deleted file mode 100644
index 1ae59cb670..0000000000
--- a/wps/iCatcher/animation.bmp
+++ /dev/null
diff --git a/wps/iCatcher/battery-b.bmp b/wps/iCatcher/battery-b.bmp
deleted file mode 100644
index bda4d8e15d..0000000000
--- a/wps/iCatcher/battery-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/battery-g.bmp b/wps/iCatcher/battery-g.bmp
deleted file mode 100644
index 3c75a91129..0000000000
--- a/wps/iCatcher/battery-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/battery-s.bmp b/wps/iCatcher/battery-s.bmp
deleted file mode 100644
index 56ccdb1df4..0000000000
--- a/wps/iCatcher/battery-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/battery-sc.bmp b/wps/iCatcher/battery-sc.bmp
deleted file mode 100644
index a7ec283196..0000000000
--- a/wps/iCatcher/battery-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/battery.bmp b/wps/iCatcher/battery.bmp
deleted file mode 100644
index 1d5785ed9b..0000000000
--- a/wps/iCatcher/battery.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-128x128x16.bmp b/wps/iCatcher/bg-128x128x16.bmp
deleted file mode 100644
index fc1a91769e..0000000000
--- a/wps/iCatcher/bg-128x128x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-132x80x16.bmp b/wps/iCatcher/bg-132x80x16.bmp
deleted file mode 100644
index f8ad0c57c3..0000000000
--- a/wps/iCatcher/bg-132x80x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-138x110x2.bmp b/wps/iCatcher/bg-138x110x2.bmp
deleted file mode 100644
index 7a193df7db..0000000000
--- a/wps/iCatcher/bg-138x110x2.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-160x128x16.bmp b/wps/iCatcher/bg-160x128x16.bmp
deleted file mode 100644
index fd6813bf64..0000000000
--- a/wps/iCatcher/bg-160x128x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-160x128x2.bmp b/wps/iCatcher/bg-160x128x2.bmp
deleted file mode 100644
index b0d420bdb1..0000000000
--- a/wps/iCatcher/bg-160x128x2.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-176x132x16.bmp b/wps/iCatcher/bg-176x132x16.bmp
deleted file mode 100644
index af70c96221..0000000000
--- a/wps/iCatcher/bg-176x132x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-176x220x16.bmp b/wps/iCatcher/bg-176x220x16.bmp
deleted file mode 100644
index 22f8bcdc3f..0000000000
--- a/wps/iCatcher/bg-176x220x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-220x176x16.bmp b/wps/iCatcher/bg-220x176x16.bmp
deleted file mode 100644
index 3fdb592bf5..0000000000
--- a/wps/iCatcher/bg-220x176x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-240x320x16.bmp b/wps/iCatcher/bg-240x320x16.bmp
deleted file mode 100644
index bd1a6241d7..0000000000
--- a/wps/iCatcher/bg-240x320x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-320x240x16.bmp b/wps/iCatcher/bg-320x240x16.bmp
deleted file mode 100644
index 53a37fe1c1..0000000000
--- a/wps/iCatcher/bg-320x240x16.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-b.bmp b/wps/iCatcher/codec-b.bmp
deleted file mode 100644
index 4a6b4aaa4a..0000000000
--- a/wps/iCatcher/codec-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-g.bmp b/wps/iCatcher/codec-g.bmp
deleted file mode 100644
index 45be05a430..0000000000
--- a/wps/iCatcher/codec-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-sc.bmp b/wps/iCatcher/codec-sc.bmp
deleted file mode 100644
index eda7f693b9..0000000000
--- a/wps/iCatcher/codec-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec.bmp b/wps/iCatcher/codec.bmp
deleted file mode 100644
index b45b6245d3..0000000000
--- a/wps/iCatcher/codec.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold-b.bmp b/wps/iCatcher/hold-b.bmp
deleted file mode 100644
index 5d9b545981..0000000000
--- a/wps/iCatcher/hold-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold-g.bmp b/wps/iCatcher/hold-g.bmp
deleted file mode 100644
index 4c0d3873fa..0000000000
--- a/wps/iCatcher/hold-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold-s.bmp b/wps/iCatcher/hold-s.bmp
deleted file mode 100644
index 9d0d446235..0000000000
--- a/wps/iCatcher/hold-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold-sc.bmp b/wps/iCatcher/hold-sc.bmp
deleted file mode 100644
index 1c4e9db33d..0000000000
--- a/wps/iCatcher/hold-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold.bmp b/wps/iCatcher/hold.bmp
deleted file mode 100644
index 48183fe64f..0000000000
--- a/wps/iCatcher/hold.bmp
+++ /dev/null
diff --git a/wps/iCatcher/hold1-s.bmp b/wps/iCatcher/hold1-s.bmp
deleted file mode 100644
index 61d99bd484..0000000000
--- a/wps/iCatcher/hold1-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/line1-112.bmp b/wps/iCatcher/line1-112.bmp
deleted file mode 100644
index d8306dfb96..0000000000
--- a/wps/iCatcher/line1-112.bmp
+++ /dev/null
diff --git a/wps/iCatcher/line1-128.bmp b/wps/iCatcher/line1-128.bmp
deleted file mode 100644
index 257bebadba..0000000000
--- a/wps/iCatcher/line1-128.bmp
+++ /dev/null
diff --git a/wps/iCatcher/line2-112.bmp b/wps/iCatcher/line2-112.bmp
deleted file mode 100644
index c9a26017f3..0000000000
--- a/wps/iCatcher/line2-112.bmp
+++ /dev/null
diff --git a/wps/iCatcher/line2-128.bmp b/wps/iCatcher/line2-128.bmp
deleted file mode 100644
index bb9a9dae10..0000000000
--- a/wps/iCatcher/line2-128.bmp
+++ /dev/null
diff --git a/wps/iCatcher/playmode-b.bmp b/wps/iCatcher/playmode-b.bmp
deleted file mode 100644
index fd6233a943..0000000000
--- a/wps/iCatcher/playmode-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/playmode-g.bmp b/wps/iCatcher/playmode-g.bmp
deleted file mode 100644
index 3e890d2527..0000000000
--- a/wps/iCatcher/playmode-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/playmode-s.bmp b/wps/iCatcher/playmode-s.bmp
deleted file mode 100644
index de06a250ba..0000000000
--- a/wps/iCatcher/playmode-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/playmode-sc.bmp b/wps/iCatcher/playmode-sc.bmp
deleted file mode 100644
index abbd705877..0000000000
--- a/wps/iCatcher/playmode-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/playmode.bmp b/wps/iCatcher/playmode.bmp
deleted file mode 100644
index a3c5450976..0000000000
--- a/wps/iCatcher/playmode.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeat-b.bmp b/wps/iCatcher/repeat-b.bmp
deleted file mode 100644
index 384f374dc2..0000000000
--- a/wps/iCatcher/repeat-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeat-g.bmp b/wps/iCatcher/repeat-g.bmp
deleted file mode 100644
index e127e0c5cd..0000000000
--- a/wps/iCatcher/repeat-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeat-s.bmp b/wps/iCatcher/repeat-s.bmp
deleted file mode 100644
index 78dd2c2a2b..0000000000
--- a/wps/iCatcher/repeat-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeat-sc.bmp b/wps/iCatcher/repeat-sc.bmp
deleted file mode 100644
index c7b41c9edd..0000000000
--- a/wps/iCatcher/repeat-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/repeat.bmp b/wps/iCatcher/repeat.bmp
deleted file mode 100644
index 04036dc65c..0000000000
--- a/wps/iCatcher/repeat.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle-b.bmp b/wps/iCatcher/shuffle-b.bmp
deleted file mode 100644
index 6dc3613c45..0000000000
--- a/wps/iCatcher/shuffle-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle-g.bmp b/wps/iCatcher/shuffle-g.bmp
deleted file mode 100644
index de51aadc53..0000000000
--- a/wps/iCatcher/shuffle-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle-s.bmp b/wps/iCatcher/shuffle-s.bmp
deleted file mode 100644
index e43ae93c91..0000000000
--- a/wps/iCatcher/shuffle-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle-sc.bmp b/wps/iCatcher/shuffle-sc.bmp
deleted file mode 100644
index 69e19ca8e0..0000000000
--- a/wps/iCatcher/shuffle-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/shuffle.bmp b/wps/iCatcher/shuffle.bmp
deleted file mode 100644
index f09c0bd098..0000000000
--- a/wps/iCatcher/shuffle.bmp
+++ /dev/null
diff --git a/wps/iCatcher/volume-b.bmp b/wps/iCatcher/volume-b.bmp
deleted file mode 100644
index 73d4c0fe0b..0000000000
--- a/wps/iCatcher/volume-b.bmp
+++ /dev/null
diff --git a/wps/iCatcher/volume-g.bmp b/wps/iCatcher/volume-g.bmp
deleted file mode 100644
index 175170befa..0000000000
--- a/wps/iCatcher/volume-g.bmp
+++ /dev/null
diff --git a/wps/iCatcher/volume-s.bmp b/wps/iCatcher/volume-s.bmp
deleted file mode 100644
index b827998784..0000000000
--- a/wps/iCatcher/volume-s.bmp
+++ /dev/null
diff --git a/wps/iCatcher/volume-sc.bmp b/wps/iCatcher/volume-sc.bmp
deleted file mode 100644
index 5938a81bfe..0000000000
--- a/wps/iCatcher/volume-sc.bmp
+++ /dev/null
diff --git a/wps/iCatcher/volume.bmp b/wps/iCatcher/volume.bmp
deleted file mode 100644
index d75f144522..0000000000
--- a/wps/iCatcher/volume.bmp
+++ /dev/null
diff --git a/wps/ipodVOL.160x128x1.wps b/wps/ipodVOL.160x128x1.wps
deleted file mode 100644
index a920410003..0000000000
--- a/wps/ipodVOL.160x128x1.wps
+++ /dev/null
@@ -1,20 +0,0 @@
-%xl(A,playmode.bmp,0,2,4)
-%xl(B,hold.bmp,20,2)
-%xl(C,repeat.bmp,141,18,4)
-%xl(D,battery.bmp,136,2,6)
-%x(a,bg.bmp,0,0)
-%wd
-%ac%?mp<Now Stopped|Now Playing|Now Paused|Now Playing|Now Playing>%?mp<|%?ps< %(S%)|>>
-
-%al%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe> 
-
-%s%ac%?it<%it|%fn>
-%s%t(3)%ac%?ia<%ia|%d(2)>
-%s%t(3)%ac%?id<%id|%d(1)>
-
-%pb
-%al%pc %ac      %pv %ar-%pr
-%?mp<|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
-%?mh<%xd(B)|>
-%?bp<%xd(Da)|%?bl<%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)>>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
diff --git a/wps/ipodVOL/battery.bmp b/wps/ipodVOL/battery.bmp
deleted file mode 100644
index e3ae1136eb..0000000000
--- a/wps/ipodVOL/battery.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/bg.bmp b/wps/ipodVOL/bg.bmp
deleted file mode 100644
index 6592ecd6dc..0000000000
--- a/wps/ipodVOL/bg.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/hold.bmp b/wps/ipodVOL/hold.bmp
deleted file mode 100644
index 2f790e472a..0000000000
--- a/wps/ipodVOL/hold.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/playmode.bmp b/wps/ipodVOL/playmode.bmp
deleted file mode 100644
index fb9fef7a30..0000000000
--- a/wps/ipodVOL/playmode.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/repeat.bmp b/wps/ipodVOL/repeat.bmp
deleted file mode 100644
index 02e6a85e47..0000000000
--- a/wps/ipodVOL/repeat.bmp
+++ /dev/null
diff --git a/wps/progressive.11x2x1.wps b/wps/progressive.11x2x1.wps
deleted file mode 100644
index e2c0711052..0000000000
--- a/wps/progressive.11x2x1.wps
+++ /dev/null
@@ -1,3 +0,0 @@
-#wps for the archos player with text alignment
-%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d(2)> - %?id<%id|%d(1)>
-%al%pc%ac%pb%ar%pt
\ No newline at end of file
diff --git a/wps/zezayer.128x64x1.wps b/wps/zezayer.128x64x1.wps
deleted file mode 100644
index 2508ba74db..0000000000
--- a/wps/zezayer.128x64x1.wps
+++ /dev/null
@@ -1,8 +0,0 @@
-%we
-* %?ia<%ia|%d(2)>
-* %?id<%id|%d(1)>
-* %?in<%(%in%) |>%?it<%it|%fn>
-%?ig<%t(8)* Genre: %ig %?iy<%(%iy%)|%t(0)>|%?iy<%t(8)* Year: %iy|%t(0)>%t(0)>;%?ic<%t(8)* By: %ic|%t(0)>
-%ac%pr/%pt        %?pp<[%pp/%pe]|>
-%pb
-%ar%fc   %?fb<%?fv<%fbK VBR| %fbK >|>
diff --git a/wps/zezayer.160x128x1.wps b/wps/zezayer.160x128x1.wps
deleted file mode 100644
index bc297f00b0..0000000000
--- a/wps/zezayer.160x128x1.wps
+++ /dev/null
@@ -1,18 +0,0 @@
-%x(a,RockBoxWPSd.bmp,0,0)
-%wd
-%ar  %?mp<Stop|Play|Pause|%>%>|%<%<>     
-
-* %?ia<%ia|%d(2)>
-* %?id<%id|%d(1)>
-* %?in<%(%in%) |>%?it<%it|%fn>
-%?ig<%t(8)* Genre: %ig %?iy<%(%iy%)|%t(0)>|%?iy<%t(8)* Year: %iy|%t(0)>%t(0)>;%?ic<%t(8)* By: %ic|%t(0)>
-
-%ac%pr/%pt        %?pp<[%pp/%pe]|>
-%pb
-%ar%fc   %?fb<%?fv<%fbK VBR| %fbK >|>   
-
-%?Ia<* %Ia|%?D(2)<* %D(2)|>>
-%?It<* %?In<%(%In%) |>%It|%?Fn<* %?In<%(%In%) |>%Fn|>>
-
-%al     %pv  %?mm<%?ps<%(Shuffle%)|>|%?ps<%(Sfl All%)|%(Rpt All%)>|%(Rpt 1%)|%?ps<%(Shuffle%)|%(Rpt Sfl%)>|%(A-B Rpt%)>
-%al     %t(15)%bl  %(%bt%) 
diff --git a/wps/zezayer/RockBoxWPSd.bmp b/wps/zezayer/RockBoxWPSd.bmp
deleted file mode 100644
index b2f306d747..0000000000
--- a/wps/zezayer/RockBoxWPSd.bmp
+++ /dev/null