256 files changed, 690 insertions, 169 deletions

diff --git a/wps/.#WPSLIST.1.2 b/wps/.#WPSLIST.1.2
new file mode 100644
index 0000000000..91d38c1ae3
--- /dev/null
+++ b/wps/.#WPSLIST.1.2
@@ -0,0 +1,32 @@
+<wps>
+# Name of the WPS _including_ extension
+Name: ipodVOL.wps
+# Name of the creator of the WPS
+Author: xameius
+# prefered font:
+Font: chicago12.fnt
+# Weather the WPS is designed to have the statusbar present or not
+Statusbar: off
+# The minimum required pixel height for the WPS
+Height: 128
+# The minimum required pixel width for the WPS
+Width: 160
+</wps>
+
+<wps>
+Name: rockbox_default.wps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+Height: 2
+Width: 8
+</wps>
+
+<wps>
+Name: boxes.wps
+Author: Christi Scarborough (after the_engineer)
+Font: rockbox_default.fnt
+Statusbar: off
+Height: 128
+Width: 160
+</wps>
diff --git a/wps/.#WPSLIST.1.24 b/wps/.#WPSLIST.1.24
new file mode 100644
index 0000000000..5422205863
--- /dev/null
+++ b/wps/.#WPSLIST.1.24
@@ -0,0 +1,132 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+# WPSLIST
+#
+# This should list all WPS and RWPS files we have and what their requirements
+# and preferences are.
+#
+# Each <wps> section will also cause a "theme" .cfg to be made, which the
+# <rwps> sections will not cause.
+#
+# A <wps> section can thus mention a "preferred" rwps file to load when that
+# theme is loaded.
+#
+# All sections should list what their smallest LCD size requirements are and
+# 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
+# prefered font:
+Font: nimbus-12.fnt
+# Weather the WPS is designed to have the statusbar present or not
+Statusbar: on
+</wps>
+
+<wps>
+Name: rockbox_default.wps
+RWPS: rockbox_default.rwps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: boxes.wps
+rwps: boxes.rwps
+Author: Christi Scarborough (after Magnus Westerlund)
+Font: rockbox_default.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: engineeer2.wps
+RWPS: engineeer2.rwps
+Author: Magnus Westerlund
+Font: nedore-8.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: iAmp.wps
+RWPS: iAmp.rwps
+Author: Raymond Hoh
+Font: nimbus-12.fnt
+Statusbar: on
+</wps>
+
+<wps>
+Name: zezayer.wps
+RWPS: rockbox_default.rwps
+Author: Jake Owen
+Font: nedore-8.fnt
+Statusbar: on
+</wps>
+
+<rwps>
+Name: rockbox_default.rwps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+</rwps>
+
+<rwps>
+Name: iAmp.rwps
+Author: Raymond Hoh
+Font: nimbus-12.fnt
+Statusbar: on
+</rwps>
+
+<rwps>
+Name: boxes.rwps
+Author: Christi Scarborough
+Font: rockbox_default.fnt
+Statusbar: on
+</rwps>
+
+<rwps>
+Name: engineeer2.rwps
+Author: Magnus Westerlund
+Font: nedore-8.fnt
+Statusbar: on
+</rwps>
+
+<wps>
+Name: marquee.wps
+RWPS: marquee.rwps
+Author: Mike Sobel
+Font: chicago12.fnt
+Statusbar: on
+</wps>
+
+<rwps>
+Name: marquee.rwps
+Author: Mike Sobel
+Font: chicago12.fnt
+Statusbar: on
+</rwps>
+
+<wps>
+Name: DancePuffDuo.wps
+RWPS: DancePuffDuo.rwps
+Author: Chris Oxtoby
+Font: chicago12.fnt
+Statusbar: on
+</wps>
+
+<rwps>
+Name: DancePuffDuo.rwps
+Author: Chris Oxtoby
+Font: chicago12.fnt
+Statusbar: on
+</rwps>
diff --git a/wps/.#WPSLIST.1.5 b/wps/.#WPSLIST.1.5
new file mode 100644
index 0000000000..fd5af01652
--- /dev/null
+++ b/wps/.#WPSLIST.1.5
@@ -0,0 +1,66 @@
+<wps>
+# Name of the WPS _including_ extension
+Name: ipodVOL.wps
+# Name of the creator of the WPS
+Author: xameius
+# prefered font:
+Font: chicago12.fnt
+# Weather the WPS is designed to have the statusbar present or not
+Statusbar: off
+# The minimum required pixel height for the WPS
+Height: 128
+# The minimum required pixel width for the WPS
+Width: 160
+</wps>
+
+<wps>
+Name: rockbox_default.wps
+Author: Rockbox team
+Font: rockbox_default.fnt
+Statusbar: on
+Height: 14
+Width: 55
+</wps>
+
+<wps>
+Name: boxes.wps
+Author: Christi Scarborough (after Magnus Westerlund)
+Font: rockbox_default.fnt
+Statusbar: off
+Height: 128
+Width: 160
+</wps>
+
+<wps>
+# Name of the WPS (_including_ .wps extension)
+Name: engineeer2.wps
+# Real name of the creator of the WPS
+Author: Magnus Westerlund
+# Preferred font (including .fnt extension - leave blank for player):
+Font: Nedore-8.fnt
+# Whether the WPS is designed to have the statusbar on or off
+Statusbar: Off
+# The minimum required pixel height for the WPS
+#  176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player
+Height: 128
+# The minimum required pixel width for the WPS 
+#  220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player
+Width: 160
+</wps>
+
+<wps>
+# Name of the WPS (_including_ .wps extension)
+Name: zezayer.wps
+# Real name of the creator of the WPS
+Author: Jake Owen
+# Preferred font (including .fnt extension - leave blank for player):
+Font: nedore-8.fnt
+# Whether the WPS is designed to have the statusbar on or off
+Statusbar: off
+# The minimum required pixel height for the WPS
+# 176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player
+Height: 128
+# The minimum required pixel width for the WPS 
+# 220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player
+Width: 160
+</wps>
diff --git a/wps/.#wpsbuild.pl.1.9 b/wps/.#wpsbuild.pl.1.9
new file mode 100755
index 0000000000..3ea3ff6c93
--- /dev/null
+++ b/wps/.#wpsbuild.pl.1.9
@@ -0,0 +1,242 @@
+#!/usr/bin/perl
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+
+$ROOT="..";
+
+if($ARGV[0] eq "-r") {
+    $ROOT=$ARGV[1];
+    shift @ARGV;
+    shift @ARGV;    
+}
+
+my $verbose;
+if($ARGV[0] eq "-v") {
+    $verbose =1;
+    shift @ARGV;
+}
+
+my $firmdir="$ROOT/firmware";
+
+my $wpslist=$ARGV[0];
+
+my $target = $ARGV[1];
+my $cppdef = $target;
+
+
+if(!$wpslist) {
+    print "Usage: wpsbuilds.pl <WPSLIST> <target>\n",
+    "Run this script in the root of the target build, and it will put all the\n",
+    "stuff in .rockbox/wps/\n";
+    exit;
+}
+
+sub getlcdsizes {
+    my ($remote) = @_;
+
+    open(GCC, ">gcctemp");
+    if($remote) {
+        # Get the remote LCD screen size
+    print GCC <<STOP
+\#include "config.h"
+#ifdef HAVE_REMOTE_LCD
+Height: LCD_REMOTE_HEIGHT
+Width: LCD_REMOTE_WIDTH
+#endif
+STOP
+;
+    }
+    else {
+    print GCC <<STOP
+\#include "config.h"
+Height: LCD_HEIGHT
+Width: LCD_WIDTH
+STOP
+;
+}
+    close(gcc);
+
+    my $c="cat gcctemp | gcc $cppdef -I. -I$firmdir/export -E -P -";
+
+    #print "CMD $c\n";
+
+    open(GETSIZE, "$c|");
+
+    my ($height, $width);
+    while(<GETSIZE>) {
+        if($_ =~ /^Height: (\d*)/) {
+            $height = $1;
+        }
+        elsif($_ =~ /^Width: (\d*)/) {
+            $width = $1;
+        }
+        if($height && $width) {
+            last;
+        }
+    }
+    close(GETSIZE);
+    unlink("gcctemp");
+
+    return ($height, $width);
+}
+
+sub mkdirs {        
+    my $wpsdir = $wps;
+    $wpsdir =~ s/\.(r|)wps//;
+    mkdir ".rockbox/wps", 0777;
+    mkdir ".rockbox/themes", 0777;
+
+    if( -d ".rockbox/wps/$wpsdir") {
+        #print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n";
+    }
+    else {
+        mkdir ".rockbox/wps/$wpsdir", 0777;
+    }
+}
+
+sub copywps {
+    # we assume that we copy the WPS files from the same dir the WPSLIST
+    # file is located in
+    my $dir;
+
+    if($wpslist =~ /(.*)WPSLIST/) {
+        $dir = $1;
+        my $wpsdir = $wps;
+        $wpsdir =~ s/\.(r|)wps//;
+        system("cp $dir/$wps .rockbox/wps/");
+
+        if (-e "$dir/$wpsdir") {
+           system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/");
+        }
+    }
+    else {
+        print STDERR "beep, no dir to copy WPS from!\n";
+    }
+}
+
+sub buildcfg {
+    my $cfg = $wps;
+    my @out;
+
+    $cfg =~ s/\.(r|)wps/.cfg/;
+
+    push @out, <<MOO
+\#
+\# $cfg generated by wpsbuild.pl
+\# $wps is made by $author
+\#
+wps: /.rockbox/wps/$wps
+MOO
+;
+    if($font) {
+        push @out, "font: /.rockbox/fonts/$font\n";
+    }
+    if($statusbar) {
+        push @out, "statusbar: $statusbar\n";
+    }
+    if($rwps && $has_remote ) {
+        push @out, "rwps: /.rockbox/wps/$rwps\n";
+    }
+
+    if(-f ".rockbox/wps/$cfg") {
+        print STDERR "wpsbuild warning: wps/$cfg already exists!\n";
+    }
+    else {
+        open(CFG, ">.rockbox/themes/$cfg");
+        print CFG @out;
+        close(CFG);
+    }
+}
+
+# Get the LCD sizes first
+my ($main_height, $main_width) = getlcdsizes();
+my ($remote_height, $remote_width) = getlcdsizes(1);
+
+$has_remote = true if ($remote_height && $remote_width);
+
+open(WPS, "<$wpslist");
+while(<WPS>) {
+    my $l = $_;
+    if($l =~ /^ *\#/) {
+        # skip comment
+        next;
+    }
+    if($l =~ /^ *<(r|)wps>/i) {
+        $isrwps = $1;
+        $within = 1;
+        next;
+    }
+    if($within) {
+        if($l =~ /^ *<\/${isrwps}wps>/i) {
+            # Get the required width and height
+            my ($rheight, $rwidth);
+            if($isrwps) {
+                ($rheight, $rwidth) = ($remote_height, $remote_width);
+            }
+            else {
+                ($rheight, $rwidth) = ($main_height, $main_width);
+            }
+
+            if(!$rheight || !$rwidth) {
+                printf STDERR "wpsbuild notice: No %sLCD size, skipping $wps\n",
+                $isrwps?"remote ":"";
+                next;
+            }
+
+            #print "LCD: $wps wants $height x $width\n";
+            #print "LCD: is $rheight x $rwidth\n";
+
+            if(($height <= $rheight) && ($width <= $rwidth)) {
+                #
+                # The target model has an LCD that is suitable for this
+                # WPS
+                #
+                #print "Size requirement is fine!\n";
+
+                mkdirs();
+                if(!$isrwps) {
+                    # We only make .cfg files for <wps> sections:
+                    buildcfg();
+                }
+                copywps();
+            }
+            else {
+                #print "Skip $wps due to size restraints\n";
+            }
+            $within = 0;
+
+            undef $wps, $rwps, $width, $height, $font, $statusbar, $author;
+        }
+        elsif($l =~ /^Name: (.*)/i) {
+            # Note that in the case this is within <rwps>, $wps will contain the
+            # name of the rwps. Use $isrwps to figure out what type it is.
+            $wps = $1;
+        }
+        elsif($l =~ /^RWPS: (.*)/i) {
+            $rwps = $1;
+        }
+        elsif($l =~ /^Author: (.*)/i) {
+            $author = $1;
+        }
+        elsif($l =~ /^Width: (.*)/i) {
+            $width = $1;
+        }
+        elsif($l =~ /^Height: (.*)/i) {
+            $height = $1;
+        }
+        elsif($l =~ /^Font: (.*)/i) {
+            $font = $1;
+        }
+        elsif($l =~ /^Statusbar: (.*)/i) {
+            $statusbar = $1;
+        }
+    }
+}
+
+close(WPS)
diff --git a/wps/DancePuffDuo-220x176/A-B.bmp b/wps/DancePuffDuo-220x176/A-B.bmp
deleted file mode 100644
index 9b1eb18f1a..0000000000
--- a/wps/DancePuffDuo-220x176/A-B.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Bat0.bmp b/wps/DancePuffDuo-220x176/Bat0.bmp
deleted file mode 100644
index 081d685495..0000000000
--- a/wps/DancePuffDuo-220x176/Bat0.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Bat1.bmp b/wps/DancePuffDuo-220x176/Bat1.bmp
deleted file mode 100644
index 9ac1a4a848..0000000000
--- a/wps/DancePuffDuo-220x176/Bat1.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Bat2.bmp b/wps/DancePuffDuo-220x176/Bat2.bmp
deleted file mode 100644
index 1c79136c6c..0000000000
--- a/wps/DancePuffDuo-220x176/Bat2.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Bat3.bmp b/wps/DancePuffDuo-220x176/Bat3.bmp
deleted file mode 100644
index f8f81d16f8..0000000000
--- a/wps/DancePuffDuo-220x176/Bat3.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Bat4.bmp b/wps/DancePuffDuo-220x176/Bat4.bmp
deleted file mode 100644
index c0ea1a47e4..0000000000
--- a/wps/DancePuffDuo-220x176/Bat4.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/DP1.bmp b/wps/DancePuffDuo-220x176/DP1.bmp
deleted file mode 100644
index 16f8cc106c..0000000000
--- a/wps/DancePuffDuo-220x176/DP1.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/DP2.bmp b/wps/DancePuffDuo-220x176/DP2.bmp
deleted file mode 100644
index c36db682a9..0000000000
--- a/wps/DancePuffDuo-220x176/DP2.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/DP3.bmp b/wps/DancePuffDuo-220x176/DP3.bmp
deleted file mode 100644
index 2ab4bfa9c2..0000000000
--- a/wps/DancePuffDuo-220x176/DP3.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/DP4.bmp b/wps/DancePuffDuo-220x176/DP4.bmp
deleted file mode 100644
index 38caf86ff1..0000000000
--- a/wps/DancePuffDuo-220x176/DP4.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/FF.bmp b/wps/DancePuffDuo-220x176/FF.bmp
deleted file mode 100644
index 16dbc12a1c..0000000000
--- a/wps/DancePuffDuo-220x176/FF.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/HoldM.bmp b/wps/DancePuffDuo-220x176/HoldM.bmp
deleted file mode 100644
index 4518a32ffa..0000000000
--- a/wps/DancePuffDuo-220x176/HoldM.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/HoldR.bmp b/wps/DancePuffDuo-220x176/HoldR.bmp
deleted file mode 100644
index 123b065bea..0000000000
--- a/wps/DancePuffDuo-220x176/HoldR.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Ply.bmp b/wps/DancePuffDuo-220x176/Ply.bmp
deleted file mode 100644
index c6746c238b..0000000000
--- a/wps/DancePuffDuo-220x176/Ply.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Pow.bmp b/wps/DancePuffDuo-220x176/Pow.bmp
deleted file mode 100644
index 00887efa72..0000000000
--- a/wps/DancePuffDuo-220x176/Pow.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Pse.bmp b/wps/DancePuffDuo-220x176/Pse.bmp
deleted file mode 100644
index 16566aa187..0000000000
--- a/wps/DancePuffDuo-220x176/Pse.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/RW.bmp b/wps/DancePuffDuo-220x176/RW.bmp
deleted file mode 100644
index e06f384d31..0000000000
--- a/wps/DancePuffDuo-220x176/RW.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat0.bmp b/wps/DancePuffDuo-220x176/Rat0.bmp
deleted file mode 100644
index fadd549971..0000000000
--- a/wps/DancePuffDuo-220x176/Rat0.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat1.bmp b/wps/DancePuffDuo-220x176/Rat1.bmp
deleted file mode 100644
index 6bf555a7f2..0000000000
--- a/wps/DancePuffDuo-220x176/Rat1.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat10.bmp b/wps/DancePuffDuo-220x176/Rat10.bmp
deleted file mode 100644
index ac42b5b98f..0000000000
--- a/wps/DancePuffDuo-220x176/Rat10.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat2.bmp b/wps/DancePuffDuo-220x176/Rat2.bmp
deleted file mode 100644
index 0b0fcc1a42..0000000000
--- a/wps/DancePuffDuo-220x176/Rat2.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat3.bmp b/wps/DancePuffDuo-220x176/Rat3.bmp
deleted file mode 100644
index 8e4e5da72d..0000000000
--- a/wps/DancePuffDuo-220x176/Rat3.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat4.bmp b/wps/DancePuffDuo-220x176/Rat4.bmp
deleted file mode 100644
index d067103c75..0000000000
--- a/wps/DancePuffDuo-220x176/Rat4.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat5.bmp b/wps/DancePuffDuo-220x176/Rat5.bmp
deleted file mode 100644
index 9e1a86849b..0000000000
--- a/wps/DancePuffDuo-220x176/Rat5.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat6.bmp b/wps/DancePuffDuo-220x176/Rat6.bmp
deleted file mode 100644
index 0a1021be69..0000000000
--- a/wps/DancePuffDuo-220x176/Rat6.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat7.bmp b/wps/DancePuffDuo-220x176/Rat7.bmp
deleted file mode 100644
index 3864747cf8..0000000000
--- a/wps/DancePuffDuo-220x176/Rat7.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat8.bmp b/wps/DancePuffDuo-220x176/Rat8.bmp
deleted file mode 100644
index 8ac97395af..0000000000
--- a/wps/DancePuffDuo-220x176/Rat8.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rat9.bmp b/wps/DancePuffDuo-220x176/Rat9.bmp
deleted file mode 100644
index f5857dcef2..0000000000
--- a/wps/DancePuffDuo-220x176/Rat9.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Rpt1.bmp b/wps/DancePuffDuo-220x176/Rpt1.bmp
deleted file mode 100644
index f0dc3c7176..0000000000
--- a/wps/DancePuffDuo-220x176/Rpt1.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/RptA.bmp b/wps/DancePuffDuo-220x176/RptA.bmp
deleted file mode 100644
index b5ac2cadb4..0000000000
--- a/wps/DancePuffDuo-220x176/RptA.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/RptS.bmp b/wps/DancePuffDuo-220x176/RptS.bmp
deleted file mode 100644
index bfcbd8bb10..0000000000
--- a/wps/DancePuffDuo-220x176/RptS.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Shf.bmp b/wps/DancePuffDuo-220x176/Shf.bmp
deleted file mode 100644
index 261332addd..0000000000
--- a/wps/DancePuffDuo-220x176/Shf.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Stp.bmp b/wps/DancePuffDuo-220x176/Stp.bmp
deleted file mode 100644
index 681fc2761a..0000000000
--- a/wps/DancePuffDuo-220x176/Stp.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/Unk.bmp b/wps/DancePuffDuo-220x176/Unk.bmp
deleted file mode 100644
index 04d1842282..0000000000
--- a/wps/DancePuffDuo-220x176/Unk.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/aac.bmp b/wps/DancePuffDuo-220x176/aac.bmp
deleted file mode 100644
index f847a9a339..0000000000
--- a/wps/DancePuffDuo-220x176/aac.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/ac3.bmp b/wps/DancePuffDuo-220x176/ac3.bmp
deleted file mode 100644
index 16ff8cc1c2..0000000000
--- a/wps/DancePuffDuo-220x176/ac3.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/aiff.bmp b/wps/DancePuffDuo-220x176/aiff.bmp
deleted file mode 100644
index 60b0280e0e..0000000000
--- a/wps/DancePuffDuo-220x176/aiff.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/alac.bmp b/wps/DancePuffDuo-220x176/alac.bmp
deleted file mode 100644
index f21dcd5b35..0000000000
--- a/wps/DancePuffDuo-220x176/alac.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/bg.bmp b/wps/DancePuffDuo-220x176/bg.bmp
deleted file mode 100644
index 95d5a5c0d0..0000000000
--- a/wps/DancePuffDuo-220x176/bg.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/flac.bmp b/wps/DancePuffDuo-220x176/flac.bmp
deleted file mode 100644
index 2949da6dbb..0000000000
--- a/wps/DancePuffDuo-220x176/flac.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/mp1.bmp b/wps/DancePuffDuo-220x176/mp1.bmp
deleted file mode 100644
index 19d5be47e5..0000000000
--- a/wps/DancePuffDuo-220x176/mp1.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/mp2.bmp b/wps/DancePuffDuo-220x176/mp2.bmp
deleted file mode 100644
index ee94ee19d8..0000000000
--- a/wps/DancePuffDuo-220x176/mp2.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/mp3.bmp b/wps/DancePuffDuo-220x176/mp3.bmp
deleted file mode 100644
index 7d5e72bc2f..0000000000
--- a/wps/DancePuffDuo-220x176/mp3.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/mpc.bmp b/wps/DancePuffDuo-220x176/mpc.bmp
deleted file mode 100644
index 1121d2c986..0000000000
--- a/wps/DancePuffDuo-220x176/mpc.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/ogg.bmp b/wps/DancePuffDuo-220x176/ogg.bmp
deleted file mode 100644
index 81f61a4b67..0000000000
--- a/wps/DancePuffDuo-220x176/ogg.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/shn.bmp b/wps/DancePuffDuo-220x176/shn.bmp
deleted file mode 100644
index d73ae8ad3c..0000000000
--- a/wps/DancePuffDuo-220x176/shn.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/wav.bmp b/wps/DancePuffDuo-220x176/wav.bmp
deleted file mode 100644
index 3a43f04335..0000000000
--- a/wps/DancePuffDuo-220x176/wav.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo-220x176/wv.bmp b/wps/DancePuffDuo-220x176/wv.bmp
deleted file mode 100644
index e14e5e5877..0000000000
--- a/wps/DancePuffDuo-220x176/wv.bmp
+++ /dev/null
diff --git a/wps/DancePuffDuo.rwps b/wps/DancePuffDuo.128x64x1.wps
index cdda0a1473..ec55bea460 100644
--- a/wps/DancePuffDuo.rwps
+++ b/wps/DancePuffDuo.128x64x1.wps
@@ -29,7 +29,7 @@
 %xl|V|aac.bmp|70|66|
 %xl|W|shn.bmp|70|66|
 %xl|X|aiff.bmp|70|66|
