The next included WPS using bitmap strips: 'boxes', including some cleanup, small improvements and adding missing icons. (1) All colour ports now use a backdrop to free space in the image buffer (was really near the limit on e.g. the 320x240 screen). I tried to use the same colours as the already existing 220x176 backdrop. (2) The H300 now uses a viewport instead of the frame bitmap (gets rid of the bmp and better when lines need to scroll). For simplicity it's only one viewport so that the peakmeters are now only at viewport width and the time/date info is a bit off the screen's border though. (3) Complete codec icons (I could reuse the engineer2 ones), the repeat icons and added coloured rating bitmaps. (4) Small tweeks in the virtual led, progressbar and Archos background bitmaps. (5) Correct mime-type for all.

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

106 files changed, 109 insertions, 305 deletions

diff --git a/wps/boxes.112x64x1.wps b/wps/boxes.112x64x1.wps
index d7010a4e47..dbd63c4846 100644
--- a/wps/boxes.112x64x1.wps
+++ b/wps/boxes.112x64x1.wps
@@ -1,30 +1,9 @@
 %x|a|bg-112x64.bmp|0|0|
-%xl|B|vol-0.bmp|12|1|
-%xl|C|vol-1.bmp|12|1|
-%xl|D|vol-2.bmp|12|1|
-%xl|E|vol-3.bmp|12|1|
-%xl|F|vol-4.bmp|12|1|
-%xl|G|vol-5.bmp|12|1|
-%xl|H|vol-6.bmp|12|1|
-%xl|I|vol-7.bmp|12|1|
-%xl|K|vol-8.bmp|12|1|
-%xl|L|vol-9.bmp|12|1|
-%xl|z|vol-10.bmp|12|1|
-%xl|O|r-bat-0.bmp|92|0|
-%xl|P|r-bat-1.bmp|92|0|
-%xl|Q|r-bat-2.bmp|92|0|
-%xl|R|r-bat-3.bmp|92|0|
-%xl|S|r-bat-4.bmp|92|0|
-%xl|T|r-pwr.bmp|92|0|
-%xl|m|r-rpt-all.bmp|0|6|
-%xl|n|r-rpt-one.bmp|0|6|
-%xl|o|r-rpt-shf.bmp|0|6|
-%xl|p|nav-stop.bmp|68|2|
-%xl|q|nav-play.bmp|68|2|
-%xl|r|nav-pause.bmp|68|2|
-%xl|s|nav-ffwd.bmp|68|2|
-%xl|t|nav-rwnd.bmp|68|2|
-%xl|u|shf.bmp|14|6|
+%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
 
 
@@ -33,8 +12,8 @@
 %pb
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdB|%xdC|%xdD|%xdE|%xdF|%xdG|%xdH|%xdI|%xdK|%xdL|%xdz>
-%?bp<%xdT|%?bl<%xdO|%xdP|%xdQ|%xdR|%xdS>>
-%?mm<|%xdm|%xdn|%xdo>
-%?mp<%xdp|%xdq|%xdr|%xds|%xdt>
-%?ps<%xdu|>
+%?pv<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk>
+%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
+%?mm<|%xdCa|%xdCb|%xdCc|%Cd>
+%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
+%?ps<%xdE|>
diff --git a/wps/boxes.128x64x1.wps b/wps/boxes.128x64x1.wps
index 4dc4af2e79..76e339e02c 100644
--- a/wps/boxes.128x64x1.wps
+++ b/wps/boxes.128x64x1.wps
@@ -1,32 +1,11 @@
 %x|a|r-bg.bmp|0|0|
-%xl|B|vol-0.bmp|12|1|
-%xl|C|vol-1.bmp|12|1|
-%xl|D|vol-2.bmp|12|1|
-%xl|E|vol-3.bmp|12|1|
-%xl|F|vol-4.bmp|12|1|
-%xl|G|vol-5.bmp|12|1|
-%xl|H|vol-6.bmp|12|1|
-%xl|I|vol-7.bmp|12|1|
-%xl|K|vol-8.bmp|12|1|
-%xl|L|vol-9.bmp|12|1|
-%xl|z|vol-10.bmp|12|1|
-%xl|O|r-bat-0.bmp|109|0|
-%xl|P|r-bat-1.bmp|109|0|
-%xl|Q|r-bat-2.bmp|109|0|
-%xl|R|r-bat-3.bmp|109|0|
-%xl|S|r-bat-4.bmp|109|0|
-%xl|T|r-pwr.bmp|109|0|
-%xl|m|r-rpt-all.bmp|0|6|
-%xl|n|r-rpt-one.bmp|0|6|
-%xl|o|r-rpt-shf.bmp|0|6|
-%xl|p|nav-stop.bmp|68|2|
-%xl|q|nav-play.bmp|68|2|
-%xl|r|nav-pause.bmp|68|2|
-%xl|s|nav-ffwd.bmp|68|2|
-%xl|t|nav-rwnd.bmp|68|2|
-%xl|u|shf.bmp|14|6|
-%xl|v|lock-m.bmp|86|0|
-%xl|x|lock-r.bmp|98|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
 
 
@@ -35,10 +14,10 @@
 %pb
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdB|%xdC|%xdD|%xdE|%xdF|%xdG|%xdH|%xdI|%xdK|%xdL|%xdz>
-%?bp<%xdT|%?bl<%xdO|%xdP|%xdQ|%xdR|%xdS>>
-%?mm<|%xdm|%xdn|%xdo>
-%?mp<%xdp|%xdq|%xdr|%xds|%xdt>
-%?ps<%xdu|>
-%?mh<%xdv|>
-%?mr<%xdx|>
+%?pv<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk>
+%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
+%?ps<%xdE|>
+%?mh<%xdF|>
+%?mr<%xdG|>
diff --git a/wps/boxes.160x128x1.wps b/wps/boxes.160x128x1.wps
index 5dc5ae32c4..489975a8ee 100644
--- a/wps/boxes.160x128x1.wps
+++ b/wps/boxes.160x128x1.wps
@@ -1,55 +1,14 @@
 %x|a|bg-160x128.bmp|0|0|
