diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index 7ea6889b75..ca7cccbef7 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -1,9 +1,34 @@
 # cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
 # derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
-%wd
-%x|A|wpsbackdrop-128x64x1.bmp|0|0|
-%pb|pb-128x64x1.bmp|1|38|125|8|
-%s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
 
-%al   %pc%ar%pr   
+%wd
+
+# progressbar viewport
+%V|0|0|128|6|1|
+%x|a|pbbackground-128x64x1.bmp|1|0|
+%pb|pb-128x64x1.bmp|2|1|124|4|
+
+# tag info viewport
+%V|0|6|128|37|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|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|
+%pp of %pe%ar%pc
+
+# status bar
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
\ No newline at end of file
diff --git a/wps/cabbiev2/bar-128x64x1.bmp b/wps/cabbiev2/bar-128x64x1.bmp
new file mode 100755
index 0000000000..8218d94370
Binary files /dev/null and b/wps/cabbiev2/bar-128x64x1.bmp differ
diff --git a/wps/cabbiev2/battery-128x64x1.bmp b/wps/cabbiev2/battery-128x64x1.bmp
new file mode 100755
index 0000000000..ad3f70a776
Binary files /dev/null and b/wps/cabbiev2/battery-128x64x1.bmp differ
diff --git a/wps/cabbiev2/lock-128x64x1.bmp b/wps/cabbiev2/lock-128x64x1.bmp
new file mode 100755
index 0000000000..2de016e9ac
Binary files /dev/null and b/wps/cabbiev2/lock-128x64x1.bmp differ
diff --git a/wps/cabbiev2/pb-128x64x1.bmp b/wps/cabbiev2/pb-128x64x1.bmp
index e183243f2e..dffd8ca351 100644
Binary files a/wps/cabbiev2/pb-128x64x1.bmp and b/wps/cabbiev2/pb-128x64x1.bmp differ
diff --git a/wps/cabbiev2/pbbackground-128x64x1.bmp b/wps/cabbiev2/pbbackground-128x64x1.bmp
new file mode 100755
index 0000000000..2e35171dbd
Binary files /dev/null and b/wps/cabbiev2/pbbackground-128x64x1.bmp differ
diff --git a/wps/cabbiev2/playmode-128x64x1.bmp b/wps/cabbiev2/playmode-128x64x1.bmp
new file mode 100755
index 0000000000..1a7714913e
Binary files /dev/null and b/wps/cabbiev2/playmode-128x64x1.bmp differ
diff --git a/wps/cabbiev2/repeat-128x64x1.bmp b/wps/cabbiev2/repeat-128x64x1.bmp
new file mode 100755
index 0000000000..6b2ff0650b
Binary files /dev/null and b/wps/cabbiev2/repeat-128x64x1.bmp differ
diff --git a/wps/cabbiev2/shuffle-128x64x1.bmp b/wps/cabbiev2/shuffle-128x64x1.bmp
new file mode 100755
index 0000000000..25e282c41a
Binary files /dev/null and b/wps/cabbiev2/shuffle-128x64x1.bmp differ
diff --git a/wps/cabbiev2/volume-128x64x1.bmp b/wps/cabbiev2/volume-128x64x1.bmp
new file mode 100755
index 0000000000..856f532e00
Binary files /dev/null and b/wps/cabbiev2/volume-128x64x1.bmp differ