2 files changed, 16 insertions, 49 deletions

diff --git a/wps/cabbiev2.128x64x1.sansaclip.wps b/wps/cabbiev2.128x64x1.sansaclip.wps
deleted file mode 100644
index c39137dd26..0000000000
--- a/wps/cabbiev2.128x64x1.sansaclip.wps
+++ /dev/null
@@ -1,39 +0,0 @@
-# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
-# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
-# modified for the Sansa Clip, 2009, Bertrik Sikken, Thomas Martitz
-
-%wd
-
-# progressbar viewport
-%V|0|0|128|16|1|
-%pb|pb-128x64x1.bmp|2|1|124|4|
-%x|a|pbbackground-128x64x1.bmp|1|0|
-%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pc
-
-# tag info viewport
-%V|0|18|128|25|1|
-%ac%s%?it<%it|%fn>
-%ac%s%?ia<%ia|%?d2<%d2|(root)>>
-%ac%s%?id<%id|%?d1<%d1|(root)>>
-%x|b|bar-128x64x1.bmp|2|32|
-
-# playtime info and status bar
-%V|2|43|124|21|1|
-%xl|A|lock-128x64x1.bmp|1|12|2|
-%xl|B|battery-128x64x1.bmp|23|12|9|
-%xl|D|shuffle-128x64x1.bmp|67|13|
-%xl|E|repeat-128x64x1.bmp|93|12|4|
-%xl|F|playmode-128x64x1.bmp|113|12|5|
-%?mv<%Vda|%Vdb>
-# status bar
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
-
-%Vl|a|48|55|19|9|1|
-%pv
-%Vl|b|48|55|19|9|1|
-%xl|C|volume-128x64x1.bmp|0|0|9|
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index c50f47f886..e99a554acd 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -8,23 +8,29 @@
 %x|a|pbbackground-128x64x1.bmp|1|0|
 %pb|pb-128x64x1.bmp|2|1|124|4|
 
+%V|0|8|128|8|1|
+%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pc
+
 # tag info viewport
-%V|0|8|128|37|1|
+%V|0|16|128|24|1|
 %ac%s%?it<%it|%fn>
 %ac%s%?ia<%ia|%?d2<%d2|(root)>>
 %ac%s%?id<%id|%?d1<%d1|(root)>>
+
+# next file viewport
+%V|0|42|128|8|1|
 %ac%s%Sx|Next:| %?It<%It|%Fn>
-%x|b|bar-128x64x1.bmp|2|36|
 
 # playtime info and status bar
-%V|2|43|124|21|1|
-%xl|A|lock-128x64x1.bmp|1|12|2|
-%xl|B|battery-128x64x1.bmp|23|12|9|
-%xl|C|volume-128x64x1.bmp|46|12|9|
-%xl|D|shuffle-128x64x1.bmp|67|13|
-%xl|E|repeat-128x64x1.bmp|93|12|4|
-%xl|F|playmode-128x64x1.bmp|113|12|5|
-%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pc
+
+%V|2|52|124|12|1|
+%x|b|bar-128x64x1.bmp|2|0|
+%xl|A|lock-128x64x1.bmp|1|4|2|
+%xl|B|battery-128x64x1.bmp|23|4|9|
+%xl|C|volume-128x64x1.bmp|46|4|9|
+%xl|D|shuffle-128x64x1.bmp|67|5|
+%xl|E|repeat-128x64x1.bmp|93|4|4|
+%xl|F|playmode-128x64x1.bmp|113|4|5|
 
 # status bar
 %?mh<%xdAa|%xdAb>