diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps
index f615d83eee..e803918020 100644
--- a/wps/Rockboxed.138x110x2.wps
+++ b/wps/Rockboxed.138x110x2.wps
@@ -2,37 +2,38 @@
 # License: GNU GPL v2 or later.
 %wd
 %X|bg-138x110x2.bmp|0|0|
-%xl|p|ply-mono-big.bmp|68|91|
-%xl|q|ps-mono-big.bmp|68|91|
-%xl|f|ff-mono-big.bmp|68|91|
-%xl|r|rw-mono-big.bmp|68|91|
-%xl|b|sl-mono-medium.bmp|35|91|
-%xl|A|v01-mono-big.bmp|15|91|
-%xl|B|v02-mono-big.bmp|17|91|
-%xl|C|v03-mono-big.bmp|19|91|
-%xl|D|v04-mono-big.bmp|21|91|
-%xl|E|v05-mono-big.bmp|23|91|
-%xl|F|v06-mono-big.bmp|25|91|
-%xl|G|v07-mono-big.bmp|27|91|
-%xl|H|v08-mono-big.bmp|29|91|
-%xl|I|v11-mono-big.bmp|31|91|
-%xl|Z|n-mono-medium.bmp|129|95|
-%xl|Y|n-mono-medium.bmp|127|95|
-%xl|X|n-mono-medium.bmp|125|95|
-%xl|W|n-mono-medium.bmp|123|95|
-%xl|V|n-mono-medium.bmp|121|95|
-%xl|U|n-mono-medium.bmp|119|95|
-%xl|T|n-mono-medium.bmp|117|95|
-%xl|S|n-mono-medium.bmp|115|95|
-%xl|R|n-mono-medium.bmp|113|95|
-%xl|Q|n-mono-medium.bmp|111|95|
-%xl|P|l-mono-medium.bmp|113|95|
-%xl|O|l-mono-medium.bmp|111|95|
-%xl|z|ra-mono-medium.bmp|51|91|
-%xl|y|ro-mono-medium.bmp|51|91|
-%xl|x|rs-mono-medium.bmp|51|91|
-%xl|w|rab-mono-medium.bmp|51|91|
-%xl|h|hd-mono-big.bmp|88|90|
+%P|pg-grey-118.bmp|
+%xl|p|ply-grey-big.bmp|68|91|
+%xl|q|ps-grey-big.bmp|68|91|
+%xl|f|ff-grey-big.bmp|68|91|
+%xl|r|rw-grey-big.bmp|68|91|
+%xl|b|sl-grey-medium.bmp|35|91|
+%xl|A|v01-grey-big.bmp|15|91|
+%xl|B|v02-grey-big.bmp|17|91|
+%xl|C|v03-grey-big.bmp|19|91|
+%xl|D|v04-grey-big.bmp|21|91|
+%xl|E|v05-grey-big.bmp|23|91|
+%xl|F|v06-grey-big.bmp|25|91|
+%xl|G|v07-grey-big.bmp|27|91|
+%xl|H|v08-grey-big.bmp|29|91|
+%xl|I|v11-grey-big.bmp|31|91|
+%xl|Z|n-grey-medium.bmp|129|95|
+%xl|Y|n-grey-medium.bmp|127|95|
+%xl|X|n-grey-medium.bmp|125|95|
+%xl|W|n-grey-medium.bmp|123|95|
+%xl|V|n-grey-medium.bmp|121|95|
+%xl|U|n-grey-medium.bmp|119|95|
+%xl|T|n-grey-medium.bmp|117|95|
+%xl|S|n-grey-medium.bmp|115|95|
+%xl|R|n-grey-medium.bmp|113|95|
+%xl|Q|n-grey-medium.bmp|111|95|
+%xl|P|l-grey-medium.bmp|113|95|
+%xl|O|l-grey-medium.bmp|111|95|
+%xl|z|ra-grey-medium.bmp|51|91|
+%xl|y|ro-grey-medium.bmp|51|91|
+%xl|x|rs-grey-medium.bmp|51|91|
+%xl|w|rab-grey-medium.bmp|51|91|
+%xl|h|hd-grey-big.bmp|88|90|
 
 %al %s%ac%?ia<%ia|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps
index b371cfaf29..8b6df8c5e0 100644
--- a/wps/Rockboxed.160x128x2.wps
+++ b/wps/Rockboxed.160x128x2.wps
@@ -2,37 +2,38 @@
 # License: GNU GPL v2 or later.
 %wd
 %X|bg-160x128x2.bmp|0|0|
