Finish bitmap strips work - convert the rest of the 'Rockboxed' WPS (bigger colour displays). Similar changes as in the previous Rockboxed commits: integrate statically loaded bitmaps into the background and delete the now unused bitmaps, remove the unnecessary coordinates in the backdrop tag, add missing codec names, volume and battery icons now with one graphic (part of a strip) per status which simplifies the code, rename sl-* to shuffle-* and hd-* to lock*- bmps. Correct mime-type for all image files. * Don't forget to clean up the 'Rockboxed' directory...

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

50 files changed, 84 insertions, 264 deletions

diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps
index 3ccdc9d..41cd72f 100644
--- a/wps/Rockboxed.160x128x16.wps
+++ b/wps/Rockboxed.160x128x16.wps
@@ -1,42 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-160x128x16.bmp|0|0|
+%X|bg-160x128x16.bmp|
 %P|pg-140.bmp|
-%x|o|pgln-140.bmp|10|76|
-%xl|p|ply-color-big.bmp|72|109|
-%xl|q|ps-color-big.bmp|72|109|
-%xl|f|ff-color-big.bmp|72|109|
-%xl|r|rw-color-big.bmp|72|109|
-%xl|b|sl-color-big.bmp|36|109|
-%x|s|spk-color.bmp|3|109|
-%xl|A|v01-color.bmp|15|109|
-%xl|B|v02-color.bmp|17|109|
-%xl|C|v03-color.bmp|19|109|
-%xl|D|v04-color.bmp|21|109|
-%xl|E|v05-color.bmp|23|109|
-%xl|F|v06-color.bmp|25|109|
-%xl|G|v07-color.bmp|27|109|
-%xl|H|v08-color.bmp|29|109|
-%xl|I|v11-color.bmp|31|109|
-%xl|Z|n-color-big.bmp|150|113|
-%xl|Y|n-color-big.bmp|147|113|
-%xl|X|n-color-big.bmp|144|113|
-%xl|W|n-color-big.bmp|141|113|
-%xl|V|n-color-big.bmp|138|113|
-%xl|U|n-color-big.bmp|135|113|
-%xl|T|n-color-big.bmp|132|113|
-%xl|S|n-color-big.bmp|129|113|
-%xl|R|n-color-big.bmp|126|113|
-%xl|Q|n-color-big.bmp|123|113|
-%xl|P|l-color-big.bmp|126|113|
-%xl|O|l-color-big.bmp|123|113|
-%x|N|bt-color-big.bmp|121|111|
-%xl|z|ra-color-big.bmp|53|109|
-%xl|y|ro-color-big.bmp|53|109|
-%xl|x|rs-color-big.bmp|53|109|
-%xl|w|rab-color-big.bmp|53|109|
-%xl|h|hd-color.bmp|95|108|
+%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|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
@@ -44,10 +16,10 @@
 
 %ac%t3%ig;%ac%iy 
 %pb|5|10|150|76|
-%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%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<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps
index 5997874..c710e96 100644
--- a/wps/Rockboxed.176x132x16.wps
+++ b/wps/Rockboxed.176x132x16.wps
@@ -1,45 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-176x132x16.bmp|0|0|
+%X|bg-176x132x16.bmp|
 %P|pg-156.bmp|
