diff --git a/wps/WPSLIST b/wps/WPSLIST
index 8dbee4e696..ab30e905f7 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -60,7 +60,7 @@ Width: 160
 
 <wps>
 Name: engineeer2.wps
-RWPS: rockbox_default.rwps
+RWPS: engineeer2.rwps
 Author: Magnus Westerlund
 Font: nedore-8.fnt
 Statusbar: on
@@ -114,3 +114,12 @@ Statusbar: on
 Height: 64
 Width: 128
 </rwps>
+
+<rwps>
+Name: engineeer2.rwps
+Author: Magnus Westerlund
+Font: nedore-8.fnt
+Statusbar: on
+Height: 64
+Width: 128
+</rwps>
diff --git a/wps/engineeer2.rwps b/wps/engineeer2.rwps
new file mode 100644
index 0000000000..44e600a6e8
--- /dev/null
+++ b/wps/engineeer2.rwps
@@ -0,0 +1,55 @@
+%x|a|background_r.bmp|0|0|
+%xl|b|codec_mp1.bmp|8|46|
+%xl|c|codec_mp2.bmp|8|46|
+%xl|d|codec_mp3.bmp|8|46|
+%xl|e|codec_wav.bmp|8|46|
+%xl|f|codec_ogg.bmp|8|46|
+%xl|g|codec_flac.bmp|8|46|
+%xl|h|codec_mpc.bmp|8|46|
+%xl|i|codec_a52.bmp|8|46|
+%xl|j|codec_wpk.bmp|8|46|
+%xl|k|codec_unknown.bmp|8|46|
+%xl|l|codec_vbr.bmp|9|52|
+%xl|m|codec_cbr.bmp|9|52|
+%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|r|mode_play_r.bmp|6|12|
+%xl|s|mode_pause_r.bmp|6|12|
+%xl|t|mode_ffwd_r.bmp|6|12|
+%xl|u|mode_rew_r.bmp|6|12|
+%xl|v|lock_main.bmp|73|0|
+%xl|w|lock_remote.bmp|81|0|
+%xl|x|vol_0_r.bmp|0|0|
+%xl|y|vol_1_r.bmp|0|0|
+%xl|z|vol_2_r.bmp|0|0|
+%xl|A|vol_3_r.bmp|0|0|
+%xl|B|vol_4_r.bmp|0|0|
+%xl|C|vol_5_r.bmp|0|0|
+%xl|D|vol_6_r.bmp|0|0|
+%xl|E|vol_7_r.bmp|0|0|
+%xl|F|vol_8_r.bmp|0|0|
+%xl|G|vol_9_r.bmp|0|0|
+%xl|H|batt_0.bmp|112|0|
+%xl|I|batt_1.bmp|112|0|
+%xl|J|batt_2.bmp|112|0|
+%xl|K|batt_3.bmp|112|0|
+%xl|L|batt_4.bmp|112|0|
+%xl|M|charge.bmp|112|0|
+%xl|N|shuffle.bmp|26|1|
+%wd
+
+
+%s%ac%?it<%it|%fn>
+%s%ac%?ia<%ia|%d2>
+%ar%pc/%pt %?fc<%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi|%xdj|%xdk>
+        %fbk
+%?fv<%xdl|%xdm>
+%?pv<%xdx|%xdy|%xdz|%xdA|%xdB|%xdC|%xdD|%xdE|%xdF|%xdG>
+%?bp<%xdM|%ac%t0.25%?bl<%xdH|%xdI|%xdJ|%xdK|%xdL>;%ac%t0.25%?bl<|%xdI|%xdJ|%xdK|%xdL>;%ac%t0.25%?bl<%xdH||%xdJ|%xdK|%xdL>;%ac%t0.25%?bl<||%xdJ|%xdK|%xdL>>
+%?mm<|%xdn|%xdo|%xdp>
+%?mp<%xdq|%xdr|%xds|%xdt|%xdu>
+%?ps<%xdN|>
+%?mh<%xdv|>
+%?mr<%xdw|>
\ No newline at end of file
diff --git a/wps/engineeer2/background_r.bmp b/wps/engineeer2/background_r.bmp
new file mode 100644
index 0000000000..f352b55cc5
Binary files /dev/null and b/wps/engineeer2/background_r.bmp differ
diff --git a/wps/engineeer2/mode_ffwd_r.bmp b/wps/engineeer2/mode_ffwd_r.bmp
new file mode 100644
index 0000000000..31c367bb3e
Binary files /dev/null and b/wps/engineeer2/mode_ffwd_r.bmp differ
diff --git a/wps/engineeer2/mode_pause_r.bmp b/wps/engineeer2/mode_pause_r.bmp
new file mode 100644
index 0000000000..9d1415c27b
Binary files /dev/null and b/wps/engineeer2/mode_pause_r.bmp differ
diff --git a/wps/engineeer2/mode_play_r.bmp b/wps/engineeer2/mode_play_r.bmp
new file mode 100644
index 0000000000..437eb7ccaf
Binary files /dev/null and b/wps/engineeer2/mode_play_r.bmp differ
diff --git a/wps/engineeer2/mode_rew_r.bmp b/wps/engineeer2/mode_rew_r.bmp
new file mode 100644
index 0000000000..59f6a37099
Binary files /dev/null and b/wps/engineeer2/mode_rew_r.bmp differ
diff --git a/wps/engineeer2/vol_0_r.bmp b/wps/engineeer2/vol_0_r.bmp
new file mode 100644
index 0000000000..122d67b703
Binary files /dev/null and b/wps/engineeer2/vol_0_r.bmp differ
diff --git a/wps/engineeer2/vol_1_r.bmp b/wps/engineeer2/vol_1_r.bmp
new file mode 100644
index 0000000000..122d67b703
Binary files /dev/null and b/wps/engineeer2/vol_1_r.bmp differ
diff --git a/wps/engineeer2/vol_2_r.bmp b/wps/engineeer2/vol_2_r.bmp
new file mode 100644
index 0000000000..110daca1e4
Binary files /dev/null and b/wps/engineeer2/vol_2_r.bmp differ
diff --git a/wps/engineeer2/vol_3_r.bmp b/wps/engineeer2/vol_3_r.bmp
new file mode 100644
index 0000000000..7821b8debd
Binary files /dev/null and b/wps/engineeer2/vol_3_r.bmp differ
diff --git a/wps/engineeer2/vol_4_r.bmp b/wps/engineeer2/vol_4_r.bmp
new file mode 100644
index 0000000000..3390474f47
Binary files /dev/null and b/wps/engineeer2/vol_4_r.bmp differ
diff --git a/wps/engineeer2/vol_5_r.bmp b/wps/engineeer2/vol_5_r.bmp
new file mode 100644
index 0000000000..b7aa31a772
Binary files /dev/null and b/wps/engineeer2/vol_5_r.bmp differ
diff --git a/wps/engineeer2/vol_6_r.bmp b/wps/engineeer2/vol_6_r.bmp
new file mode 100644
index 0000000000..989adca096
Binary files /dev/null and b/wps/engineeer2/vol_6_r.bmp differ
diff --git a/wps/engineeer2/vol_7_r.bmp b/wps/engineeer2/vol_7_r.bmp
new file mode 100644
index 0000000000..b98ad52c34
Binary files /dev/null and b/wps/engineeer2/vol_7_r.bmp differ
diff --git a/wps/engineeer2/vol_8_r.bmp b/wps/engineeer2/vol_8_r.bmp
new file mode 100644
index 0000000000..fa0afec528
Binary files /dev/null and b/wps/engineeer2/vol_8_r.bmp differ
diff --git a/wps/engineeer2/vol_9_r.bmp b/wps/engineeer2/vol_9_r.bmp
new file mode 100644
index 0000000000..ad7cbed8cb
Binary files /dev/null and b/wps/engineeer2/vol_9_r.bmp differ