-%xl|p|ply-mono-big.bmp|72|109|
-%xl|q|ps-mono-big.bmp|72|109|
-%xl|f|ff-mono-big.bmp|72|109|
-%xl|r|rw-mono-big.bmp|72|109|
-%xl|b|sl-mono-big.bmp|36|109|
-%xl|A|v01-mono-big.bmp|15|109|
-%xl|B|v02-mono-big.bmp|17|109|
-%xl|C|v03-mono-big.bmp|19|109|
-%xl|D|v04-mono-big.bmp|21|109|
-%xl|E|v05-mono-big.bmp|23|109|
-%xl|F|v06-mono-big.bmp|25|109|
-%xl|G|v07-mono-big.bmp|27|109|
-%xl|H|v08-mono-big.bmp|29|109|
-%xl|I|v11-mono-big.bmp|31|109|
-%xl|Z|n-mono-big.bmp|150|113|
-%xl|Y|n-mono-big.bmp|147|113|
-%xl|X|n-mono-big.bmp|144|113|
-%xl|W|n-mono-big.bmp|141|113|
-%xl|V|n-mono-big.bmp|138|113|
-%xl|U|n-mono-big.bmp|135|113|
-%xl|T|n-mono-big.bmp|132|113|
-%xl|S|n-mono-big.bmp|129|113|
-%xl|R|n-mono-big.bmp|126|113|
-%xl|Q|n-mono-big.bmp|123|113|
-%xl|P|l-mono-big.bmp|126|113|
-%xl|O|l-mono-big.bmp|123|113|
-%xl|z|ra-mono-big.bmp|53|109|
-%xl|y|ro-mono-big.bmp|53|109|
-%xl|x|rs-mono-big.bmp|53|109|
-%xl|w|rab-mono-big.bmp|53|109|
-%xl|h|hd-mono-big.bmp|95|108|
+%P|pg-grey-140.bmp|
+%xl|p|ply-grey-big.bmp|72|109|
+%xl|q|ps-grey-big.bmp|72|109|
+%xl|f|ff-grey-big.bmp|72|109|
+%xl|r|rw-grey-big.bmp|72|109|
+%xl|b|sl-grey-big.bmp|36|109|
+%xl|A|v01-grey-big.bmp|15|109|
+%xl|B|v02-grey-big.bmp|17|109|
+%xl|C|v03-grey-big.bmp|19|109|
+%xl|D|v04-grey-big.bmp|21|109|
+%xl|E|v05-grey-big.bmp|23|109|
+%xl|F|v06-grey-big.bmp|25|109|
+%xl|G|v07-grey-big.bmp|27|109|
+%xl|H|v08-grey-big.bmp|29|109|
+%xl|I|v11-grey-big.bmp|31|109|
+%xl|Z|n-grey-big.bmp|150|113|
+%xl|Y|n-grey-big.bmp|147|113|
+%xl|X|n-grey-big.bmp|144|113|
+%xl|W|n-grey-big.bmp|141|113|
+%xl|V|n-grey-big.bmp|138|113|
+%xl|U|n-grey-big.bmp|135|113|
+%xl|T|n-grey-big.bmp|132|113|
+%xl|S|n-grey-big.bmp|129|113|
+%xl|R|n-grey-big.bmp|126|113|
+%xl|Q|n-grey-big.bmp|123|113|
+%xl|P|l-grey-big.bmp|126|113|
+%xl|O|l-grey-big.bmp|123|113|
+%xl|z|ra-grey-big.bmp|53|109|
+%xl|y|ro-grey-big.bmp|53|109|
+%xl|x|rs-grey-big.bmp|53|109|
+%xl|w|rab-grey-big.bmp|53|109|
+%xl|h|hd-grey-big.bmp|95|108|
 
 %al %s%ac%?ia<%ia|%d2>%ar 
 %al %s%ac%?id<%id|%d1>%ar 