-%x|o|pgln-156.bmp|10|75|
-%xl|p|ply-color-big.bmp|81|113|
-%xl|q|ps-color-big.bmp|80|113|
-%xl|f|ff-color-big.bmp|80|113|
-%xl|r|rw-color-big.bmp|80|113|
-%xl|b|sl-color-big.bmp|40|113|
-%x|s|spk-color.bmp|3|113|
-%xl|A|v01-color.bmp|15|113|
-%xl|B|v02-color.bmp|17|113|
-%xl|C|v03-color.bmp|19|113|
-%xl|D|v04-color.bmp|21|113|
-%xl|E|v05-color.bmp|23|113|
-%xl|F|v06-color.bmp|25|113|
-%xl|G|v07-color.bmp|27|113|
-%xl|H|v08-color.bmp|29|113|
-%xl|I|v09-color-big.bmp|31|113|
-%xl|J|v10-color.bmp|33|113|
-%xl|K|v11-color.bmp|35|113|
-%xl|Z|n-color-big.bmp|166|117|
-%xl|Y|n-color-big.bmp|163|117|
-%xl|X|n-color-big.bmp|160|117|
-%xl|W|n-color-big.bmp|157|117|
-%xl|V|n-color-big.bmp|154|117|
-%xl|U|n-color-big.bmp|151|117|
-%xl|T|n-color-big.bmp|148|117|
-%xl|S|n-color-big.bmp|145|117|
-%xl|R|n-color-big.bmp|142|117|
-%xl|Q|n-color-big.bmp|139|117|
-%xl|P|l-color-big.bmp|142|117|
-%xl|O|l-color-big.bmp|139|117|
-%x|N|bt-color-big.bmp|137|115|
-%xl|M|bu.bmp|139|117|
-%xl|z|ra-color-big.bmp|60|113|
-%xl|y|ro-color-big.bmp|60|113|
-%xl|x|rs-color-big.bmp|60|113|
-%xl|w|rab-color-big.bmp|60|113|
-%xl|h|hd-color.bmp|110|112|
+%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|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
@@ -47,10 +16,10 @@
 
 %ac%t3%ig;%ac%iy
 %pb|5|10|166|75|
-%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ%xdK>
-%?bl<%xdM|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%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<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
+%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps
index 0e98677..c483127 100644
--- a/wps/Rockboxed.176x220x16.wps
+++ b/wps/Rockboxed.176x220x16.wps
@@ -1,45 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-176x220x16.bmp|0|0|
+%X|bg-176x220x16.bmp|
 %P|pg-156.bmp|
-%x|o|pgln-156.bmp|10|171|
-%xl|p|ply-color-big.bmp|81|201|
-%xl|q|ps-color-big.bmp|80|201|
-%xl|f|ff-color-big.bmp|80|201|
-%xl|r|rw-color-big.bmp|80|201|
-%xl|b|sl-color-big.bmp|40|201|
-%x|s|spk-color.bmp|3|201|
-%xl|A|v01-color.bmp|15|201|
-%xl|B|v02-color.bmp|17|201|
-%xl|C|v03-color.bmp|19|201|
-%xl|D|v04-color.bmp|21|201|
-%xl|E|v05-color.bmp|23|201|
-%xl|F|v06-color.bmp|25|201|
-%xl|G|v07-color.bmp|27|201|
-%xl|H|v08-color.bmp|29|201|
-%xl|I|v09-color-big.bmp|31|201|
-%xl|J|v10-color.bmp|33|201|
-%xl|K|v11-color.bmp|35|201|
-%xl|Z|n-color-big.bmp|166|205|
-%xl|Y|n-color-big.bmp|163|205|
-%xl|X|n-color-big.bmp|160|205|
-%xl|W|n-color-big.bmp|157|205|
-%xl|V|n-color-big.bmp|154|205|
-%xl|U|n-color-big.bmp|151|205|
-%xl|T|n-color-big.bmp|148|205|
-%xl|S|n-color-big.bmp|145|205|
-%xl|R|n-color-big.bmp|142|205|
-%xl|Q|n-color-big.bmp|139|205|
-%xl|P|l-color-big.bmp|142|205|
-%xl|O|l-color-big.bmp|139|205|
-%x|N|bt-color-big.bmp|137|203|
-%xl|M|bu.bmp|139|205|
-%xl|z|ra-color-big.bmp|60|201|
-%xl|y|ro-color-big.bmp|60|201|
-%xl|x|rs-color-big.bmp|60|201|
-%xl|w|rab-color-big.bmp|60|201|
-%xl|h|hd-color.bmp|107|201|
+%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|
 
 
 
@@ -55,10 +24,10 @@
 
 
 %pb|5|10|166|171|
-%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ%xdK>
-%?bl<%xdM|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%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<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
+%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps
index cc43b63..97781a2 100644
--- a/wps/Rockboxed.220x176x16.wps
+++ b/wps/Rockboxed.220x176x16.wps
@@ -1,44 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-220x176x16.bmp|0|0|
+%X|bg-220x176x16.bmp|
 %P|pg-200.bmp|