-%xl|Y|unk.bmp|70|66|
+%xl|Y|Unk.bmp|70|66|
 %xl|Z|A-B.bmp|145|0|
 %wd
 %al   %pv%?mh<%xdy|>%?mr<%xdz|>%ac%?mp<%xdb|%xdc|%xdd|%xde|%xdf>%?mm<|%xdg|%xdh|%xdi|%xdZ>%?ps<%xdj|>
diff --git a/wps/DancePuffDuo.wps b/wps/DancePuffDuo.160x128x1.wps
index f56c01134c..f7c890cbff 100644
--- a/wps/DancePuffDuo.wps
+++ b/wps/DancePuffDuo.160x128x1.wps
@@ -48,7 +48,7 @@
 %xl|V|aac.bmp|70|66|
 %xl|W|shn.bmp|70|66|
 %xl|X|aiff.bmp|70|66|
-%xl|Y|unk.bmp|70|66|
+%xl|Y|Unk.bmp|70|66|
 %xl|Z|A-B.bmp|145|0|
 %wd
 %al   %pv%?mh<%xdy|>%?mr<%xdz|>%ac%?mp<%xdb|%xdc|%xdd|%xde|%xdf>%?mm<|%xdg|%xdh|%xdi|%xdZ>%?ps<%xdj|>