diff --git a/wps/Rockboxed/bg-138x110x2.bmp b/wps/Rockboxed/bg-138x110x2.bmp
index 271bec35d8..d9d9c8db25 100644
Binary files a/wps/Rockboxed/bg-138x110x2.bmp and b/wps/Rockboxed/bg-138x110x2.bmp differ
diff --git a/wps/Rockboxed/bg-160x128x2.bmp b/wps/Rockboxed/bg-160x128x2.bmp
index 790d58aaca..9b1d34b67d 100644
Binary files a/wps/Rockboxed/bg-160x128x2.bmp and b/wps/Rockboxed/bg-160x128x2.bmp differ
diff --git a/wps/Rockboxed/bt08-mono-small.bmp b/wps/Rockboxed/bt08-mono-small.bmp
index 11123c3fc6..136b1e420c 100644
Binary files a/wps/Rockboxed/bt08-mono-small.bmp and b/wps/Rockboxed/bt08-mono-small.bmp differ
diff --git a/wps/Rockboxed/ff-mono-big.bmp b/wps/Rockboxed/ff-grey-big.bmp
similarity index 80%
rename from wps/Rockboxed/ff-mono-big.bmp
rename to wps/Rockboxed/ff-grey-big.bmp
index 3798c01c52..44d94f20ca 100644
Binary files a/wps/Rockboxed/ff-mono-big.bmp and b/wps/Rockboxed/ff-grey-big.bmp differ
diff --git a/wps/Rockboxed/hd-mono-big.bmp b/wps/Rockboxed/hd-grey-big.bmp
similarity index 80%
rename from wps/Rockboxed/hd-mono-big.bmp
rename to wps/Rockboxed/hd-grey-big.bmp
index 5a997515a4..8f48489e8a 100644
Binary files a/wps/Rockboxed/hd-mono-big.bmp and b/wps/Rockboxed/hd-grey-big.bmp differ
diff --git a/wps/Rockboxed/l-mono-big.bmp b/wps/Rockboxed/l-grey-big.bmp
similarity index 95%
rename from wps/Rockboxed/l-mono-big.bmp
rename to wps/Rockboxed/l-grey-big.bmp
index 5a2c84d97b..cc007edbf6 100644
Binary files a/wps/Rockboxed/l-mono-big.bmp and b/wps/Rockboxed/l-grey-big.bmp differ
diff --git a/wps/Rockboxed/n-mono-medium.bmp b/wps/Rockboxed/l-grey-medium.bmp
similarity index 95%
rename from wps/Rockboxed/n-mono-medium.bmp
rename to wps/Rockboxed/l-grey-medium.bmp
index a6823ed7a0..6042d5aa91 100644
Binary files a/wps/Rockboxed/n-mono-medium.bmp and b/wps/Rockboxed/l-grey-medium.bmp differ
diff --git a/wps/Rockboxed/n-mono-big.bmp b/wps/Rockboxed/n-grey-big.bmp
similarity index 95%
rename from wps/Rockboxed/n-mono-big.bmp
rename to wps/Rockboxed/n-grey-big.bmp
index e3cdf8099b..a912c7a523 100644
Binary files a/wps/Rockboxed/n-mono-big.bmp and b/wps/Rockboxed/n-grey-big.bmp differ
diff --git a/wps/Rockboxed/n-grey-medium.bmp b/wps/Rockboxed/n-grey-medium.bmp
new file mode 100644
index 0000000000..f9aca4ce42
Binary files /dev/null and b/wps/Rockboxed/n-grey-medium.bmp differ
diff --git a/wps/Rockboxed/pg-grey-118.bmp b/wps/Rockboxed/pg-grey-118.bmp
new file mode 100644
index 0000000000..ff7396b0cc
Binary files /dev/null and b/wps/Rockboxed/pg-grey-118.bmp differ
diff --git a/wps/Rockboxed/pg-grey-140.bmp b/wps/Rockboxed/pg-grey-140.bmp
new file mode 100644
index 0000000000..4caf434a66
Binary files /dev/null and b/wps/Rockboxed/pg-grey-140.bmp differ
diff --git a/wps/Rockboxed/ply-grey-big.bmp b/wps/Rockboxed/ply-grey-big.bmp
new file mode 100644
index 0000000000..dbc35d044b
Binary files /dev/null and b/wps/Rockboxed/ply-grey-big.bmp differ
diff --git a/wps/Rockboxed/ply-mono-big.bmp b/wps/Rockboxed/ply-mono-big.bmp
deleted file mode 100644
index 3dd3bffd16..0000000000
Binary files a/wps/Rockboxed/ply-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/ps-mono-big.bmp b/wps/Rockboxed/ps-grey-big.bmp
similarity index 80%
rename from wps/Rockboxed/ps-mono-big.bmp
rename to wps/Rockboxed/ps-grey-big.bmp
index 61dd410ea3..6b42b1836a 100644
Binary files a/wps/Rockboxed/ps-mono-big.bmp and b/wps/Rockboxed/ps-grey-big.bmp differ
diff --git a/wps/Rockboxed/ra-mono-big.bmp b/wps/Rockboxed/ra-grey-big.bmp
similarity index 80%
rename from wps/Rockboxed/ra-mono-big.bmp
rename to wps/Rockboxed/ra-grey-big.bmp
index d5229981e1..10f21eb1e3 100644
Binary files a/wps/Rockboxed/ra-mono-big.bmp and b/wps/Rockboxed/ra-grey-big.bmp differ
diff --git a/wps/Rockboxed/ra-mono-medium.bmp b/wps/Rockboxed/ra-grey-medium.bmp
similarity index 80%
rename from wps/Rockboxed/ra-mono-medium.bmp
rename to wps/Rockboxed/ra-grey-medium.bmp
index cfa95130fa..71f106a393 100644
Binary files a/wps/Rockboxed/ra-mono-medium.bmp and b/wps/Rockboxed/ra-grey-medium.bmp differ
diff --git a/wps/Rockboxed/rab-grey-big.bmp b/wps/Rockboxed/rab-grey-big.bmp
new file mode 100644
index 0000000000..27368c2c68
Binary files /dev/null and b/wps/Rockboxed/rab-grey-big.bmp differ
diff --git a/wps/Rockboxed/rab-mono-medium.bmp b/wps/Rockboxed/rab-grey-medium.bmp
similarity index 80%
rename from wps/Rockboxed/rab-mono-medium.bmp
rename to wps/Rockboxed/rab-grey-medium.bmp
index 519977acf1..27b43d7ac5 100644
Binary files a/wps/Rockboxed/rab-mono-medium.bmp and b/wps/Rockboxed/rab-grey-medium.bmp differ
diff --git a/wps/Rockboxed/rab-mono-big.bmp b/wps/Rockboxed/rab-mono-big.bmp
deleted file mode 100644
index db4d372f37..0000000000
Binary files a/wps/Rockboxed/rab-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/ro-grey-big.bmp b/wps/Rockboxed/ro-grey-big.bmp
new file mode 100644
index 0000000000..7284e9032d
Binary files /dev/null and b/wps/Rockboxed/ro-grey-big.bmp differ
diff --git a/wps/Rockboxed/ro-mono-medium.bmp b/wps/Rockboxed/ro-grey-medium.bmp
similarity index 80%
rename from wps/Rockboxed/ro-mono-medium.bmp
rename to wps/Rockboxed/ro-grey-medium.bmp
index c3387b1c26..17fe41e243 100644
Binary files a/wps/Rockboxed/ro-mono-medium.bmp and b/wps/Rockboxed/ro-grey-medium.bmp differ
diff --git a/wps/Rockboxed/ro-mono-big.bmp b/wps/Rockboxed/ro-mono-big.bmp
deleted file mode 100644
index 8a82633f63..0000000000
Binary files a/wps/Rockboxed/ro-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/rs-grey-big.bmp b/wps/Rockboxed/rs-grey-big.bmp
new file mode 100644
index 0000000000..b0292a94da
Binary files /dev/null and b/wps/Rockboxed/rs-grey-big.bmp differ
diff --git a/wps/Rockboxed/rs-mono-medium.bmp b/wps/Rockboxed/rs-grey-medium.bmp
similarity index 80%
rename from wps/Rockboxed/rs-mono-medium.bmp
rename to wps/Rockboxed/rs-grey-medium.bmp
index 904fa1d506..de054e97f3 100644
Binary files a/wps/Rockboxed/rs-mono-medium.bmp and b/wps/Rockboxed/rs-grey-medium.bmp differ
diff --git a/wps/Rockboxed/rs-mono-big.bmp b/wps/Rockboxed/rs-mono-big.bmp
deleted file mode 100644
index 36449aeab4..0000000000
Binary files a/wps/Rockboxed/rs-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/rw-grey-big.bmp b/wps/Rockboxed/rw-grey-big.bmp
new file mode 100644
index 0000000000..cf02ab5ba0
Binary files /dev/null and b/wps/Rockboxed/rw-grey-big.bmp differ
diff --git a/wps/Rockboxed/rw-mono-big.bmp b/wps/Rockboxed/rw-mono-big.bmp
deleted file mode 100644
index 2c736ab20e..0000000000
Binary files a/wps/Rockboxed/rw-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/sl-grey-big.bmp b/wps/Rockboxed/sl-grey-big.bmp
new file mode 100644
index 0000000000..d44708dc10
Binary files /dev/null and b/wps/Rockboxed/sl-grey-big.bmp differ
diff --git a/wps/Rockboxed/sl-grey-medium.bmp b/wps/Rockboxed/sl-grey-medium.bmp
new file mode 100644
index 0000000000..00860b4aa9
Binary files /dev/null and b/wps/Rockboxed/sl-grey-medium.bmp differ
diff --git a/wps/Rockboxed/sl-mono-big.bmp b/wps/Rockboxed/sl-mono-big.bmp
deleted file mode 100644
index 1bbf642850..0000000000
Binary files a/wps/Rockboxed/sl-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/sl-mono-medium.bmp b/wps/Rockboxed/sl-mono-medium.bmp
deleted file mode 100644
index 38e1e040e9..0000000000
Binary files a/wps/Rockboxed/sl-mono-medium.bmp and /dev/null differ
diff --git a/wps/Rockboxed/v02-mono-big.bmp b/wps/Rockboxed/v01-grey-big.bmp
similarity index 92%
rename from wps/Rockboxed/v02-mono-big.bmp
rename to wps/Rockboxed/v01-grey-big.bmp
index d37204a4eb..e60efcbe7e 100644
Binary files a/wps/Rockboxed/v02-mono-big.bmp and b/wps/Rockboxed/v01-grey-big.bmp differ
diff --git a/wps/Rockboxed/v01-mono-big.bmp b/wps/Rockboxed/v02-grey-big.bmp
similarity index 92%
rename from wps/Rockboxed/v01-mono-big.bmp
rename to wps/Rockboxed/v02-grey-big.bmp
index 31d42d47a6..68c1c17a27 100644
Binary files a/wps/Rockboxed/v01-mono-big.bmp and b/wps/Rockboxed/v02-grey-big.bmp differ
diff --git a/wps/Rockboxed/v03-mono-big.bmp b/wps/Rockboxed/v03-grey-big.bmp
similarity index 92%
rename from wps/Rockboxed/v03-mono-big.bmp
rename to wps/Rockboxed/v03-grey-big.bmp
index 2c67d75c96..76c1350f16 100644
Binary files a/wps/Rockboxed/v03-mono-big.bmp and b/wps/Rockboxed/v03-grey-big.bmp differ
diff --git a/wps/Rockboxed/v04-mono-big.bmp b/wps/Rockboxed/v04-grey-big.bmp
similarity index 92%
rename from wps/Rockboxed/v04-mono-big.bmp
rename to wps/Rockboxed/v04-grey-big.bmp
index 972d485b6f..29562247ca 100644
Binary files a/wps/Rockboxed/v04-mono-big.bmp and b/wps/Rockboxed/v04-grey-big.bmp differ
diff --git a/wps/Rockboxed/v05-grey-big.bmp b/wps/Rockboxed/v05-grey-big.bmp
new file mode 100644
index 0000000000..4b633f6686
Binary files /dev/null and b/wps/Rockboxed/v05-grey-big.bmp differ
diff --git a/wps/Rockboxed/v05-mono-big.bmp b/wps/Rockboxed/v05-mono-big.bmp
deleted file mode 100644
index 0d4281cbe1..0000000000
Binary files a/wps/Rockboxed/v05-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/v06-grey-big.bmp b/wps/Rockboxed/v06-grey-big.bmp
new file mode 100644
index 0000000000..773b5281a2
Binary files /dev/null and b/wps/Rockboxed/v06-grey-big.bmp differ
diff --git a/wps/Rockboxed/v06-mono-big.bmp b/wps/Rockboxed/v06-mono-big.bmp
deleted file mode 100644
index 8ba6eb5698..0000000000
Binary files a/wps/Rockboxed/v06-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/v07-grey-big.bmp b/wps/Rockboxed/v07-grey-big.bmp
new file mode 100644
index 0000000000..37cb6c9fc8
Binary files /dev/null and b/wps/Rockboxed/v07-grey-big.bmp differ
diff --git a/wps/Rockboxed/v07-mono-big.bmp b/wps/Rockboxed/v07-mono-big.bmp
deleted file mode 100644
index d398627f06..0000000000
Binary files a/wps/Rockboxed/v07-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/v08-grey-big.bmp b/wps/Rockboxed/v08-grey-big.bmp
new file mode 100644
index 0000000000..23a68cc2cb
Binary files /dev/null and b/wps/Rockboxed/v08-grey-big.bmp differ
diff --git a/wps/Rockboxed/v08-mono-big.bmp b/wps/Rockboxed/v08-mono-big.bmp
deleted file mode 100644
index 8ec3e69bf9..0000000000
Binary files a/wps/Rockboxed/v08-mono-big.bmp and /dev/null differ
diff --git a/wps/Rockboxed/v11-grey-big.bmp b/wps/Rockboxed/v11-grey-big.bmp
new file mode 100644
index 0000000000..140dc7f6a7
Binary files /dev/null and b/wps/Rockboxed/v11-grey-big.bmp differ
diff --git a/wps/Rockboxed/v11-mono-big.bmp b/wps/Rockboxed/v11-mono-big.bmp
deleted file mode 100644
index d92296f199..0000000000
Binary files a/wps/Rockboxed/v11-mono-big.bmp and /dev/null differ