-%x|o|pgln-200.bmp|10|116|
-%xl|p|ply-color-big.bmp|102|156|
-%xl|q|ps-color-big.bmp|102|156|
-%xl|f|ff-color-big.bmp|102|156|
-%xl|r|rw-color-big.bmp|102|156|
-%xl|b|sl-color-big.bmp|57|156|
-%x|s|spk-color.bmp|3|156|
-%xl|A|v01-color.bmp|15|156|
-%xl|B|v02-color.bmp|17|156|
-%xl|C|v03-color.bmp|19|156|
-%xl|D|v04-color.bmp|21|156|
-%xl|E|v05-color.bmp|23|156|
-%xl|F|v06-color.bmp|25|156|
-%xl|G|v07-color.bmp|27|156|
-%xl|H|v08-color.bmp|29|156|
-%xl|I|v09-color-big.bmp|31|156|
-%xl|J|v10-color.bmp|33|156|
-%xl|K|v11-color.bmp|35|156|
-%xl|Z|n-color-big.bmp|210|160|
-%xl|Y|n-color-big.bmp|207|160|
-%xl|X|n-color-big.bmp|204|160|
-%xl|W|n-color-big.bmp|201|160|
-%xl|V|n-color-big.bmp|198|160|
-%xl|U|n-color-big.bmp|195|160|
-%xl|T|n-color-big.bmp|192|160|
-%xl|S|n-color-big.bmp|189|160|
-%xl|R|n-color-big.bmp|186|160|
-%xl|Q|n-color-big.bmp|183|160|
-%xl|P|l-color-big.bmp|186|160|
-%xl|O|l-color-big.bmp|183|160|
-%x|N|bt-color-big.bmp|181|158|
-%xl|z|ra-color-big.bmp|77|156|
-%xl|y|ro-color-big.bmp|77|156|
-%xl|x|rs-color-big.bmp|77|156|
-%xl|w|rab-color-big.bmp|77|156|
-%xl|h|hd-color.bmp|142|156|
+%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|
 
 
 
@@ -48,10 +18,10 @@
 
 %ac%t3%ig;%ac%iy 
 %pb|5|10|210|116|
-%al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ%xdK>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%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<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
+%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps
index 2342ae5..37f1c35 100644
--- a/wps/Rockboxed.240x320x16.wps
+++ b/wps/Rockboxed.240x320x16.wps
@@ -1,44 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-240x320x16.bmp|0|0|
+%X|bg-240x320x16.bmp|
 %P|pg-220.bmp|
-%x|o|pgln-220.bmp|10|256|
-%xl|p|ply-color-big.bmp|112|300|
-%xl|q|ps-color-big.bmp|112|300|
-%xl|f|ff-color-big.bmp|112|300|
-%xl|r|rw-color-big.bmp|112|300|
-%xl|b|sl-color-big.bmp|57|300|
-%x|s|spk-color.bmp|3|300|
-%xl|A|v01-color.bmp|15|300|
-%xl|B|v02-color.bmp|17|300|
-%xl|C|v03-color.bmp|19|300|
-%xl|D|v04-color.bmp|21|300|
-%xl|E|v05-color.bmp|23|300|
-%xl|F|v06-color.bmp|25|300|
-%xl|G|v07-color.bmp|27|300|
-%xl|H|v08-color.bmp|29|300|
-%xl|I|v09-color-big.bmp|31|300|
-%xl|J|v10-color.bmp|33|300|
-%xl|K|v11-color.bmp|35|300|
-%xl|Z|n-color-big.bmp|230|304|
-%xl|Y|n-color-big.bmp|227|304|
-%xl|X|n-color-big.bmp|224|304|
-%xl|W|n-color-big.bmp|221|304|
-%xl|V|n-color-big.bmp|218|304|
-%xl|U|n-color-big.bmp|215|304|
-%xl|T|n-color-big.bmp|212|304|
-%xl|S|n-color-big.bmp|209|304|
-%xl|R|n-color-big.bmp|206|304|
-%xl|Q|n-color-big.bmp|203|304|
-%xl|P|l-color-big.bmp|206|304|
-%xl|O|l-color-big.bmp|203|304|
-%x|N|bt-color-big.bmp|201|302|
-%xl|z|ra-color-big.bmp|77|300|
-%xl|y|ro-color-big.bmp|77|300|
-%xl|x|rs-color-big.bmp|77|300|
-%xl|w|rab-color-big.bmp|77|300|
-%xl|h|hd-color.bmp|152|300|
+%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|
 
 
 
@@ -53,10 +23,10 @@
 %ac%t3%ig;%ac%iy 
 
 %pb|5|10|230|256|