-%xl|b|cdc-mp1.bmp|40|70|
-%xl|c|cdc-mp2.bmp|40|70|
-%xl|d|cdc-mp3.bmp|40|70|
-%xl|e|cdc-aiff.bmp|40|70|
-%xl|f|cdc-wav.bmp|40|70|
-%xl|g|cdc-ogg.bmp|40|70|
-%xl|h|cdc-flac.bmp|40|70|
-%xl|i|cdc-mpc.bmp|40|70|
-%xl|j|cdc-a52.bmp|40|70|
-%xl|J|cdc-unk.bmp|40|70|
-%xl|k|enc-vbr.bmp|40|76|
-%xl|l|enc-cbr.bmp|40|76|
-%xl|m|rpt-all.bmp|99|0|
-%xl|n|rpt-one.bmp|99|0|
-%xl|o|rpt-shf.bmp|99|0|
-%xl|p|nav-stop.bmp|68|3|
-%xl|q|nav-play.bmp|68|3|
-%xl|r|nav-pause.bmp|68|3|
-%xl|s|nav-ffwd.bmp|68|3|
-%xl|t|nav-rwnd.bmp|68|3|
-%xl|u|shf.bmp|99|17|
-%xl|v|lock-m.bmp|87|0|
-%xl|x|lock-r.bmp|87|12|
-%xl|B|vol-0.bmp|12|1|
-%xl|C|vol-1.bmp|12|1|
-%xl|D|vol-2.bmp|12|1|
-%xl|E|vol-3.bmp|12|1|
-%xl|F|vol-4.bmp|12|1|
-%xl|G|vol-5.bmp|12|1|
-%xl|H|vol-6.bmp|12|1|
-%xl|I|vol-7.bmp|12|1|
-%xl|K|vol-8.bmp|12|1|
-%xl|L|vol-9.bmp|12|1|
-%xl|z|vol-10.bmp|12|1|
-%xl|O|bat-0.bmp|149|1|
-%xl|P|bat-1.bmp|149|1|
-%xl|Q|bat-2.bmp|149|1|
-%xl|R|bat-3.bmp|149|1|
-%xl|S|bat-4.bmp|149|1|
-%xl|T|pwr.bmp|149|1|
-%xl|A|rtg-0.bmp|91|68|
-%xl|M|rtg-1.bmp|91|68|
-%xl|N|rtg-2.bmp|91|68|
-%xl|U|rtg-3.bmp|91|68|
-%xl|V|rtg-4.bmp|91|68|
-%xl|W|rtg-5.bmp|91|68|
-%xl|X|rtg-6.bmp|91|68|
-%xl|Y|rtg-7.bmp|91|68|
-%xl|Z|rtg-8.bmp|91|68|
-%xl|w|rtg-9.bmp|91|68|
-%xl|y|rtg-10.bmp|91|68|
+%xl|A|codec.bmp|40|70|21|
+%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
 
 
@@ -66,13 +25,13 @@
 
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdB|%xdC|%xdD|%xdE|%xdF|%xdG|%xdH|%xdI|%xdK|%xdL|%xdz>
-%?bp<%xdT|%?bl<%xdO|%xdP|%xdQ|%xdR|%xdS>>
-%?fc<%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi|%xdj|%xdJ>
-%?fv<%xdk|%xdl>
-%?mm<|%xdm|%xdn|%xdo>
-%?mp<%xdp|%xdq|%xdr|%xds|%xdt>
-%?ps<%xdu|>
-%?mh<%xdv|>
-%?mr<%xdx|>
-%?rr<%xdA|%xdM|%xdN|%xdU|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdw|%xdy>
+%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
+%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
+%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>
+%?fv<%xdBa|%xdBb>
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
+%?ps<%xdE|>
+%?mh<%xdF|>
+%?mr<%xdG|>
+%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>
diff --git a/wps/boxes.176x132x16.wps b/wps/boxes.176x132x16.wps
index edc224ecd5..43d5f1d24a 100644
--- a/wps/boxes.176x132x16.wps
+++ b/wps/boxes.176x132x16.wps
@@ -1,55 +1,14 @@
-%x|a|bg-176x132.bmp|0|0|
-%xl|b|cdc-mp1.bmp|40|70|
-%xl|c|cdc-mp2.bmp|40|70|
-%xl|d|cdc-mp3.bmp|40|70|
-%xl|e|cdc-aiff.bmp|40|70|
-%xl|f|cdc-wav.bmp|40|70|
-%xl|g|cdc-ogg.bmp|40|70|
-%xl|h|cdc-flac.bmp|40|70|
-%xl|i|cdc-mpc.bmp|40|70|
-%xl|j|cdc-a52.bmp|40|70|
-%xl|J|cdc-unk.bmp|40|70|
-%xl|k|enc-vbr.bmp|40|76|
-%xl|l|enc-cbr.bmp|40|76|
-%xl|m|rpt-all.bmp|99|0|
-%xl|n|rpt-one.bmp|99|0|
-%xl|o|rpt-shf.bmp|99|0|
-%xl|p|nav-stop.bmp|68|3|
-%xl|q|nav-play-colour.bmp|68|3|
-%xl|r|nav-pause-colour.bmp|68|3|
-%xl|s|nav-ffwd-colour.bmp|68|3|
-%xl|t|nav-rwnd-colour.bmp|68|3|
-%xl|u|shf.bmp|99|17|
-%xl|v|lock-m.bmp|87|0|
-%xl|x|lock-r.bmp|87|12|
-%xl|B|vol-0-colour.bmp|12|1|
-%xl|C|vol-1-colour.bmp|12|1|
-%xl|D|vol-2-colour.bmp|12|1|
-%xl|E|vol-3-colour.bmp|12|1|
-%xl|F|vol-4-colour.bmp|12|1|
-%xl|G|vol-5-colour.bmp|12|1|
-%xl|H|vol-6-colour.bmp|12|1|
-%xl|I|vol-7-colour.bmp|12|1|
-%xl|K|vol-8-colour.bmp|12|1|
-%xl|L|vol-9-colour.bmp|12|1|
-%xl|z|vol-10-colour.bmp|12|1|
-%xl|O|bat-0-colour.bmp|149|1|
-%xl|P|bat-1-colour.bmp|149|1|
-%xl|Q|bat-2-colour.bmp|149|1|
-%xl|R|bat-3-colour.bmp|149|1|
-%xl|S|bat-4-colour.bmp|149|1|
-%xl|T|pwr-colour.bmp|149|1|
-%xl|A|rtg-0.bmp|91|68|
-%xl|M|rtg-1.bmp|91|68|
-%xl|N|rtg-2.bmp|91|68|
-%xl|U|rtg-3.bmp|91|68|
-%xl|V|rtg-4.bmp|91|68|
-%xl|W|rtg-5.bmp|91|68|
-%xl|X|rtg-6.bmp|91|68|
-%xl|Y|rtg-7.bmp|91|68|
-%xl|Z|rtg-8.bmp|91|68|
-%xl|w|rtg-9.bmp|91|68|
-%xl|y|rtg-10.bmp|91|68|
+%X|backdrop-176x132.bmp|
+%xl|A|codec.bmp|40|70|21|
+%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
 
 
@@ -66,13 +25,13 @@
 
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdB|%xdC|%xdD|%xdE|%xdF|%xdG|%xdH|%xdI|%xdK|%xdL|%xdz>
-%?bp<%xdT|%?bl<%xdO|%xdP|%xdQ|%xdR|%xdS>>
-%?fc<%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi|%xdj|%xdJ>
-%?fv<%xdk|%xdl>
-%?mm<|%xdm|%xdn|%xdo>
-%?mp<%xdp|%xdq|%xdr|%xds|%xdt>
-%?ps<%xdu|>
-%?mh<%xdv|>
-%?mr<%xdx|>
-%?rr<%xdA|%xdM|%xdN|%xdU|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdw|%xdy>
+%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
+%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
+%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>
+%?fv<%xdBa|%xdBb>
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
+%?ps<%xdE|>
+%?mh<%xdF|>
+%?mr<%xdG|>
+%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps
index 7cdf1e1109..016fb22ed6 100644
--- a/wps/boxes.220x176x16.wps
+++ b/wps/boxes.220x176x16.wps
@@ -1,48 +1,17 @@
 %X|backdrop-220x176.bmp|
 %P|pb-220.bmp|