diff --git a/wps/DancePuffDuo-220x176.wps b/wps/DancePuffDuo.220x176x1.wps
index a738a90864..be1a7a0a81 100644
--- a/wps/DancePuffDuo-220x176.wps
+++ b/wps/DancePuffDuo.220x176x1.wps
@@ -1,4 +1,4 @@
-%x|a|bg.bmp|0|0|
+%x|a|bg-220x176.bmp|0|0|
 %xl|b|Stp.bmp|102|0|
 %xl|c|Ply.bmp|102|0|
 %xl|d|Pse.bmp|102|0|
@@ -48,7 +48,7 @@
 %xl|V|aac.bmp|100|90|
 %xl|W|shn.bmp|100|90|
 %xl|X|aiff.bmp|100|90|
-%xl|Y|unk.bmp|100|90|
+%xl|Y|Unk.bmp|100|90|
 %xl|Z|A-B.bmp|145|0|
 %wd
 %al   %pv%?mh<%xdy|>%?mr<%xdz|>%ac%?mp<%xdb|%xdc|%xdd|%xde|%xdf>%?mm<|%xdg|%xdh|%xdi|%xdZ>%?ps<%xdj|>
diff --git a/wps/DancePuffDuo/bg-220x176.bmp b/wps/DancePuffDuo/bg-220x176.bmp
new file mode 100644
index 0000000000..8e354c8f09
--- /dev/null
+++ b/wps/DancePuffDuo/bg-220x176.bmp
diff --git a/wps/FILES b/wps/FILES
index 922acd33bd..168db25e5d 100644
--- a/wps/FILES
+++ b/wps/FILES
@@ -1,12 +1,10 @@
 WPSLIST
 *.wps
-*.rwps
 wpsbuild.pl
-ipodVOL/*.bmp
-boxes/*.bmp
-marquee/*.bmp
-DancePuffDuo/*.bmp
-boxes-176x132c/*.bmp
-engineeer2/*.bmp
-iAmp/*.bmp
-zezayer/*.bmp
+ipodVOL.*/*.bmp
+boxes.*/*.bmp
+marquee.*/*.bmp
+DancePuffDuo.*/*.bmp
+engineeer2.*/*.bmp
+iAmp.*/*.bmp
+zezayer.*/*.bmp
diff --git a/wps/WPSLIST b/wps/WPSLIST
index fa95c37c65..5422205863 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -19,7 +19,6 @@
 #
 # All sections should list what their smallest LCD size requirements are and
 # what font and status bar setting they "like".
-#
 
 <wps>
 # Name of the WPS _including_ extension
@@ -32,10 +31,6 @@ Author: xameius
 Font: nimbus-12.fnt
 # Weather the WPS is designed to have the statusbar present or not
 Statusbar: on
-# The minimum required pixel height for the WPS
-Height: 128
-# The minimum required pixel width for the WPS
-Width: 160
 </wps>
 
 <wps>
@@ -44,8 +39,6 @@ RWPS: rockbox_default.rwps
 Author: Rockbox team
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 14
-Width: 55
 </wps>
 
 <wps>