-%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ%xdK>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%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<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
+%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps
index 44d7252..23ffa83 100644
--- a/wps/Rockboxed.320x240x16.wps
+++ b/wps/Rockboxed.320x240x16.wps
@@ -1,44 +1,14 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-320x240x16.bmp|0|0|
+%X|bg-320x240x16.bmp|
 %P|pg-300.bmp|
-%x|o|pgln-300.bmp|10|178|
-%xl|p|ply-color-big.bmp|153|220|
-%xl|q|ps-color-big.bmp|153|220|
-%xl|f|ff-color-big.bmp|153|220|
-%xl|r|rw-color-big.bmp|153|220|
-%xl|b|sl-color-big.bmp|113|220|
-%x|s|spk-color.bmp|3|220|
-%xl|A|v01-color.bmp|15|220|
-%xl|B|v02-color.bmp|17|220|
-%xl|C|v03-color.bmp|19|220|
-%xl|D|v04-color.bmp|21|220|
-%xl|E|v05-color.bmp|23|220|
-%xl|F|v06-color.bmp|25|220|
-%xl|G|v07-color.bmp|27|220|
-%xl|H|v08-color.bmp|29|220|
-%xl|I|v09-color-big.bmp|31|220|
-%xl|J|v10-color.bmp|33|220|
-%xl|K|v11-color.bmp|35|220|
-%xl|Z|n-color-big.bmp|310|224|
-%xl|Y|n-color-big.bmp|307|224|
-%xl|X|n-color-big.bmp|304|224|
-%xl|W|n-color-big.bmp|301|224|
-%xl|V|n-color-big.bmp|298|224|
-%xl|U|n-color-big.bmp|295|224|
-%xl|T|n-color-big.bmp|292|224|
-%xl|S|n-color-big.bmp|289|224|
-%xl|R|n-color-big.bmp|286|224|
-%xl|Q|n-color-big.bmp|283|224|
-%xl|P|l-color-big.bmp|286|224|
-%xl|O|l-color-big.bmp|283|224|
-%x|N|bt-color-big.bmp|281|222|
-%xl|z|ra-color-big.bmp|131|220|
-%xl|y|ro-color-big.bmp|131|220|
-%xl|x|rs-color-big.bmp|131|220|
-%xl|w|rab-color-big.bmp|131|220|
-%xl|h|hd-color.bmp|220|220|
+%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|
 
 
 
@@ -49,10 +19,10 @@
 
 %ac%t3%ig;%ac%iy 
 %pb|5|10|310|178|