-%x|a|frame-220x176.bmp|0|0|
-%xl|b|cdc-mp1.bmp|46|102|
-%xl|c|cdc-mp2.bmp|46|102|
-%xl|d|cdc-mp3.bmp|46|102|
-%xl|e|cdc-aiff.bmp|46|102|
-%xl|f|cdc-wav.bmp|46|102|
-%xl|g|cdc-ogg.bmp|46|102|
-%xl|h|cdc-flac.bmp|46|102|
-%xl|i|cdc-mpc.bmp|46|102|
-%xl|j|cdc-a52.bmp|46|102|
-%xl|J|cdc-unk.bmp|46|102|
-%xl|k|enc-vbr.bmp|46|108|
-%xl|l|enc-cbr.bmp|46|108|
-%xl|m|rpt-all.bmp|130|10|
-%xl|n|rpt-one.bmp|130|10|
-%xl|o|rpt-shf.bmp|130|10|
-%xl|p|nav-stop.bmp|89|11|
-%xl|q|nav-play-colour.bmp|89|11|
-%xl|r|nav-pause-colour.bmp|89|11|
-%xl|s|nav-ffwd-colour.bmp|89|11|
-%xl|t|nav-rwnd-colour.bmp|89|11|
-%xl|u|shf.bmp|130|24|
-%xl|v|lock-m.bmp|110|10|
-%xl|x|lock-r.bmp|110|23|
-%xl|B|vol-0-colour.bmp|18|3|
-%xl|C|vol-1-colour.bmp|18|3|
-%xl|D|vol-2-colour.bmp|18|3|
-%xl|E|vol-3-colour.bmp|18|3|
-%xl|F|vol-4-colour.bmp|18|3|
-%xl|G|vol-5-colour.bmp|18|3|
-%xl|H|vol-6-colour.bmp|18|3|
-%xl|I|vol-7-colour.bmp|18|3|
-%xl|K|vol-8-colour.bmp|18|3|
-%xl|L|vol-9-colour.bmp|18|3|
-%xl|z|vol-10-colour.bmp|18|3|
-%xl|O|bat-0-colour.bmp|204|10|
-%xl|P|bat-1-colour.bmp|204|10|
-%xl|Q|bat-2-colour.bmp|204|10|
-%xl|R|bat-3-colour.bmp|204|10|
-%xl|S|bat-4-colour.bmp|204|10|
-%xl|T|pwr-colour.bmp|210|10|
-%xl|y|led-colour.bmp|192|12|
+%xl|A|codec.bmp|40|102|21|
+%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|000000|B6C6E5|
 %ar%ca, %cb %cd %cH:%cM
 
 