@@ -54,45 +47,6 @@ rwps: boxes.rwps
 Author: Christi Scarborough (after Magnus Westerlund)
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 128
-Width: 160
-</wps>
-
-<wps>
-Name: boxes-176x132c.wps
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 132
-Width: 176
-</wps>
-
-<wps>
-Name: boxes-220x176c.wps
-rwps: boxes.wps
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 176
-Width: 220
-</wps>
-
-<wps>
-Name: boxes-320x240c.wps
-Author: Zakk Roberts (after Christi Scarborough and Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 240
-Width: 320
-</wps>
-
-<wps>
-Name: boxes-112x64.wps
-Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
-Statusbar: on
-Height: 64
-Width: 112
 </wps>
 
 <wps>
@@ -101,8 +55,6 @@ RWPS: engineeer2.rwps
 Author: Magnus Westerlund
 Font: nedore-8.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <wps>
@@ -111,8 +63,6 @@ RWPS: iAmp.rwps
 Author: Raymond Hoh
 Font: nimbus-12.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <wps>
@@ -121,8 +71,6 @@ RWPS: rockbox_default.rwps
 Author: Jake Owen
 Font: nedore-8.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <rwps>
@@ -130,8 +78,6 @@ Name: rockbox_default.rwps
 Author: Rockbox team
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <rwps>
@@ -139,8 +85,6 @@ Name: iAmp.rwps
 Author: Raymond Hoh
 Font: nimbus-12.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <rwps>
@@ -148,8 +92,6 @@ Name: boxes.rwps
 Author: Christi Scarborough
 Font: rockbox_default.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <rwps>
@@ -157,8 +99,6 @@ Name: engineeer2.rwps
 Author: Magnus Westerlund
 Font: nedore-8.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <wps>
@@ -167,8 +107,6 @@ RWPS: marquee.rwps
 Author: Mike Sobel
 Font: chicago12.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <rwps>
@@ -176,28 +114,14 @@ Name: marquee.rwps
 Author: Mike Sobel
 Font: chicago12.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
 
 <wps>
-Name: DancePuffDuo-220x176.wps
-RWPS: DancePuffDuo.rwps
-Author: Chris Oxtoby
-Font: chicago12.fnt
-Statusbar: on
-Height: 176
-Width: 220
-</wps>
-
-<wps>
 Name: DancePuffDuo.wps
 RWPS: DancePuffDuo.rwps
 Author: Chris Oxtoby
 Font: chicago12.fnt
 Statusbar: on
-Height: 128
-Width: 160
 </wps>
 
 <rwps>
@@ -205,6 +129,4 @@ Name: DancePuffDuo.rwps
 Author: Chris Oxtoby
 Font: chicago12.fnt
 Statusbar: on
-Height: 64
-Width: 128
 </rwps>
diff --git a/wps/boxes-112x64/cdc-a52.bmp b/wps/boxes-112x64/cdc-a52.bmp
deleted file mode 100644
index 21563b4ee3..0000000000
--- a/wps/boxes-112x64/cdc-a52.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-flac.bmp b/wps/boxes-112x64/cdc-flac.bmp
deleted file mode 100644
index 79619c2fb9..0000000000
--- a/wps/boxes-112x64/cdc-flac.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-mp1.bmp b/wps/boxes-112x64/cdc-mp1.bmp
deleted file mode 100644
index bed53f044d..0000000000
--- a/wps/boxes-112x64/cdc-mp1.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-mp2.bmp b/wps/boxes-112x64/cdc-mp2.bmp
deleted file mode 100644
index 4c194fc6d9..0000000000
--- a/wps/boxes-112x64/cdc-mp2.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-mp3.bmp b/wps/boxes-112x64/cdc-mp3.bmp
deleted file mode 100644
index b586ad71fc..0000000000
--- a/wps/boxes-112x64/cdc-mp3.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-mpc.bmp b/wps/boxes-112x64/cdc-mpc.bmp
deleted file mode 100644
index 292b25f7cb..0000000000
--- a/wps/boxes-112x64/cdc-mpc.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-ogg.bmp b/wps/boxes-112x64/cdc-ogg.bmp
deleted file mode 100644
index 2801545910..0000000000
--- a/wps/boxes-112x64/cdc-ogg.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-unk.bmp b/wps/boxes-112x64/cdc-unk.bmp
deleted file mode 100644
index b0d784e8a4..0000000000
--- a/wps/boxes-112x64/cdc-unk.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-wav.bmp b/wps/boxes-112x64/cdc-wav.bmp
deleted file mode 100644
index b5765b4610..0000000000
--- a/wps/boxes-112x64/cdc-wav.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/cdc-wpk.bmp b/wps/boxes-112x64/cdc-wpk.bmp
deleted file mode 100644
index 5d0a5fec4e..0000000000
--- a/wps/boxes-112x64/cdc-wpk.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/enc-cbr.bmp b/wps/boxes-112x64/enc-cbr.bmp
deleted file mode 100644
index f7e30fd190..0000000000
--- a/wps/boxes-112x64/enc-cbr.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/enc-vbr.bmp b/wps/boxes-112x64/enc-vbr.bmp
deleted file mode 100644
index 48b14278e9..0000000000
--- a/wps/boxes-112x64/enc-vbr.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/nav-ffwd.bmp b/wps/boxes-112x64/nav-ffwd.bmp
deleted file mode 100644
index 84f921bea1..0000000000
--- a/wps/boxes-112x64/nav-ffwd.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/nav-pause.bmp b/wps/boxes-112x64/nav-pause.bmp
deleted file mode 100644
index df181b276d..0000000000
--- a/wps/boxes-112x64/nav-pause.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/nav-play.bmp b/wps/boxes-112x64/nav-play.bmp
deleted file mode 100644
index 37102f1fcc..0000000000
--- a/wps/boxes-112x64/nav-play.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/nav-rwnd.bmp b/wps/boxes-112x64/nav-rwnd.bmp
deleted file mode 100644
index 4d835600a0..0000000000
--- a/wps/boxes-112x64/nav-rwnd.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/nav-stop.bmp b/wps/boxes-112x64/nav-stop.bmp
deleted file mode 100644
index 9f6fed92c9..0000000000
--- a/wps/boxes-112x64/nav-stop.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-bat-0.bmp b/wps/boxes-112x64/r-bat-0.bmp
deleted file mode 100644
index 7a9b9eaac6..0000000000
--- a/wps/boxes-112x64/r-bat-0.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-bat-1.bmp b/wps/boxes-112x64/r-bat-1.bmp
deleted file mode 100644
index 1c07ab4b2c..0000000000
--- a/wps/boxes-112x64/r-bat-1.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-bat-2.bmp b/wps/boxes-112x64/r-bat-2.bmp
deleted file mode 100644
index bdd891c986..0000000000
--- a/wps/boxes-112x64/r-bat-2.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-bat-3.bmp b/wps/boxes-112x64/r-bat-3.bmp
deleted file mode 100644
index deae8e90fc..0000000000
--- a/wps/boxes-112x64/r-bat-3.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-bat-4.bmp b/wps/boxes-112x64/r-bat-4.bmp
deleted file mode 100644
index 4f949d2d2b..0000000000
--- a/wps/boxes-112x64/r-bat-4.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-pwr.bmp b/wps/boxes-112x64/r-pwr.bmp
deleted file mode 100644
index 2dba254775..0000000000
--- a/wps/boxes-112x64/r-pwr.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-rpt-all.bmp b/wps/boxes-112x64/r-rpt-all.bmp
deleted file mode 100644
index eac53090fc..0000000000
--- a/wps/boxes-112x64/r-rpt-all.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-rpt-one.bmp b/wps/boxes-112x64/r-rpt-one.bmp
deleted file mode 100644
index 79172c1532..0000000000
--- a/wps/boxes-112x64/r-rpt-one.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/r-rpt-shf.bmp b/wps/boxes-112x64/r-rpt-shf.bmp
deleted file mode 100644
index 25892020f5..0000000000
--- a/wps/boxes-112x64/r-rpt-shf.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-0.bmp b/wps/boxes-112x64/rtg-0.bmp
deleted file mode 100644
index b00af0337d..0000000000
--- a/wps/boxes-112x64/rtg-0.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-1.bmp b/wps/boxes-112x64/rtg-1.bmp
deleted file mode 100644
index d76dcf24d5..0000000000
--- a/wps/boxes-112x64/rtg-1.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-10.bmp b/wps/boxes-112x64/rtg-10.bmp
deleted file mode 100644
index 2bb547af3d..0000000000
--- a/wps/boxes-112x64/rtg-10.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-2.bmp b/wps/boxes-112x64/rtg-2.bmp
deleted file mode 100644
index 1f2e09063c..0000000000
--- a/wps/boxes-112x64/rtg-2.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-3.bmp b/wps/boxes-112x64/rtg-3.bmp
deleted file mode 100644
index d44630e086..0000000000
--- a/wps/boxes-112x64/rtg-3.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-4.bmp b/wps/boxes-112x64/rtg-4.bmp
deleted file mode 100644
index e4f4ea059b..0000000000
--- a/wps/boxes-112x64/rtg-4.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-5.bmp b/wps/boxes-112x64/rtg-5.bmp
deleted file mode 100644
index a017952e6e..0000000000
--- a/wps/boxes-112x64/rtg-5.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-6.bmp b/wps/boxes-112x64/rtg-6.bmp
deleted file mode 100644
index 7c6ff74dca..0000000000
--- a/wps/boxes-112x64/rtg-6.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-7.bmp b/wps/boxes-112x64/rtg-7.bmp
deleted file mode 100644
index 6f6cc82e4f..0000000000
--- a/wps/boxes-112x64/rtg-7.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-8.bmp b/wps/boxes-112x64/rtg-8.bmp
deleted file mode 100644
index 86a83f0e29..0000000000
--- a/wps/boxes-112x64/rtg-8.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/rtg-9.bmp b/wps/boxes-112x64/rtg-9.bmp
deleted file mode 100644
index 1f9086eda4..0000000000
--- a/wps/boxes-112x64/rtg-9.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/shf.bmp b/wps/boxes-112x64/shf.bmp
deleted file mode 100644
index 8821ac3fb2..0000000000
--- a/wps/boxes-112x64/shf.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-0.bmp b/wps/boxes-112x64/vol-0.bmp
deleted file mode 100644
index 820a6a60f4..0000000000
--- a/wps/boxes-112x64/vol-0.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-1.bmp b/wps/boxes-112x64/vol-1.bmp
deleted file mode 100644
index d55dfe59df..0000000000
--- a/wps/boxes-112x64/vol-1.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-10.bmp b/wps/boxes-112x64/vol-10.bmp
deleted file mode 100644
index 8e23927991..0000000000
--- a/wps/boxes-112x64/vol-10.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-2.bmp b/wps/boxes-112x64/vol-2.bmp
deleted file mode 100644
index dfac442b51..0000000000
--- a/wps/boxes-112x64/vol-2.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-3.bmp b/wps/boxes-112x64/vol-3.bmp
deleted file mode 100644
index ee226a075c..0000000000
--- a/wps/boxes-112x64/vol-3.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-4.bmp b/wps/boxes-112x64/vol-4.bmp
deleted file mode 100644
index a6203a264a..0000000000
--- a/wps/boxes-112x64/vol-4.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-5.bmp b/wps/boxes-112x64/vol-5.bmp
deleted file mode 100644
index 17dd85e903..0000000000
--- a/wps/boxes-112x64/vol-5.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-6.bmp b/wps/boxes-112x64/vol-6.bmp
deleted file mode 100644
index f53476ac1c..0000000000
--- a/wps/boxes-112x64/vol-6.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-7.bmp b/wps/boxes-112x64/vol-7.bmp
deleted file mode 100644
index 5c702bc097..0000000000
--- a/wps/boxes-112x64/vol-7.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-8.bmp b/wps/boxes-112x64/vol-8.bmp
deleted file mode 100644
index a714ceaeb1..0000000000
--- a/wps/boxes-112x64/vol-8.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64/vol-9.bmp b/wps/boxes-112x64/vol-9.bmp
deleted file mode 100644
index 26ff27c974..0000000000
--- a/wps/boxes-112x64/vol-9.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-a52.bmp b/wps/boxes-176x132c/cdc-a52.bmp
deleted file mode 100644
index 21563b4ee3..0000000000
--- a/wps/boxes-176x132c/cdc-a52.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-flac.bmp b/wps/boxes-176x132c/cdc-flac.bmp
deleted file mode 100644
index 79619c2fb9..0000000000
--- a/wps/boxes-176x132c/cdc-flac.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-mp1.bmp b/wps/boxes-176x132c/cdc-mp1.bmp
deleted file mode 100644
index bed53f044d..0000000000
--- a/wps/boxes-176x132c/cdc-mp1.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-mp2.bmp b/wps/boxes-176x132c/cdc-mp2.bmp
deleted file mode 100644
index 4c194fc6d9..0000000000
--- a/wps/boxes-176x132c/cdc-mp2.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-mp3.bmp b/wps/boxes-176x132c/cdc-mp3.bmp
deleted file mode 100644
index b586ad71fc..0000000000
--- a/wps/boxes-176x132c/cdc-mp3.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-mpc.bmp b/wps/boxes-176x132c/cdc-mpc.bmp
deleted file mode 100644
index 292b25f7cb..0000000000
--- a/wps/boxes-176x132c/cdc-mpc.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-ogg.bmp b/wps/boxes-176x132c/cdc-ogg.bmp
deleted file mode 100644
index 2801545910..0000000000
--- a/wps/boxes-176x132c/cdc-ogg.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-unk.bmp b/wps/boxes-176x132c/cdc-unk.bmp
deleted file mode 100644
index b0d784e8a4..0000000000
--- a/wps/boxes-176x132c/cdc-unk.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-wav.bmp b/wps/boxes-176x132c/cdc-wav.bmp
deleted file mode 100644
index b5765b4610..0000000000
--- a/wps/boxes-176x132c/cdc-wav.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/cdc-wpk.bmp b/wps/boxes-176x132c/cdc-wpk.bmp
deleted file mode 100644
index 5d0a5fec4e..0000000000
--- a/wps/boxes-176x132c/cdc-wpk.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/enc-cbr.bmp b/wps/boxes-176x132c/enc-cbr.bmp
deleted file mode 100644
index f7e30fd190..0000000000
--- a/wps/boxes-176x132c/enc-cbr.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/enc-vbr.bmp b/wps/boxes-176x132c/enc-vbr.bmp
deleted file mode 100644
index 48b14278e9..0000000000
--- a/wps/boxes-176x132c/enc-vbr.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/lock-m.bmp b/wps/boxes-176x132c/lock-m.bmp
deleted file mode 100644
index d0355546a3..0000000000
--- a/wps/boxes-176x132c/lock-m.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/lock-r.bmp b/wps/boxes-176x132c/lock-r.bmp
deleted file mode 100644
index 43eae6adb9..0000000000
--- a/wps/boxes-176x132c/lock-r.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/nav-stop.bmp b/wps/boxes-176x132c/nav-stop.bmp
deleted file mode 100644
index 9f6fed92c9..0000000000
--- a/wps/boxes-176x132c/nav-stop.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rpt-all.bmp b/wps/boxes-176x132c/rpt-all.bmp
deleted file mode 100644
index ee4c67e639..0000000000
--- a/wps/boxes-176x132c/rpt-all.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rpt-one.bmp b/wps/boxes-176x132c/rpt-one.bmp
deleted file mode 100644
index 716506a63f..0000000000
--- a/wps/boxes-176x132c/rpt-one.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rpt-shf.bmp b/wps/boxes-176x132c/rpt-shf.bmp
deleted file mode 100644
index 561cd59be7..0000000000
--- a/wps/boxes-176x132c/rpt-shf.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-0.bmp b/wps/boxes-176x132c/rtg-0.bmp
deleted file mode 100644
index b00af0337d..0000000000
--- a/wps/boxes-176x132c/rtg-0.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-1.bmp b/wps/boxes-176x132c/rtg-1.bmp
deleted file mode 100644
index d76dcf24d5..0000000000
--- a/wps/boxes-176x132c/rtg-1.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-10.bmp b/wps/boxes-176x132c/rtg-10.bmp
deleted file mode 100644
index 2bb547af3d..0000000000
--- a/wps/boxes-176x132c/rtg-10.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-2.bmp b/wps/boxes-176x132c/rtg-2.bmp
deleted file mode 100644
index 1f2e09063c..0000000000
--- a/wps/boxes-176x132c/rtg-2.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-3.bmp b/wps/boxes-176x132c/rtg-3.bmp
deleted file mode 100644
index d44630e086..0000000000
--- a/wps/boxes-176x132c/rtg-3.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-4.bmp b/wps/boxes-176x132c/rtg-4.bmp
deleted file mode 100644
index e4f4ea059b..0000000000
--- a/wps/boxes-176x132c/rtg-4.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-5.bmp b/wps/boxes-176x132c/rtg-5.bmp
deleted file mode 100644
index a017952e6e..0000000000
--- a/wps/boxes-176x132c/rtg-5.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-6.bmp b/wps/boxes-176x132c/rtg-6.bmp
deleted file mode 100644
index 7c6ff74dca..0000000000
--- a/wps/boxes-176x132c/rtg-6.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-7.bmp b/wps/boxes-176x132c/rtg-7.bmp
deleted file mode 100644
index 6f6cc82e4f..0000000000
--- a/wps/boxes-176x132c/rtg-7.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-8.bmp b/wps/boxes-176x132c/rtg-8.bmp
deleted file mode 100644
index 86a83f0e29..0000000000
--- a/wps/boxes-176x132c/rtg-8.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/rtg-9.bmp b/wps/boxes-176x132c/rtg-9.bmp
deleted file mode 100644
index 1f9086eda4..0000000000
--- a/wps/boxes-176x132c/rtg-9.bmp
+++ /dev/null
diff --git a/wps/boxes-176x132c/shf.bmp b/wps/boxes-176x132c/shf.bmp
deleted file mode 100644
index 8821ac3fb2..0000000000
--- a/wps/boxes-176x132c/shf.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/bat-0.bmp b/wps/boxes-220x176c/bat-0.bmp
deleted file mode 100644
index 40dbb3c0b9..0000000000
--- a/wps/boxes-220x176c/bat-0.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/bat-1.bmp b/wps/boxes-220x176c/bat-1.bmp
deleted file mode 100644
index ce12a83049..0000000000
--- a/wps/boxes-220x176c/bat-1.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/bat-2.bmp b/wps/boxes-220x176c/bat-2.bmp
deleted file mode 100644
index 7fd484c783..0000000000
--- a/wps/boxes-220x176c/bat-2.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/bat-3.bmp b/wps/boxes-220x176c/bat-3.bmp
deleted file mode 100644
index eccd80ba65..0000000000
--- a/wps/boxes-220x176c/bat-3.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/bat-4.bmp b/wps/boxes-220x176c/bat-4.bmp
deleted file mode 100644
index 0fe793d0ad..0000000000
--- a/wps/boxes-220x176c/bat-4.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-a52.bmp b/wps/boxes-220x176c/cdc-a52.bmp
deleted file mode 100644
index 21563b4ee3..0000000000
--- a/wps/boxes-220x176c/cdc-a52.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-flac.bmp b/wps/boxes-220x176c/cdc-flac.bmp
deleted file mode 100644
index 79619c2fb9..0000000000
--- a/wps/boxes-220x176c/cdc-flac.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-mp1.bmp b/wps/boxes-220x176c/cdc-mp1.bmp
deleted file mode 100644
index bed53f044d..0000000000
--- a/wps/boxes-220x176c/cdc-mp1.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-mp2.bmp b/wps/boxes-220x176c/cdc-mp2.bmp
deleted file mode 100644
index 4c194fc6d9..0000000000
--- a/wps/boxes-220x176c/cdc-mp2.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-mp3.bmp b/wps/boxes-220x176c/cdc-mp3.bmp
deleted file mode 100644
index b586ad71fc..0000000000
--- a/wps/boxes-220x176c/cdc-mp3.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-mpc.bmp b/wps/boxes-220x176c/cdc-mpc.bmp
deleted file mode 100644
index 292b25f7cb..0000000000
--- a/wps/boxes-220x176c/cdc-mpc.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-ogg.bmp b/wps/boxes-220x176c/cdc-ogg.bmp
deleted file mode 100644
index 2801545910..0000000000
--- a/wps/boxes-220x176c/cdc-ogg.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-unk.bmp b/wps/boxes-220x176c/cdc-unk.bmp
deleted file mode 100644
index b0d784e8a4..0000000000
--- a/wps/boxes-220x176c/cdc-unk.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-wav.bmp b/wps/boxes-220x176c/cdc-wav.bmp
deleted file mode 100644
index b5765b4610..0000000000
--- a/wps/boxes-220x176c/cdc-wav.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/cdc-wpk.bmp b/wps/boxes-220x176c/cdc-wpk.bmp
deleted file mode 100644
index 5d0a5fec4e..0000000000
--- a/wps/boxes-220x176c/cdc-wpk.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/enc-cbr.bmp b/wps/boxes-220x176c/enc-cbr.bmp
deleted file mode 100644
index f7e30fd190..0000000000
--- a/wps/boxes-220x176c/enc-cbr.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/enc-vbr.bmp b/wps/boxes-220x176c/enc-vbr.bmp
deleted file mode 100644
index 48b14278e9..0000000000
--- a/wps/boxes-220x176c/enc-vbr.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/lock-m.bmp b/wps/boxes-220x176c/lock-m.bmp
deleted file mode 100644
index d0355546a3..0000000000
--- a/wps/boxes-220x176c/lock-m.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/lock-r.bmp b/wps/boxes-220x176c/lock-r.bmp
deleted file mode 100644
index 43eae6adb9..0000000000
--- a/wps/boxes-220x176c/lock-r.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/nav-ffwd.bmp b/wps/boxes-220x176c/nav-ffwd.bmp
deleted file mode 100644
index cd17282ec6..0000000000
--- a/wps/boxes-220x176c/nav-ffwd.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/nav-pause.bmp b/wps/boxes-220x176c/nav-pause.bmp
deleted file mode 100644
index f32acd6b7f..0000000000
--- a/wps/boxes-220x176c/nav-pause.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/nav-play.bmp b/wps/boxes-220x176c/nav-play.bmp
deleted file mode 100644
index 9dd8af66f0..0000000000
--- a/wps/boxes-220x176c/nav-play.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/nav-rwnd.bmp b/wps/boxes-220x176c/nav-rwnd.bmp
deleted file mode 100644
index ac083f78f6..0000000000
--- a/wps/boxes-220x176c/nav-rwnd.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/nav-stop.bmp b/wps/boxes-220x176c/nav-stop.bmp
deleted file mode 100644
index 9f6fed92c9..0000000000
--- a/wps/boxes-220x176c/nav-stop.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/pwr.bmp b/wps/boxes-220x176c/pwr.bmp
deleted file mode 100644
index 10ec8cdfbd..0000000000
--- a/wps/boxes-220x176c/pwr.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/shf.bmp b/wps/boxes-220x176c/shf.bmp
deleted file mode 100644
index 8821ac3fb2..0000000000
--- a/wps/boxes-220x176c/shf.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-0.bmp b/wps/boxes-220x176c/vol-0.bmp
deleted file mode 100644
index 11bddd64b8..0000000000
--- a/wps/boxes-220x176c/vol-0.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-1.bmp b/wps/boxes-220x176c/vol-1.bmp
deleted file mode 100644
index 5ac803e142..0000000000
--- a/wps/boxes-220x176c/vol-1.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-10.bmp b/wps/boxes-220x176c/vol-10.bmp
deleted file mode 100644
index d9805d9935..0000000000
--- a/wps/boxes-220x176c/vol-10.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-2.bmp b/wps/boxes-220x176c/vol-2.bmp
deleted file mode 100644
index ee795126f0..0000000000
--- a/wps/boxes-220x176c/vol-2.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-3.bmp b/wps/boxes-220x176c/vol-3.bmp
deleted file mode 100644
index a807abc0db..0000000000
--- a/wps/boxes-220x176c/vol-3.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-4.bmp b/wps/boxes-220x176c/vol-4.bmp
deleted file mode 100644
index 79b6b9c194..0000000000
--- a/wps/boxes-220x176c/vol-4.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-5.bmp b/wps/boxes-220x176c/vol-5.bmp
deleted file mode 100644
index 374509f927..0000000000
--- a/wps/boxes-220x176c/vol-5.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-6.bmp b/wps/boxes-220x176c/vol-6.bmp
deleted file mode 100644
index 81cfa23615..0000000000
--- a/wps/boxes-220x176c/vol-6.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-7.bmp b/wps/boxes-220x176c/vol-7.bmp
deleted file mode 100644
index 07767d756d..0000000000
--- a/wps/boxes-220x176c/vol-7.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-8.bmp b/wps/boxes-220x176c/vol-8.bmp
deleted file mode 100644
index a86a52b7b1..0000000000
--- a/wps/boxes-220x176c/vol-8.bmp
+++ /dev/null
diff --git a/wps/boxes-220x176c/vol-9.bmp b/wps/boxes-220x176c/vol-9.bmp
deleted file mode 100644
index 50b83b4680..0000000000
--- a/wps/boxes-220x176c/vol-9.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/bat-0.bmp b/wps/boxes-320x240c/bat-0.bmp
deleted file mode 100644
index 40dbb3c0b9..0000000000
--- a/wps/boxes-320x240c/bat-0.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/bat-1.bmp b/wps/boxes-320x240c/bat-1.bmp
deleted file mode 100644
index ce12a83049..0000000000
--- a/wps/boxes-320x240c/bat-1.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/bat-2.bmp b/wps/boxes-320x240c/bat-2.bmp
deleted file mode 100644
index 7fd484c783..0000000000
--- a/wps/boxes-320x240c/bat-2.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/bat-3.bmp b/wps/boxes-320x240c/bat-3.bmp
deleted file mode 100644
index eccd80ba65..0000000000
--- a/wps/boxes-320x240c/bat-3.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/bat-4.bmp b/wps/boxes-320x240c/bat-4.bmp
deleted file mode 100644
index 0fe793d0ad..0000000000
--- a/wps/boxes-320x240c/bat-4.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-a52.bmp b/wps/boxes-320x240c/cdc-a52.bmp
deleted file mode 100644
index 21563b4ee3..0000000000
--- a/wps/boxes-320x240c/cdc-a52.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-flac.bmp b/wps/boxes-320x240c/cdc-flac.bmp
deleted file mode 100644
index 79619c2fb9..0000000000
--- a/wps/boxes-320x240c/cdc-flac.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-mp1.bmp b/wps/boxes-320x240c/cdc-mp1.bmp
deleted file mode 100644
index bed53f044d..0000000000
--- a/wps/boxes-320x240c/cdc-mp1.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-mp2.bmp b/wps/boxes-320x240c/cdc-mp2.bmp
deleted file mode 100644
index 4c194fc6d9..0000000000
--- a/wps/boxes-320x240c/cdc-mp2.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-mp3.bmp b/wps/boxes-320x240c/cdc-mp3.bmp
deleted file mode 100644
index b586ad71fc..0000000000
--- a/wps/boxes-320x240c/cdc-mp3.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-mpc.bmp b/wps/boxes-320x240c/cdc-mpc.bmp
deleted file mode 100644
index 292b25f7cb..0000000000
--- a/wps/boxes-320x240c/cdc-mpc.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-ogg.bmp b/wps/boxes-320x240c/cdc-ogg.bmp
deleted file mode 100644
index 2801545910..0000000000
--- a/wps/boxes-320x240c/cdc-ogg.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-unk.bmp b/wps/boxes-320x240c/cdc-unk.bmp
deleted file mode 100644
index b0d784e8a4..0000000000
--- a/wps/boxes-320x240c/cdc-unk.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-wav.bmp b/wps/boxes-320x240c/cdc-wav.bmp
deleted file mode 100644
index b5765b4610..0000000000
--- a/wps/boxes-320x240c/cdc-wav.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/cdc-wpk.bmp b/wps/boxes-320x240c/cdc-wpk.bmp
deleted file mode 100644
index 5d0a5fec4e..0000000000
--- a/wps/boxes-320x240c/cdc-wpk.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/enc-cbr.bmp b/wps/boxes-320x240c/enc-cbr.bmp
deleted file mode 100644
index f7e30fd190..0000000000
--- a/wps/boxes-320x240c/enc-cbr.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/enc-vbr.bmp b/wps/boxes-320x240c/enc-vbr.bmp
deleted file mode 100644
index 48b14278e9..0000000000
--- a/wps/boxes-320x240c/enc-vbr.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/lock-m.bmp b/wps/boxes-320x240c/lock-m.bmp
deleted file mode 100644
index d0355546a3..0000000000
--- a/wps/boxes-320x240c/lock-m.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/lock-r.bmp b/wps/boxes-320x240c/lock-r.bmp
deleted file mode 100644
index 43eae6adb9..0000000000
--- a/wps/boxes-320x240c/lock-r.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/nav-ffwd.bmp b/wps/boxes-320x240c/nav-ffwd.bmp
deleted file mode 100644
index cd17282ec6..0000000000
--- a/wps/boxes-320x240c/nav-ffwd.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/nav-pause.bmp b/wps/boxes-320x240c/nav-pause.bmp
deleted file mode 100644
index f32acd6b7f..0000000000
--- a/wps/boxes-320x240c/nav-pause.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/nav-play.bmp b/wps/boxes-320x240c/nav-play.bmp
deleted file mode 100644
index 9dd8af66f0..0000000000
--- a/wps/boxes-320x240c/nav-play.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/nav-rwnd.bmp b/wps/boxes-320x240c/nav-rwnd.bmp
deleted file mode 100644
index ac083f78f6..0000000000
--- a/wps/boxes-320x240c/nav-rwnd.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/nav-stop.bmp b/wps/boxes-320x240c/nav-stop.bmp
deleted file mode 100644
index 9f6fed92c9..0000000000
--- a/wps/boxes-320x240c/nav-stop.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/pwr.bmp b/wps/boxes-320x240c/pwr.bmp
deleted file mode 100644
index 10ec8cdfbd..0000000000
--- a/wps/boxes-320x240c/pwr.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/shf.bmp b/wps/boxes-320x240c/shf.bmp
deleted file mode 100644
index 8821ac3fb2..0000000000
--- a/wps/boxes-320x240c/shf.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-0.bmp b/wps/boxes-320x240c/vol-0.bmp
deleted file mode 100644
index 11bddd64b8..0000000000
--- a/wps/boxes-320x240c/vol-0.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-1.bmp b/wps/boxes-320x240c/vol-1.bmp
deleted file mode 100644
index 5ac803e142..0000000000
--- a/wps/boxes-320x240c/vol-1.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-10.bmp b/wps/boxes-320x240c/vol-10.bmp
deleted file mode 100644
index d9805d9935..0000000000
--- a/wps/boxes-320x240c/vol-10.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-2.bmp b/wps/boxes-320x240c/vol-2.bmp
deleted file mode 100644
index ee795126f0..0000000000
--- a/wps/boxes-320x240c/vol-2.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-3.bmp b/wps/boxes-320x240c/vol-3.bmp
deleted file mode 100644
index a807abc0db..0000000000
--- a/wps/boxes-320x240c/vol-3.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-4.bmp b/wps/boxes-320x240c/vol-4.bmp
deleted file mode 100644
index 79b6b9c194..0000000000
--- a/wps/boxes-320x240c/vol-4.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-5.bmp b/wps/boxes-320x240c/vol-5.bmp
deleted file mode 100644
index 374509f927..0000000000
--- a/wps/boxes-320x240c/vol-5.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-6.bmp b/wps/boxes-320x240c/vol-6.bmp
deleted file mode 100644
index 81cfa23615..0000000000
--- a/wps/boxes-320x240c/vol-6.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-7.bmp b/wps/boxes-320x240c/vol-7.bmp
deleted file mode 100644
index 07767d756d..0000000000
--- a/wps/boxes-320x240c/vol-7.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-8.bmp b/wps/boxes-320x240c/vol-8.bmp
deleted file mode 100644
index a86a52b7b1..0000000000
--- a/wps/boxes-320x240c/vol-8.bmp
+++ /dev/null
diff --git a/wps/boxes-320x240c/vol-9.bmp b/wps/boxes-320x240c/vol-9.bmp
deleted file mode 100644
index 50b83b4680..0000000000
--- a/wps/boxes-320x240c/vol-9.bmp
+++ /dev/null
diff --git a/wps/boxes-112x64.wps b/wps/boxes.112x64x1.wps
index d3be2eb5d2..cd56a6dee7 100644
--- a/wps/boxes-112x64.wps
+++ b/wps/boxes.112x64x1.wps
@@ -1,4 +1,4 @@
-%x|a|r-bg.bmp|0|0|
+%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|
diff --git a/wps/boxes.rwps b/wps/boxes.128x64x1.wps
index aad8a42cc8..aad8a42cc8 100644
--- a/wps/boxes.rwps
+++ b/wps/boxes.128x64x1.wps
diff --git a/wps/boxes.wps b/wps/boxes.160x128x1.wps
index cbed6cdefd..651e3e777b 100755..100644
--- a/wps/boxes.wps
+++ b/wps/boxes.160x128x1.wps
@@ -1,4 +1,4 @@
-%x|a|bg.bmp|0|0|
+%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|
diff --git a/wps/boxes-176x132c.wps b/wps/boxes.176x132x16.wps
index cbed6cdefd..de7dadf4db 100644
--- a/wps/boxes-176x132c.wps
+++ b/wps/boxes.176x132x16.wps
@@ -1,4 +1,4 @@
-%x|a|bg.bmp|0|0|
+%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|
@@ -15,30 +15,30 @@
 %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|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.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|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|
diff --git a/wps/boxes-220x176c.wps b/wps/boxes.220x176x16.wps
index cbed6cdefd..0bee07225e 100644
--- a/wps/boxes-220x176c.wps
+++ b/wps/boxes.220x176x16.wps
@@ -1,4 +1,4 @@
-%x|a|bg.bmp|0|0|
+%x|a|bg-220x176.bmp|0|0|
 %xl|b|cdc-mp1.bmp|40|70|
 %xl|c|cdc-mp2.bmp|40|70|
 %xl|d|cdc-mp3.bmp|40|70|
@@ -15,30 +15,30 @@
 %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|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.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|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|
diff --git a/wps/boxes.320x240x16.wps b/wps/boxes.320x240x16.wps
new file mode 100644
index 0000000000..49a09c67f5
--- /dev/null
+++ b/wps/boxes.320x240x16.wps
@@ -0,0 +1,82 @@
+%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-wav.bmp|40|86|
+%xl|f|cdc-ogg.bmp|40|86|
+%xl|g|cdc-flac.bmp|40|86|
+%xl|h|cdc-mpc.bmp|40|86|
+%xl|i|cdc-a52.bmp|40|86|
+%xl|j|cdc-wpk.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|
+%wd
+
+
+
+
+%ac%s%?it<%it|%fn>
+%ac%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
+%ac%s%?id<%id|%?d1<%d1|(Unknown Album)>>
+
+%acTrack %pp of %pe
+%ac%pc / %pt (-%pr)
+
+ %fbk    
+
+%pb
+
+
+%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>
diff --git a/wps/boxes-176x132c/bat-0.bmp b/wps/boxes/bat-0-colour.bmp
index 40dbb3c0b9..40dbb3c0b9 100644
--- a/wps/boxes-176x132c/bat-0.bmp
+++ b/wps/boxes/bat-0-colour.bmp
diff --git a/wps/boxes-176x132c/bat-1.bmp b/wps/boxes/bat-1-colour.bmp
index ce12a83049..ce12a83049 100644
--- a/wps/boxes-176x132c/bat-1.bmp
+++ b/wps/boxes/bat-1-colour.bmp
diff --git a/wps/boxes-176x132c/bat-2.bmp b/wps/boxes/bat-2-colour.bmp
index 7fd484c783..7fd484c783 100644
--- a/wps/boxes-176x132c/bat-2.bmp
+++ b/wps/boxes/bat-2-colour.bmp
diff --git a/wps/boxes-176x132c/bat-3.bmp b/wps/boxes/bat-3-colour.bmp
index eccd80ba65..eccd80ba65 100644
--- a/wps/boxes-176x132c/bat-3.bmp
+++ b/wps/boxes/bat-3-colour.bmp
diff --git a/wps/boxes-176x132c/bat-4.bmp b/wps/boxes/bat-4-colour.bmp
index 0fe793d0ad..0fe793d0ad 100644
--- a/wps/boxes-176x132c/bat-4.bmp
+++ b/wps/boxes/bat-4-colour.bmp
diff --git a/wps/boxes-112x64/r-bg.bmp b/wps/boxes/bg-112x64.bmp
index 4cf575b6b5..4cf575b6b5 100644
--- a/wps/boxes-112x64/r-bg.bmp
+++ b/wps/boxes/bg-112x64.bmp
diff --git a/wps/boxes/bg.bmp b/wps/boxes/bg-160x128.bmp
index b9a3d2be81..b9a3d2be81 100644
--- a/wps/boxes/bg.bmp
+++ b/wps/boxes/bg-160x128.bmp
diff --git a/wps/boxes-176x132c/bg.bmp b/wps/boxes/bg-176x132.bmp
index 52c4105f5b..394ab67567 100644
--- a/wps/boxes-176x132c/bg.bmp
+++ b/wps/boxes/bg-176x132.bmp
diff --git a/wps/boxes-220x176c/bg.bmp b/wps/boxes/bg-220x176.bmp
index 64764b5058..da3b3ca7ce 100644
--- a/wps/boxes-220x176c/bg.bmp
+++ b/wps/boxes/bg-220x176.bmp
diff --git a/wps/boxes/bg-320x240.bmp b/wps/boxes/bg-320x240.bmp
new file mode 100644
index 0000000000..e1e4f6b7b9
--- /dev/null
+++ b/wps/boxes/bg-320x240.bmp
diff --git a/wps/boxes-176x132c/nav-ffwd.bmp b/wps/boxes/nav-ffwd-colour.bmp
index cd17282ec6..cd17282ec6 100644
--- a/wps/boxes-176x132c/nav-ffwd.bmp
+++ b/wps/boxes/nav-ffwd-colour.bmp
diff --git a/wps/boxes-176x132c/nav-pause.bmp b/wps/boxes/nav-pause-colour.bmp
index f32acd6b7f..f32acd6b7f 100644
--- a/wps/boxes-176x132c/nav-pause.bmp
+++ b/wps/boxes/nav-pause-colour.bmp
diff --git a/wps/boxes-176x132c/nav-play.bmp b/wps/boxes/nav-play-colour.bmp
index 9dd8af66f0..9dd8af66f0 100644
--- a/wps/boxes-176x132c/nav-play.bmp
+++ b/wps/boxes/nav-play-colour.bmp
diff --git a/wps/boxes-176x132c/nav-rwnd.bmp b/wps/boxes/nav-rwnd-colour.bmp
index ac083f78f6..ac083f78f6 100644
--- a/wps/boxes-176x132c/nav-rwnd.bmp
+++ b/wps/boxes/nav-rwnd-colour.bmp
diff --git a/wps/boxes-176x132c/pwr.bmp b/wps/boxes/pwr-colour.bmp
index 10ec8cdfbd..10ec8cdfbd 100644
--- a/wps/boxes-176x132c/pwr.bmp
+++ b/wps/boxes/pwr-colour.bmp
diff --git a/wps/boxes-176x132c/vol-0.bmp b/wps/boxes/vol-0-colour.bmp
index 11bddd64b8..11bddd64b8 100644
--- a/wps/boxes-176x132c/vol-0.bmp
+++ b/wps/boxes/vol-0-colour.bmp
diff --git a/wps/boxes-176x132c/vol-1.bmp b/wps/boxes/vol-1-colour.bmp
index 5ac803e142..5ac803e142 100644
--- a/wps/boxes-176x132c/vol-1.bmp
+++ b/wps/boxes/vol-1-colour.bmp
diff --git a/wps/boxes-176x132c/vol-10.bmp b/wps/boxes/vol-10-colour.bmp
index d9805d9935..d9805d9935 100644
--- a/wps/boxes-176x132c/vol-10.bmp
+++ b/wps/boxes/vol-10-colour.bmp
diff --git a/wps/boxes-176x132c/vol-2.bmp b/wps/boxes/vol-2-colour.bmp
index ee795126f0..ee795126f0 100644
--- a/wps/boxes-176x132c/vol-2.bmp
+++ b/wps/boxes/vol-2-colour.bmp
diff --git a/wps/boxes-176x132c/vol-3.bmp b/wps/boxes/vol-3-colour.bmp
index a807abc0db..a807abc0db 100644
--- a/wps/boxes-176x132c/vol-3.bmp
+++ b/wps/boxes/vol-3-colour.bmp
diff --git a/wps/boxes-176x132c/vol-4.bmp b/wps/boxes/vol-4-colour.bmp
index 79b6b9c194..79b6b9c194 100644
--- a/wps/boxes-176x132c/vol-4.bmp
+++ b/wps/boxes/vol-4-colour.bmp
diff --git a/wps/boxes-176x132c/vol-5.bmp b/wps/boxes/vol-5-colour.bmp
index 374509f927..374509f927 100644
--- a/wps/boxes-176x132c/vol-5.bmp
+++ b/wps/boxes/vol-5-colour.bmp
diff --git a/wps/boxes-176x132c/vol-6.bmp b/wps/boxes/vol-6-colour.bmp
index 81cfa23615..81cfa23615 100644
--- a/wps/boxes-176x132c/vol-6.bmp
+++ b/wps/boxes/vol-6-colour.bmp
diff --git a/wps/boxes-176x132c/vol-7.bmp b/wps/boxes/vol-7-colour.bmp
index 07767d756d..07767d756d 100644
--- a/wps/boxes-176x132c/vol-7.bmp
+++ b/wps/boxes/vol-7-colour.bmp
diff --git a/wps/boxes-176x132c/vol-8.bmp b/wps/boxes/vol-8-colour.bmp
index a86a52b7b1..a86a52b7b1 100644
--- a/wps/boxes-176x132c/vol-8.bmp
+++ b/wps/boxes/vol-8-colour.bmp
diff --git a/wps/boxes-176x132c/vol-9.bmp b/wps/boxes/vol-9-colour.bmp
index 50b83b4680..50b83b4680 100644
--- a/wps/boxes-176x132c/vol-9.bmp
+++ b/wps/boxes/vol-9-colour.bmp
diff --git a/wps/engineeer2.rwps b/wps/engineeer2.128x64x1.wps
index b512597f46..c9002d8787 100644
--- a/wps/engineeer2.rwps
+++ b/wps/engineeer2.128x64x1.wps
@@ -14,7 +14,7 @@
 %xl|n|rpt_all.bmp|41|1|
 %xl|o|rpt_one.bmp|41|1|
 %xl|p|rpt_shf.bmp|41|1|
-%xl|q|mode_stop_r.bmp|6|12|
+%xl|q|mode_pause_r.bmp|6|12|
 %xl|r|mode_play_r.bmp|6|12|
 %xl|s|mode_pause_r.bmp|6|12|
 %xl|t|mode_ffwd_r.bmp|6|12|
@@ -53,4 +53,4 @@
 %?mp<%xdq|%xdr|%xds|%xdt|%xdu>
 %?ps<%xdN|>
 %?mh<%xdv|>
-%?mr<%xdw|>
\ No newline at end of file
+%?mr<%xdw|>
diff --git a/wps/engineeer2.wps b/wps/engineeer2.160x128x1.wps
index 532a04d508..532a04d508 100644
--- a/wps/engineeer2.wps
+++ b/wps/engineeer2.160x128x1.wps
diff --git a/wps/iAmp.rwps b/wps/iAmp.128x64x1.wps
index db48b820c6..db48b820c6 100644
--- a/wps/iAmp.rwps
+++ b/wps/iAmp.128x64x1.wps
diff --git a/wps/iAmp.wps b/wps/iAmp.160x128x1.wps
index 94c5156280..2299a13c53 100644
--- a/wps/iAmp.wps
+++ b/wps/iAmp.160x128x1.wps
@@ -36,7 +36,7 @@
 %?mp<|%xdn|%xdm|%xde|%xdt>
 %?mp<|%xdn|%xdJ|%xdI|%xdK>
 %xl|u|sh.bmp|90|1|
-%xl|o|re&sh.bmp|90|1|
+%xl|o|re+sh.bmp|90|1|
 %xl|p|re.bmp|90|1|
 %xl|r|re1.bmp|90|1|
 %xl|s|resh.bmp|90|1|
diff --git a/wps/iAmp/re&sh.bmp b/wps/iAmp/re+sh.bmp
index bb1f47fde4..bb1f47fde4 100644
--- a/wps/iAmp/re&sh.bmp
+++ b/wps/iAmp/re+sh.bmp
diff --git a/wps/iAmp/re1&sh.bmp b/wps/iAmp/re1+sh.bmp
index b0ff47d4b9..b0ff47d4b9 100644
--- a/wps/iAmp/re1&sh.bmp
+++ b/wps/iAmp/re1+sh.bmp
diff --git a/wps/ipodVOL.wps b/wps/ipodVOL.160x128x1.wps
index aac676c615..aac676c615 100644
--- a/wps/ipodVOL.wps
+++ b/wps/ipodVOL.160x128x1.wps
diff --git a/wps/marquee.rwps b/wps/marquee.128x64x1.wps
index cd2fe50dbb..cd2fe50dbb 100644
--- a/wps/marquee.rwps
+++ b/wps/marquee.128x64x1.wps
diff --git a/wps/marquee.wps b/wps/marquee.160x128x1.wps
index 161aec9d70..c3bd0e96d9 100644
--- a/wps/marquee.wps
+++ b/wps/marquee.160x128x1.wps
@@ -1,7 +1,7 @@
 # Marquee full information WPS, with Rockbox status bar
 # for use with Chicago12 font
 #
-%x|a|iRiver-Rockbox.bmp|0|0|
+%x|a|iriver-rockbox.bmp|0|0|
 
 
 %ac %?pn<%t10%s%pn|%?ia<%s%ia|%s%d2>> ;%ac %?pn<%?ia<%t10%s%ia|%t10%s%d2>|%t0> 
@@ -11,4 +11,4 @@
 %x|b|pb.bmp|128|77|
 %al %pc%ac%pp/%pe%ar%pt 
 %t5%ac%fb %fc %?fv<vbr|>;%t5%ac%s genre: %?ig<%ig|unknown> ;%t10%ac%s %?It<up: %It/|%?Fn<up: %Fn/|%fb%fc%?fv<vbr|>>>%?Id<%Id|%D1> 
-%pm
\ No newline at end of file
+%pm
diff --git a/wps/rockbox_default.rwps b/wps/rockbox_default.txt.wps
index b1427cab84..b1427cab84 100644
--- a/wps/rockbox_default.rwps
+++ b/wps/rockbox_default.txt.wps
diff --git a/wps/rockbox_default.wps b/wps/rockbox_default.wps
deleted file mode 100644
index b1427cab84..0000000000
--- a/wps/rockbox_default.wps
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dummy file to allow Rockbox to reset to the default WPS config.
-# Do not edit this file.  It's never actually loaded by Rockbox.
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 548b46974f..9d2f122227 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -28,7 +28,7 @@ my $wpslist=$ARGV[0];
 
 my $target = $ARGV[1];
 my $cppdef = $target;
-
+my @depthlist = ( 16, 8, 4, 2, 1 );
 
 if(!$wpslist) {
     print "Usage: wpsbuilds.pl <WPSLIST> <target>\n",
@@ -48,6 +48,7 @@ sub getlcdsizes {
 #ifdef HAVE_REMOTE_LCD
 Height: LCD_REMOTE_HEIGHT
 Width: LCD_REMOTE_WIDTH
+Depth: LCD_REMOTE_DEPTH
 #endif
 STOP
 ;
@@ -58,6 +59,7 @@ STOP
 #ifdef HAVE_LCD_BITMAP
 Height: LCD_HEIGHT
 Width: LCD_WIDTH
+Depth: LCD_DEPTH
 #endif
 STOP
 ;
@@ -78,14 +80,17 @@ STOP
         elsif($_ =~ /^Width: (\d*)/) {
             $width = $1;
         }
-        if($height && $width) {
+        elsif($_ =~ /^Depth: (\d*)/) {
+            $depth = $1;
+        }
+        if($height && $width && $depth) {
             last;
         }
     }
     close(GETSIZE);
     unlink("gcctemp");
 
-    return ($height, $width);
+    return ($height, $width, $depth);
 }
 
 sub mkdirs {        
@@ -97,8 +102,9 @@ sub mkdirs {
     if( -d ".rockbox/wps/$wpsdir") {
         #print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n";
     }
-    else {
-        mkdir ".rockbox/wps/$wpsdir", 0777;
+    else
+    {
+       mkdir ".rockbox/wps/$wpsdir", 0777;
     }
 }
 
@@ -106,19 +112,40 @@ sub copywps {
     # we assume that we copy the WPS files from the same dir the WPSLIST
     # file is located in
     my $dir;
+    my @filelist;
+    my $file;
 
     if($wpslist =~ /(.*)WPSLIST/) {
         $dir = $1;
-        my $wpsdir = $wps;
-        $wpsdir =~ s/\.(r|)wps//;
-        system("cp $dir/$wps .rockbox/wps/");
+#        system("cp $dir/$wps .rockbox/wps/");
+        # print "$req_t_wps $req_g_wps\n";
 
-        if (-e "$dir/$wpsdir") {
-           system("cp $dir/$wpsdir/*.bmp .rockbox/wps/$wpsdir/");
-        }
-    }
-    else {
-        print STDERR "beep, no dir to copy WPS from!\n";
+        if (-e "$dir/$req_t_wps" ) {
+            system("cp $dir/$req_t_wps .rockbox/wps/$wps");
+
+        } elsif (-e "$dir/$req_g_wps") {
+            system("cp $dir/$req_g_wps .rockbox/wps/$wps");
+
+           open(WPSFILE, "$dir/$req_g_wps");
+           while (<WPSFILE>) {
+              $filelist[$#filelist + 1] = $1 if (/\|([^|]*?.bmp)\|/);
+           }
+           close(WPSFILE);
+
+           if (-e "$dir/$wpsdir") {
+              foreach $file (@filelist) {
+                  system("cp $dir/$wps_prefix/$file .rockbox/wps/$wps_prefix/");
+              }
+           } 
+           else {
+               print STDERR "beep, no dir to copy WPS from!\n";
+           }
+         
+       } else {
+           print STDERR "Skipping $wps - no matching resolution.\n";
+       }
+    } else {
+        print STDERR "No source directory!\n";
     }
 }
 
@@ -157,10 +184,11 @@ MOO
 }
 
 # Get the LCD sizes first
-my ($main_height, $main_width) = getlcdsizes();
-my ($remote_height, $remote_width) = getlcdsizes(1);
+my ($main_height, $main_width, $main_depth) = getlcdsizes();
+my ($remote_height, $remote_width, $remote_depth) = getlcdsizes(1);
 
-$has_remote = true if ($remote_height && $remote_width);
+#print "LCD: ${main_height}x${main_width}x${main_depth}\n";
+$has_remote = true if ($remote_height && $remote_width && remote_depth);
 
 open(WPS, "<$wpslist");
 while(<WPS>) {
@@ -174,23 +202,28 @@ while(<WPS>) {
         $within = 1;
         # undef is a unary operator (!)
         undef $wps;
+        undef $wps_prefix;
         undef $rwps;
         undef $width; 
         undef $height;
         undef $font;
         undef $statusbar;
         undef $author;
+        undef $req_g_wps;
+        undef $req_t_wps;
         next;
     }
     if($within) {
         if($l =~ /^ *<\/${isrwps}wps>/i) {
             # Get the required width and height
-            my ($rheight, $rwidth);
+            my ($rheight, $rwidth, $rdepth);
             if($isrwps) {
-                ($rheight, $rwidth) = ($remote_height, $remote_width);
+                ($rheight, $rwidth, $rdepth) = 
+                         ($remote_height, $remote_width, $remote_depth);
             }
             else {
-                ($rheight, $rwidth) = ($main_height, $main_width);
+                ($rheight, $rwidth, $rdepth) = 
+                         ($main_height, $main_width, $main_depth);
             }
 
             if(!$rheight || !$rwidth) {
@@ -199,17 +232,30 @@ while(<WPS>) {
                 $within = 0;
                 next;
             }
+            $wpslist =~ /(.*)WPSLIST/;
+            my $wpsdir = $1;
+            # If this WPS installable on this platform, one of the following
+            # two files will be present
+            foreach $d (@depthlist) {
+                next if ($d > $rdepth); 
+
+                $req_g_wps = $wps_prefix . "." .  $rwidth . "x" . $rheight
+                     . "x" . $d . ".wps";
+                last if (-e "$wpsdir/$req_g_wps"); 
+            } 
+            $req_t_wps = $wps_prefix . ".txt" . ".wps";
 
             #print "LCD: $wps wants $height x $width\n";
             #print "LCD: is $rheight x $rwidth\n";
 
-            if(($height <= $rheight) && ($width <= $rwidth)) {
+            #print "gwps: $wpsdir/$req_g_wps" . "\n";
+            if (-e "$wpsdir/$req_g_wps" || -e "$wpsdir/$req_t_wps" ) { 
                 #
                 # The target model has an LCD that is suitable for this
                 # WPS
                 #
                 #print "Size requirement is fine!\n";
-                mkdirs();
+                mkdirs() if (-e "$wpsdir/$req_g_wps");
                 if(!$isrwps) {
                     # We only make .cfg files for <wps> sections:
                     buildcfg();
@@ -217,14 +263,17 @@ while(<WPS>) {
                 copywps();
             }
             else {
-                #print "Skip $wps due to size restraints\n";
+                #print "(${wps_prefix}-${rwidth}x${rheight}x$rdepth) "; 
+                print "Skip $wps due to size restraints\n";
             }
             $within = 0;
         }
         elsif($l =~ /^Name: (.*)/i) {
             # Note that in the case this is within <rwps>, $wps will contain the
             # name of the rwps. Use $isrwps to figure out what type it is.
-            $wps = $1;
+            $wps = $wps_prefix = $1;
+            $wps_prefix =~ s/\.(r|)wps//;
+            # print $wps_prefix . "\n";
         }
         elsif($l =~ /^RWPS: (.*)/i) {
             $rwps = $1;
@@ -247,4 +296,4 @@ while(<WPS>) {
     }
 }
 
-close(WPS)
+close(WPS);
diff --git a/wps/zezayer.wps b/wps/zezayer.160x128x1.wps
index f83f03ba7c..f83f03ba7c 100644
--- a/wps/zezayer.wps
+++ b/wps/zezayer.160x128x1.wps