-%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
-%?ps<%xdb>
-%?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
-%?mm<|%xdz|%xdy|%xdx|%xdw>
-%?mh<%xdh>
-%?pv<|%xdA|%xdA%xdB|%xdA%xdB%xdC|%xdA%xdB%xdC%xdD|%xdA%xdB%xdC%xdD%xdE|%xdA%xdB%xdC%xdD%xdE%xdF|%xdA%xdB%xdC%xdD%xdE%xdF%xdG|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ|%xdA%xdB%xdC%xdD%xdE%xdF%xdG%xdH%xdI%xdJ%xdK>
-%?bl<|%xdO|%xdO%xdP|%xdQ%xdR|%xdQ%xdR%xdS|%xdQ%xdR%xdS%xdT|%xdQ%xdR%xdS%xdT%xdU|%xdQ%xdR%xdS%xdT%xdU%xdV|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY|%xdQ%xdR%xdS%xdT%xdU%xdV%xdW%xdX%xdY%xdZ>
+%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<%xdB>
+%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mh<%xdF>
+%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
+%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
diff --git a/wps/Rockboxed/battery-color-big.bmp b/wps/Rockboxed/battery-color-big.bmp
new file mode 100644
index 0000000..8d54fbb
--- /dev/null
+++ b/wps/Rockboxed/battery-color-big.bmp
diff --git a/wps/Rockboxed/battery-grey-big.bmp b/wps/Rockboxed/battery-grey-big.bmp
index 079f22a..a7c676c 100644
--- a/wps/Rockboxed/battery-grey-big.bmp
+++ b/wps/Rockboxed/battery-grey-big.bmp
diff --git a/wps/Rockboxed/bg-160x128x16.bmp b/wps/Rockboxed/bg-160x128x16.bmp
index d195893..7c8b38a 100644
--- a/wps/Rockboxed/bg-160x128x16.bmp
+++ b/wps/Rockboxed/bg-160x128x16.bmp
diff --git a/wps/Rockboxed/bg-176x132x16.bmp b/wps/Rockboxed/bg-176x132x16.bmp
index 7cb9966..b9bc0dc 100644
--- a/wps/Rockboxed/bg-176x132x16.bmp
+++ b/wps/Rockboxed/bg-176x132x16.bmp
diff --git a/wps/Rockboxed/bg-176x220x16.bmp b/wps/Rockboxed/bg-176x220x16.bmp
index 5a84c66..bc7b00d 100644
--- a/wps/Rockboxed/bg-176x220x16.bmp
+++ b/wps/Rockboxed/bg-176x220x16.bmp
diff --git a/wps/Rockboxed/bg-220x176x16.bmp b/wps/Rockboxed/bg-220x176x16.bmp
index b2ba346..9c2bad8 100644
--- a/wps/Rockboxed/bg-220x176x16.bmp
+++ b/wps/Rockboxed/bg-220x176x16.bmp
diff --git a/wps/Rockboxed/bg-240x320x16.bmp b/wps/Rockboxed/bg-240x320x16.bmp
index 8ffb63e..640d511 100644
--- a/wps/Rockboxed/bg-240x320x16.bmp
+++ b/wps/Rockboxed/bg-240x320x16.bmp
diff --git a/wps/Rockboxed/bg-320x240x16.bmp b/wps/Rockboxed/bg-320x240x16.bmp
index 659f1e2..4691a97 100644
--- a/wps/Rockboxed/bg-320x240x16.bmp
+++ b/wps/Rockboxed/bg-320x240x16.bmp
diff --git a/wps/Rockboxed/bt-color-big.bmp b/wps/Rockboxed/bt-color-big.bmp
deleted file mode 100644
index 8583096..0000000
--- a/wps/Rockboxed/bt-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/bu.bmp b/wps/Rockboxed/bu.bmp
deleted file mode 100644
index 476d0dc..0000000
--- a/wps/Rockboxed/bu.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ff-color-big.bmp b/wps/Rockboxed/ff-color-big.bmp
deleted file mode 100644
index 7e43ba8..0000000
--- a/wps/Rockboxed/ff-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/hd-color.bmp b/wps/Rockboxed/hd-color.bmp
deleted file mode 100644
index 1090326..0000000
--- a/wps/Rockboxed/hd-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/l-color-big.bmp b/wps/Rockboxed/l-color-big.bmp
deleted file mode 100644
index 79c195f..0000000
--- a/wps/Rockboxed/l-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/mode-color-big.bmp b/wps/Rockboxed/mode-color-big.bmp
new file mode 100644
index 0000000..7137189
--- /dev/null
+++ b/wps/Rockboxed/mode-color-big.bmp
diff --git a/wps/Rockboxed/n-color-big.bmp b/wps/Rockboxed/n-color-big.bmp
deleted file mode 100644
index 8993e1e..0000000
--- a/wps/Rockboxed/n-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-140.bmp b/wps/Rockboxed/pgln-140.bmp
deleted file mode 100644
index 7255cf3..0000000
--- a/wps/Rockboxed/pgln-140.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-156.bmp b/wps/Rockboxed/pgln-156.bmp
deleted file mode 100644
index 6a683c4..0000000
--- a/wps/Rockboxed/pgln-156.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-164.bmp b/wps/Rockboxed/pgln-164.bmp
deleted file mode 100644
index a499397..0000000
--- a/wps/Rockboxed/pgln-164.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-200.bmp b/wps/Rockboxed/pgln-200.bmp
deleted file mode 100644
index 9b69523..0000000
--- a/wps/Rockboxed/pgln-200.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-220.bmp b/wps/Rockboxed/pgln-220.bmp
deleted file mode 100644
index 364218f..0000000
--- a/wps/Rockboxed/pgln-220.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/pgln-300.bmp b/wps/Rockboxed/pgln-300.bmp
deleted file mode 100644
index 81169e6..0000000
--- a/wps/Rockboxed/pgln-300.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ply-color-big.bmp b/wps/Rockboxed/ply-color-big.bmp
deleted file mode 100644
index d12bd8f..0000000
--- a/wps/Rockboxed/ply-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ps-color-big.bmp b/wps/Rockboxed/ps-color-big.bmp
deleted file mode 100644
index a6e9be3..0000000
--- a/wps/Rockboxed/ps-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/ra-color-big.bmp b/wps/Rockboxed/ra-color-big.bmp
deleted file mode 100644
index 7e65f6d..0000000
--- a/wps/Rockboxed/ra-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rab-color-big.bmp b/wps/Rockboxed/rab-color-big.bmp
deleted file mode 100644
index cabcb44..0000000
--- a/wps/Rockboxed/rab-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/repeat-color-big.bmp b/wps/Rockboxed/repeat-color-big.bmp
new file mode 100644
index 0000000..1494182
--- /dev/null
+++ b/wps/Rockboxed/repeat-color-big.bmp
diff --git a/wps/Rockboxed/ro-color-big.bmp b/wps/Rockboxed/ro-color-big.bmp
deleted file mode 100644
index 9c020e6..0000000
--- a/wps/Rockboxed/ro-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rs-color-big.bmp b/wps/Rockboxed/rs-color-big.bmp
deleted file mode 100644
index 97485ab..0000000
--- a/wps/Rockboxed/rs-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/rw-color-big.bmp b/wps/Rockboxed/rw-color-big.bmp
deleted file mode 100644
index 4ddabff..0000000
--- a/wps/Rockboxed/rw-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/sl-color-big.bmp b/wps/Rockboxed/shuffle-color-big.bmp
index 68ab6b1..68ab6b1 100644
--- a/wps/Rockboxed/sl-color-big.bmp
+++ b/wps/Rockboxed/shuffle-color-big.bmp
diff --git a/wps/Rockboxed/spk-color.bmp b/wps/Rockboxed/spk-color.bmp
deleted file mode 100644
index abcdcbf..0000000
--- a/wps/Rockboxed/spk-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v01-color.bmp b/wps/Rockboxed/v01-color.bmp
deleted file mode 100644
index 41e528e..0000000
--- a/wps/Rockboxed/v01-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v02-color.bmp b/wps/Rockboxed/v02-color.bmp
deleted file mode 100644
index 64de007..0000000
--- a/wps/Rockboxed/v02-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v03-color.bmp b/wps/Rockboxed/v03-color.bmp
deleted file mode 100644
index c3b9526..0000000
--- a/wps/Rockboxed/v03-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v04-color.bmp b/wps/Rockboxed/v04-color.bmp
deleted file mode 100644
index 70d725e..0000000
--- a/wps/Rockboxed/v04-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v05-color.bmp b/wps/Rockboxed/v05-color.bmp
deleted file mode 100644
index d12cdc3..0000000
--- a/wps/Rockboxed/v05-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v06-color.bmp b/wps/Rockboxed/v06-color.bmp
deleted file mode 100644
index 8fce709..0000000
--- a/wps/Rockboxed/v06-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v07-color.bmp b/wps/Rockboxed/v07-color.bmp
deleted file mode 100644
index 1534ddc..0000000
--- a/wps/Rockboxed/v07-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v08-color.bmp b/wps/Rockboxed/v08-color.bmp
deleted file mode 100644
index 88fd671..0000000
--- a/wps/Rockboxed/v08-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v09-color-big.bmp b/wps/Rockboxed/v09-color-big.bmp
deleted file mode 100644
index 61b924a..0000000
--- a/wps/Rockboxed/v09-color-big.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v10-color.bmp b/wps/Rockboxed/v10-color.bmp
deleted file mode 100644
index d96d79d..0000000
--- a/wps/Rockboxed/v10-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/v11-color.bmp b/wps/Rockboxed/v11-color.bmp
deleted file mode 100644
index 919ec6b..0000000
--- a/wps/Rockboxed/v11-color.bmp
+++ /dev/null
diff --git a/wps/Rockboxed/volume-color-big.bmp b/wps/Rockboxed/volume-color-big.bmp
new file mode 100644
index 0000000..331a85c
--- /dev/null
+++ b/wps/Rockboxed/volume-color-big.bmp
diff --git a/wps/Rockboxed/volume-color-medium.bmp b/wps/Rockboxed/volume-color-medium.bmp
new file mode 100644
index 0000000..29bc3d6
--- /dev/null
+++ b/wps/Rockboxed/volume-color-medium.bmp