@@ -56,22 +25,22 @@
 
 
 
-   %fbk
+  %fbk
 
-%pb|8|4|215|
+%pb|8|0|208|
 
 
 %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
 
 
 %pm
-%?pv<%xdB|%xdC|%xdD|%xdE|%xdF|%xdG|%xdH|%xdI|%xdK|%xdL|%xdz>
-%?bp<%xdT|%?bl<%xdO|%xdP|%xdQ|%xdR|%xdS>>
-%?fc<%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi|%xdj|%xdJ>
-%?fv<%xdk|%xdl>
-%?mm<|%xdm|%xdn|%xdo>
-%?mp<%xdp|%xdq|%xdr|%xds|%xdt>
-%?ps<%xdu|>
-%?mh<%xdv|>
-%?mr<%xdx|>
-%?lh<%xdy|>
+%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
+%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
+%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>
+%?fv<%xdBa|%xdBb>
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
+%?ps<%xdE|>
+%?mh<%xdF|>
+%?mr<%xdG|>
+%?lh<%xdJ|>
diff --git a/wps/boxes.320x240x16.wps b/wps/boxes.320x240x16.wps
index e29330e21f..46e7c0e5b8 100644
--- a/wps/boxes.320x240x16.wps
+++ b/wps/boxes.320x240x16.wps
@@ -1,55 +1,14 @@
-%x|a|bg-320x240.bmp|0|0|
-%xl|b|cdc-mp1.bmp|40|86|
-%xl|c|cdc-mp2.bmp|40|86|
-%xl|d|cdc-mp3.bmp|40|86|
-%xl|e|cdc-aiff.bmp|40|86|
-%xl|f|cdc-wav.bmp|40|86|
-%xl|g|cdc-ogg.bmp|40|86|
-%xl|h|cdc-flac.bmp|40|86|
-%xl|i|cdc-mpc.bmp|40|86|
-%xl|j|cdc-a52.bmp|40|86|
-%xl|J|cdc-unk.bmp|40|86|
-%xl|k|enc-vbr.bmp|40|92|
-%xl|l|enc-cbr.bmp|40|92|
-%xl|m|rpt-all.bmp|110|1|
-%xl|n|rpt-one.bmp|110|1|
-%xl|o|rpt-shf.bmp|110|1|
-%xl|u|shf.bmp|110|17|
-%xl|p|nav-stop.bmp|83|3|
-%xl|q|nav-play-colour.bmp|83|3|
-%xl|r|nav-pause-colour.bmp|83|3|
-%xl|s|nav-ffwd-colour.bmp|83|3|
-%xl|t|nav-rwnd-colour.bmp|83|3|
-%xl|v|lock-m.bmp|87|0|
-%xl|x|lock-r.bmp|87|12|
-%xl|B|vol-0-colour.bmp|12|1|
-%xl|C|vol-1-colour.bmp|12|1|
-%xl|D|vol-2-colour.bmp|12|1|
-%xl|E|vol-3-colour.bmp|12|1|
-%xl|F|vol-4-colour.bmp|12|1|
-%xl|G|vol-5-colour.bmp|12|1|
-%xl|H|vol-6-colour.bmp|12|1|
-%xl|I|vol-7-colour.bmp|12|1|
-%xl|K|vol-8-colour.bmp|12|1|
-%xl|L|vol-9-colour.bmp|12|1|
-%xl|z|vol-10-colour.bmp|12|1|
-%xl|O|bat-0-colour.bmp|240|1|
-%xl|P|bat-1-colour.bmp|240|1|
-%xl|Q|bat-2-colour.bmp|240|1|
-%xl|R|bat-3-colour.bmp|240|1|
-%xl|S|bat-4-colour.bmp|240|1|
-%xl|T|pwr.bmp-colour|240|1|
-%xl|A|rtg-0.bmp|91|68|
-%xl|M|rtg-1.bmp|91|68|
-%xl|N|rtg-2.bmp|91|68|
-%xl|U|rtg-3.bmp|91|68|
-%xl|V|rtg-4.bmp|91|68|
-%xl|W|rtg-5.bmp|91|68|
-%xl|X|rtg-6.bmp|91|68|
-%xl|Y|rtg-7.bmp|91|68|
-%xl|Z|rtg-8.bmp|91|68|
-%xl|w|rtg-9.bmp|91|68|
-%xl|y|rtg-10.bmp|91|68|
+%X|backdrop-320x240.bmp|
+%xl|A|codec.bmp|40|86|21|
+%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
 
 
@@ -70,13 +29,13 @@
 %ac%s%?It<%It|%Fn>
 %ac%s%?Ia<%Ia|%D2>
 %ac%s%?Id<%Id|%D1>
-%?pv<%xdB|%xdC|%xdD|%xdE|%xdF|%xdG|%xdH|%xdI|%xdK|%xdL|%xdz>
-%?bp<%xdT|%?bl<%xdO|%xdP|%xdQ|%xdR|%xdS>>
-%?fc<%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi|%xdj|%xdJ>
-%?fv<%xdk|%xdl>
-%?mm<|%xdm|%xdn|%xdo>
-%?mp<%xdp|%xdq|%xdr|%xds|%xdt>
-%?ps<%xdu|>
-%?mh<%xdv|>
-%?mr<%xdx|>
-%?rr<%xdA|%xdM|%xdN|%xdU|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdw|%xdy>
+%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
+%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
+%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>
+%?fv<%xdBa|%xdBb>
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%?mp<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>
+%?ps<%xdD|>
+%?mh<%xdF|>
+%?mr<%xdG|>
+%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>
diff --git a/wps/boxes/backdrop-176x132.bmp b/wps/boxes/backdrop-176x132.bmp
new file mode 100644
index 0000000000..ab9a0da6b2
--- /dev/null
+++ b/wps/boxes/backdrop-176x132.bmp
diff --git a/wps/boxes/backdrop-320x240.bmp b/wps/boxes/backdrop-320x240.bmp
new file mode 100644
index 0000000000..fd57d8a6fa
--- /dev/null
+++ b/wps/boxes/backdrop-320x240.bmp
diff --git a/wps/boxes/bat-0-colour.bmp b/wps/boxes/bat-0-colour.bmp
deleted file mode 100644
index 40dbb3c0b9..0000000000
--- a/wps/boxes/bat-0-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-0.bmp b/wps/boxes/bat-0.bmp
deleted file mode 100644
index 3b6832e6c6..0000000000
--- a/wps/boxes/bat-0.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-1-colour.bmp b/wps/boxes/bat-1-colour.bmp
deleted file mode 100644
index ce12a83049..0000000000
--- a/wps/boxes/bat-1-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-1.bmp b/wps/boxes/bat-1.bmp
deleted file mode 100644
index da5f35fa91..0000000000
--- a/wps/boxes/bat-1.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-2-colour.bmp b/wps/boxes/bat-2-colour.bmp
deleted file mode 100644
index 7fd484c783..0000000000
--- a/wps/boxes/bat-2-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-2.bmp b/wps/boxes/bat-2.bmp
deleted file mode 100644
index 9deb3f561c..0000000000
--- a/wps/boxes/bat-2.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-3-colour.bmp b/wps/boxes/bat-3-colour.bmp
deleted file mode 100644
index eccd80ba65..0000000000
--- a/wps/boxes/bat-3-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-3.bmp b/wps/boxes/bat-3.bmp
deleted file mode 100644
index e98e3c35af..0000000000
--- a/wps/boxes/bat-3.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-4-colour.bmp b/wps/boxes/bat-4-colour.bmp
deleted file mode 100644
index 0fe793d0ad..0000000000
--- a/wps/boxes/bat-4-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/bat-4.bmp b/wps/boxes/bat-4.bmp
deleted file mode 100644
index 7f93637ab8..0000000000
--- a/wps/boxes/bat-4.bmp
+++ /dev/null
diff --git a/wps/boxes/battery-colour.bmp b/wps/boxes/battery-colour.bmp
new file mode 100644
index 0000000000..4ececa92d2
--- /dev/null
+++ b/wps/boxes/battery-colour.bmp
diff --git a/wps/boxes/battery-small.bmp b/wps/boxes/battery-small.bmp
new file mode 100644
index 0000000000..084243dcfd
--- /dev/null
+++ b/wps/boxes/battery-small.bmp
diff --git a/wps/boxes/battery.bmp b/wps/boxes/battery.bmp
new file mode 100644
index 0000000000..b9a98e9d04
--- /dev/null
+++ b/wps/boxes/battery.bmp
diff --git a/wps/boxes/bg-112x64.bmp b/wps/boxes/bg-112x64.bmp
index 4cf575b6b5..1056ebb304 100644
--- a/wps/boxes/bg-112x64.bmp
+++ b/wps/boxes/bg-112x64.bmp
diff --git a/wps/boxes/bg-176x132.bmp b/wps/boxes/bg-176x132.bmp
deleted file mode 100644
index 52c4105f5b..0000000000
--- a/wps/boxes/bg-176x132.bmp
+++ /dev/null
diff --git a/wps/boxes/bg-220x176.bmp b/wps/boxes/bg-220x176.bmp
deleted file mode 100644
index 64764b5058..0000000000
--- a/wps/boxes/bg-220x176.bmp
+++ /dev/null
diff --git a/wps/boxes/bg-320x240.bmp b/wps/boxes/bg-320x240.bmp
deleted file mode 100644
index fcbb50ee15..0000000000
--- a/wps/boxes/bg-320x240.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-a52.bmp b/wps/boxes/cdc-a52.bmp
deleted file mode 100644
index 21563b4ee3..0000000000
--- a/wps/boxes/cdc-a52.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-aiff.bmp b/wps/boxes/cdc-aiff.bmp
deleted file mode 100644
index 16bce590ea..0000000000
--- a/wps/boxes/cdc-aiff.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-flac.bmp b/wps/boxes/cdc-flac.bmp
deleted file mode 100644
index 79619c2fb9..0000000000
--- a/wps/boxes/cdc-flac.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-mp1.bmp b/wps/boxes/cdc-mp1.bmp
deleted file mode 100644
index bed53f044d..0000000000
--- a/wps/boxes/cdc-mp1.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-mp2.bmp b/wps/boxes/cdc-mp2.bmp
deleted file mode 100644
index 4c194fc6d9..0000000000
--- a/wps/boxes/cdc-mp2.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-mp3.bmp b/wps/boxes/cdc-mp3.bmp
deleted file mode 100644
index b586ad71fc..0000000000
--- a/wps/boxes/cdc-mp3.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-mpc.bmp b/wps/boxes/cdc-mpc.bmp
deleted file mode 100644
index 292b25f7cb..0000000000
--- a/wps/boxes/cdc-mpc.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-ogg.bmp b/wps/boxes/cdc-ogg.bmp
deleted file mode 100644
index 2801545910..0000000000
--- a/wps/boxes/cdc-ogg.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-unk.bmp b/wps/boxes/cdc-unk.bmp
deleted file mode 100644
index b0d784e8a4..0000000000
--- a/wps/boxes/cdc-unk.bmp
+++ /dev/null
diff --git a/wps/boxes/cdc-wav.bmp b/wps/boxes/cdc-wav.bmp
deleted file mode 100644
index b5765b4610..0000000000
--- a/wps/boxes/cdc-wav.bmp
+++ /dev/null
diff --git a/wps/boxes/codec.bmp b/wps/boxes/codec.bmp
new file mode 100644
index 0000000000..d46ea0e4ae
--- /dev/null
+++ b/wps/boxes/codec.bmp
diff --git a/wps/boxes/enc-cbr.bmp b/wps/boxes/enc-cbr.bmp
deleted file mode 100644
index f7e30fd190..0000000000
--- a/wps/boxes/enc-cbr.bmp
+++ /dev/null
diff --git a/wps/boxes/enc-vbr.bmp b/wps/boxes/enc-vbr.bmp
deleted file mode 100644
index 48b14278e9..0000000000
--- a/wps/boxes/enc-vbr.bmp
+++ /dev/null
diff --git a/wps/boxes/encoding.bmp b/wps/boxes/encoding.bmp
new file mode 100644
index 0000000000..ba48caa81b
--- /dev/null
+++ b/wps/boxes/encoding.bmp
diff --git a/wps/boxes/frame-220x176.bmp b/wps/boxes/frame-220x176.bmp
deleted file mode 100644
index 7d4bad0a84..0000000000
--- a/wps/boxes/frame-220x176.bmp
+++ /dev/null
diff --git a/wps/boxes/led-colour.bmp b/wps/boxes/led-colour.bmp
index af9c4be924..acf9d9347e 100644
--- a/wps/boxes/led-colour.bmp
+++ b/wps/boxes/led-colour.bmp
diff --git a/wps/boxes/nav-ffwd-colour.bmp b/wps/boxes/nav-ffwd-colour.bmp
deleted file mode 100644
index cd17282ec6..0000000000
--- a/wps/boxes/nav-ffwd-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-ffwd.bmp b/wps/boxes/nav-ffwd.bmp
deleted file mode 100644
index 84f921bea1..0000000000
--- a/wps/boxes/nav-ffwd.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-pause-colour.bmp b/wps/boxes/nav-pause-colour.bmp
deleted file mode 100644
index f32acd6b7f..0000000000
--- a/wps/boxes/nav-pause-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-pause.bmp b/wps/boxes/nav-pause.bmp
deleted file mode 100644
index df181b276d..0000000000
--- a/wps/boxes/nav-pause.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-play-colour.bmp b/wps/boxes/nav-play-colour.bmp
deleted file mode 100644
index 9dd8af66f0..0000000000
--- a/wps/boxes/nav-play-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-play.bmp b/wps/boxes/nav-play.bmp
deleted file mode 100644
index 37102f1fcc..0000000000
--- a/wps/boxes/nav-play.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-rwnd-colour.bmp b/wps/boxes/nav-rwnd-colour.bmp
deleted file mode 100644
index ac083f78f6..0000000000
--- a/wps/boxes/nav-rwnd-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-rwnd.bmp b/wps/boxes/nav-rwnd.bmp
deleted file mode 100644
index 4d835600a0..0000000000
--- a/wps/boxes/nav-rwnd.bmp
+++ /dev/null
diff --git a/wps/boxes/nav-stop.bmp b/wps/boxes/nav-stop.bmp
deleted file mode 100644
index 9f6fed92c9..0000000000
--- a/wps/boxes/nav-stop.bmp
+++ /dev/null
diff --git a/wps/boxes/navi-colour.bmp b/wps/boxes/navi-colour.bmp
new file mode 100644
index 0000000000..02b146c46e
--- /dev/null
+++ b/wps/boxes/navi-colour.bmp
diff --git a/wps/boxes/navi.bmp b/wps/boxes/navi.bmp
new file mode 100644
index 0000000000..788852227b
--- /dev/null
+++ b/wps/boxes/navi.bmp
diff --git a/wps/boxes/pb-220.bmp b/wps/boxes/pb-220.bmp
index 23ad635bb2..9260113851 100644
--- a/wps/boxes/pb-220.bmp
+++ b/wps/boxes/pb-220.bmp
diff --git a/wps/boxes/pwr-colour.bmp b/wps/boxes/pwr-colour.bmp
deleted file mode 100644
index 10ec8cdfbd..0000000000
--- a/wps/boxes/pwr-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/pwr.bmp b/wps/boxes/pwr.bmp
deleted file mode 100644
index f316a93d59..0000000000
--- a/wps/boxes/pwr.bmp
+++ /dev/null
diff --git a/wps/boxes/r-bat-0.bmp b/wps/boxes/r-bat-0.bmp
deleted file mode 100644
index 7a9b9eaac6..0000000000
--- a/wps/boxes/r-bat-0.bmp
+++ /dev/null
diff --git a/wps/boxes/r-bat-1.bmp b/wps/boxes/r-bat-1.bmp
deleted file mode 100644
index 1c07ab4b2c..0000000000
--- a/wps/boxes/r-bat-1.bmp
+++ /dev/null
diff --git a/wps/boxes/r-bat-2.bmp b/wps/boxes/r-bat-2.bmp
deleted file mode 100644
index bdd891c986..0000000000
--- a/wps/boxes/r-bat-2.bmp
+++ /dev/null
diff --git a/wps/boxes/r-bat-3.bmp b/wps/boxes/r-bat-3.bmp
deleted file mode 100644
index deae8e90fc..0000000000
--- a/wps/boxes/r-bat-3.bmp
+++ /dev/null
diff --git a/wps/boxes/r-bat-4.bmp b/wps/boxes/r-bat-4.bmp
deleted file mode 100644
index 4f949d2d2b..0000000000
--- a/wps/boxes/r-bat-4.bmp
+++ /dev/null
diff --git a/wps/boxes/r-pwr.bmp b/wps/boxes/r-pwr.bmp
deleted file mode 100644
index 2dba254775..0000000000
--- a/wps/boxes/r-pwr.bmp
+++ /dev/null
diff --git a/wps/boxes/r-rpt-all.bmp b/wps/boxes/r-rpt-all.bmp
deleted file mode 100644
index eac53090fc..0000000000
--- a/wps/boxes/r-rpt-all.bmp
+++ /dev/null
diff --git a/wps/boxes/r-rpt-one.bmp b/wps/boxes/r-rpt-one.bmp
deleted file mode 100644
index 79172c1532..0000000000
--- a/wps/boxes/r-rpt-one.bmp
+++ /dev/null
diff --git a/wps/boxes/r-rpt-shf.bmp b/wps/boxes/r-rpt-shf.bmp
deleted file mode 100644
index 25892020f5..0000000000
--- a/wps/boxes/r-rpt-shf.bmp
+++ /dev/null
diff --git a/wps/boxes/rating-colour.bmp b/wps/boxes/rating-colour.bmp
new file mode 100644
index 0000000000..7c1a806c68
--- /dev/null
+++ b/wps/boxes/rating-colour.bmp
diff --git a/wps/boxes/rating.bmp b/wps/boxes/rating.bmp
new file mode 100644
index 0000000000..d48cd87bcb
--- /dev/null
+++ b/wps/boxes/rating.bmp
diff --git a/wps/boxes/repeat-small.bmp b/wps/boxes/repeat-small.bmp
new file mode 100644
index 0000000000..39f2203cd3
--- /dev/null
+++ b/wps/boxes/repeat-small.bmp
diff --git a/wps/boxes/repeat.bmp b/wps/boxes/repeat.bmp
new file mode 100644
index 0000000000..4b6869620f
--- /dev/null
+++ b/wps/boxes/repeat.bmp
diff --git a/wps/boxes/rpt-all.bmp b/wps/boxes/rpt-all.bmp
deleted file mode 100644
index ee4c67e639..0000000000
--- a/wps/boxes/rpt-all.bmp
+++ /dev/null
diff --git a/wps/boxes/rpt-one.bmp b/wps/boxes/rpt-one.bmp
deleted file mode 100644
index 716506a63f..0000000000
--- a/wps/boxes/rpt-one.bmp
+++ /dev/null
diff --git a/wps/boxes/rpt-shf.bmp b/wps/boxes/rpt-shf.bmp
deleted file mode 100644
index 561cd59be7..0000000000
--- a/wps/boxes/rpt-shf.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-0.bmp b/wps/boxes/rtg-0.bmp
deleted file mode 100644
index b00af0337d..0000000000
--- a/wps/boxes/rtg-0.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-1.bmp b/wps/boxes/rtg-1.bmp
deleted file mode 100644
index d76dcf24d5..0000000000
--- a/wps/boxes/rtg-1.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-10.bmp b/wps/boxes/rtg-10.bmp
deleted file mode 100644
index 2bb547af3d..0000000000
--- a/wps/boxes/rtg-10.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-2.bmp b/wps/boxes/rtg-2.bmp
deleted file mode 100644
index 1f2e09063c..0000000000
--- a/wps/boxes/rtg-2.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-3.bmp b/wps/boxes/rtg-3.bmp
deleted file mode 100644
index d44630e086..0000000000
--- a/wps/boxes/rtg-3.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-4.bmp b/wps/boxes/rtg-4.bmp
deleted file mode 100644
index e4f4ea059b..0000000000
--- a/wps/boxes/rtg-4.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-5.bmp b/wps/boxes/rtg-5.bmp
deleted file mode 100644
index a017952e6e..0000000000
--- a/wps/boxes/rtg-5.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-6.bmp b/wps/boxes/rtg-6.bmp
deleted file mode 100644
index 7c6ff74dca..0000000000
--- a/wps/boxes/rtg-6.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-7.bmp b/wps/boxes/rtg-7.bmp
deleted file mode 100644
index 6f6cc82e4f..0000000000
--- a/wps/boxes/rtg-7.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-8.bmp b/wps/boxes/rtg-8.bmp
deleted file mode 100644
index 86a83f0e29..0000000000
--- a/wps/boxes/rtg-8.bmp
+++ /dev/null
diff --git a/wps/boxes/rtg-9.bmp b/wps/boxes/rtg-9.bmp
deleted file mode 100644
index 1f9086eda4..0000000000
--- a/wps/boxes/rtg-9.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-0-colour.bmp b/wps/boxes/vol-0-colour.bmp
deleted file mode 100644
index 11bddd64b8..0000000000
--- a/wps/boxes/vol-0-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-0.bmp b/wps/boxes/vol-0.bmp
deleted file mode 100644
index 820a6a60f4..0000000000
--- a/wps/boxes/vol-0.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-1-colour.bmp b/wps/boxes/vol-1-colour.bmp
deleted file mode 100644
index 5ac803e142..0000000000
--- a/wps/boxes/vol-1-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-1.bmp b/wps/boxes/vol-1.bmp
deleted file mode 100644
index d55dfe59df..0000000000
--- a/wps/boxes/vol-1.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-10-colour.bmp b/wps/boxes/vol-10-colour.bmp
deleted file mode 100644
index d9805d9935..0000000000
--- a/wps/boxes/vol-10-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-10.bmp b/wps/boxes/vol-10.bmp
deleted file mode 100644
index 8e23927991..0000000000
--- a/wps/boxes/vol-10.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-2-colour.bmp b/wps/boxes/vol-2-colour.bmp
deleted file mode 100644
index ee795126f0..0000000000
--- a/wps/boxes/vol-2-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-2.bmp b/wps/boxes/vol-2.bmp
deleted file mode 100644
index dfac442b51..0000000000
--- a/wps/boxes/vol-2.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-3-colour.bmp b/wps/boxes/vol-3-colour.bmp
deleted file mode 100644
index a807abc0db..0000000000
--- a/wps/boxes/vol-3-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-3.bmp b/wps/boxes/vol-3.bmp
deleted file mode 100644
index ee226a075c..0000000000
--- a/wps/boxes/vol-3.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-4-colour.bmp b/wps/boxes/vol-4-colour.bmp
deleted file mode 100644
index 79b6b9c194..0000000000
--- a/wps/boxes/vol-4-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-4.bmp b/wps/boxes/vol-4.bmp
deleted file mode 100644
index a6203a264a..0000000000
--- a/wps/boxes/vol-4.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-5-colour.bmp b/wps/boxes/vol-5-colour.bmp
deleted file mode 100644
index 374509f927..0000000000
--- a/wps/boxes/vol-5-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-5.bmp b/wps/boxes/vol-5.bmp
deleted file mode 100644
index 17dd85e903..0000000000
--- a/wps/boxes/vol-5.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-6-colour.bmp b/wps/boxes/vol-6-colour.bmp
deleted file mode 100644
index 81cfa23615..0000000000
--- a/wps/boxes/vol-6-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-6.bmp b/wps/boxes/vol-6.bmp
deleted file mode 100644
index f53476ac1c..0000000000
--- a/wps/boxes/vol-6.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-7-colour.bmp b/wps/boxes/vol-7-colour.bmp
deleted file mode 100644
index 07767d756d..0000000000
--- a/wps/boxes/vol-7-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-7.bmp b/wps/boxes/vol-7.bmp
deleted file mode 100644
index 5c702bc097..0000000000
--- a/wps/boxes/vol-7.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-8-colour.bmp b/wps/boxes/vol-8-colour.bmp
deleted file mode 100644
index a86a52b7b1..0000000000
--- a/wps/boxes/vol-8-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-8.bmp b/wps/boxes/vol-8.bmp
deleted file mode 100644
index a714ceaeb1..0000000000
--- a/wps/boxes/vol-8.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-9-colour.bmp b/wps/boxes/vol-9-colour.bmp
deleted file mode 100644
index 50b83b4680..0000000000
--- a/wps/boxes/vol-9-colour.bmp
+++ /dev/null
diff --git a/wps/boxes/vol-9.bmp b/wps/boxes/vol-9.bmp
deleted file mode 100644
index 26ff27c974..0000000000
--- a/wps/boxes/vol-9.bmp
+++ /dev/null
diff --git a/wps/boxes/volume-colour.bmp b/wps/boxes/volume-colour.bmp
new file mode 100644
index 0000000000..edcacf0e6e
--- /dev/null
+++ b/wps/boxes/volume-colour.bmp
diff --git a/wps/boxes/volume.bmp b/wps/boxes/volume.bmp
new file mode 100644
index 0000000000..c3f7a66955
--- /dev/null
+++ b/wps/boxes/volume.bmp