diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index 05f0031c3..133cd24ca 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -138,6 +138,17 @@ RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
 RedefinedKeysScreenKbNames="0 1 2 3 4 5 6 7 8 9"
 
+# On-screen keys theme
+# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
+# 2 = Simple Theme by Beholder (white, with gamepad joystick)
+# 3 = Sun by Sirea (yellow, with round joystick)
+# 4 = Keen by Gerstrong (multicolor, with round joystick)
+TouchscreenKeysTheme=4
+
+# Redefine gamepad keys to SDL keysyms, button order is:
+# A B X Y L1 R1 L2 R2 LThumb RThumb
+RedefinedKeysGamepad="0 1 2 3 4 5 6 7 8 9"
+
 # How long to show startup menu button, in msec, 0 to disable startup menu
 StartupMenuButtonTimeout=3000
 
diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg
index 2c20b9728..fbc42c2a9 100644
--- a/project/jni/application/commandergenius/AndroidAppSettings.cfg
+++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg
@@ -138,6 +138,13 @@ RedefinedKeysScreenKb="LCTRL LALT SPACE RETURN"
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
 RedefinedKeysScreenKbNames="LCTRL LALT SPACE RETURN"
 
+# On-screen keys theme
+# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
+# 2 = Simple Theme by Beholder (white, with gamepad joystick)
+# 3 = Sun by Sirea (yellow, with round joystick)
+# 4 = Keen by Gerstrong (multicolor, with round joystick)
+TouchscreenKeysTheme=4
+
 # Redefine gamepad keys to SDL keysyms, button order is:
 # A B X Y L1 R1 L2 R2 LThumb RThumb
 RedefinedKeysGamepad="LCTRL LALT SPACE RETURN"
@@ -201,7 +208,7 @@ AppBuildExclude=''
 AppCmdline=''
 
 # Here you may type readme text, which will be shown during startup. Format is:
-# Text in English, use \\\\\\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?)
+# Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?)
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
 
 # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
diff --git a/project/res/raw/keen.raw b/project/res/raw/keen.raw
index 42e45ca19..974eb2e66 100644
Binary files a/project/res/raw/keen.raw and b/project/res/raw/keen.raw differ
diff --git a/project/res/raw/simpletheme.raw b/project/res/raw/simpletheme.raw
index c0d5c9969..1ce73ae3f 100644
Binary files a/project/res/raw/simpletheme.raw and b/project/res/raw/simpletheme.raw differ
diff --git a/project/res/raw/sun.raw b/project/res/raw/sun.raw
index 2f3452f25..bff9e617a 100644
Binary files a/project/res/raw/sun.raw and b/project/res/raw/sun.raw differ
diff --git a/project/res/raw/ultimatedroid.raw b/project/res/raw/ultimatedroid.raw
index 8217e69a9..fa4c1802c 100644
Binary files a/project/res/raw/ultimatedroid.raw and b/project/res/raw/ultimatedroid.raw differ
diff --git a/project/themes/Keen/keen-02.png b/project/themes/Keen/1.png
similarity index 100%
rename from project/themes/Keen/keen-02.png
rename to project/themes/Keen/1.png
diff --git a/project/themes/Keen/1auto.png b/project/themes/Keen/1auto.png
new file mode 100644
index 000000000..74b2ab671
Binary files /dev/null and b/project/themes/Keen/1auto.png differ
diff --git a/project/themes/Keen/keen-03.png b/project/themes/Keen/1auto_pressed.png
similarity index 100%
rename from project/themes/Keen/keen-03.png
rename to project/themes/Keen/1auto_pressed.png
diff --git a/project/themes/Keen/1pressed.png b/project/themes/Keen/1pressed.png
new file mode 100644
index 000000000..57498b08b
Binary files /dev/null and b/project/themes/Keen/1pressed.png differ
diff --git a/project/themes/Keen/keen-04.png b/project/themes/Keen/2.png
similarity index 100%
rename from project/themes/Keen/keen-04.png
rename to project/themes/Keen/2.png
diff --git a/project/themes/Keen/2auto.png b/project/themes/Keen/2auto.png
new file mode 100644
index 000000000..5e8a25a1e
Binary files /dev/null and b/project/themes/Keen/2auto.png differ
diff --git a/project/themes/Keen/keen-05.png b/project/themes/Keen/2auto_pressed.png
similarity index 100%
rename from project/themes/Keen/keen-05.png
rename to project/themes/Keen/2auto_pressed.png
diff --git a/project/themes/Keen/2pressed.png b/project/themes/Keen/2pressed.png
new file mode 100644
index 000000000..8344de875
Binary files /dev/null and b/project/themes/Keen/2pressed.png differ
diff --git a/project/themes/Keen/keen-06.png b/project/themes/Keen/3.png
similarity index 100%
rename from project/themes/Keen/keen-06.png
rename to project/themes/Keen/3.png
diff --git a/project/themes/Keen/keen-10.png b/project/themes/Keen/3pressed.png
similarity index 100%
rename from project/themes/Keen/keen-10.png
rename to project/themes/Keen/3pressed.png
diff --git a/project/themes/Keen/keen-07.png b/project/themes/Keen/4.png
similarity index 100%
rename from project/themes/Keen/keen-07.png
rename to project/themes/Keen/4.png
diff --git a/project/themes/Keen/keen-08.png b/project/themes/Keen/4pressed.png
similarity index 100%
rename from project/themes/Keen/keen-08.png
rename to project/themes/Keen/4pressed.png
diff --git a/project/themes/Keen/5.png b/project/themes/Keen/5.png
new file mode 100644
index 000000000..1c6802113
Binary files /dev/null and b/project/themes/Keen/5.png differ
diff --git a/project/themes/Keen/5pressed.png b/project/themes/Keen/5pressed.png
new file mode 100644
index 000000000..f385b5bbd
Binary files /dev/null and b/project/themes/Keen/5pressed.png differ
diff --git a/project/themes/Keen/6.png b/project/themes/Keen/6.png
new file mode 100644
index 000000000..83902c210
Binary files /dev/null and b/project/themes/Keen/6.png differ
diff --git a/project/themes/Keen/6pressed.png b/project/themes/Keen/6pressed.png
new file mode 100644
index 000000000..08c6524da
Binary files /dev/null and b/project/themes/Keen/6pressed.png differ
diff --git a/project/themes/Keen/keen-01.png b/project/themes/Keen/dpad.png
similarity index 100%
rename from project/themes/Keen/keen-01.png
rename to project/themes/Keen/dpad.png
diff --git a/project/themes/Keen/dpad_down.png b/project/themes/Keen/dpad_down.png
new file mode 100644
index 000000000..ca2d7e5b5
Binary files /dev/null and b/project/themes/Keen/dpad_down.png differ
diff --git a/project/themes/Keen/dpad_left.png b/project/themes/Keen/dpad_left.png
new file mode 100644
index 000000000..ca2d7e5b5
Binary files /dev/null and b/project/themes/Keen/dpad_left.png differ
diff --git a/project/themes/Keen/dpad_right.png b/project/themes/Keen/dpad_right.png
new file mode 100644
index 000000000..ca2d7e5b5
Binary files /dev/null and b/project/themes/Keen/dpad_right.png differ
diff --git a/project/themes/Keen/dpad_up.png b/project/themes/Keen/dpad_up.png
new file mode 100644
index 000000000..ca2d7e5b5
Binary files /dev/null and b/project/themes/Keen/dpad_up.png differ
diff --git a/project/themes/Keen/keen-09.png b/project/themes/Keen/keyboard.png
similarity index 100%
rename from project/themes/Keen/keen-09.png
rename to project/themes/Keen/keyboard.png
diff --git a/project/themes/Keen/mouse_pointer.png b/project/themes/Keen/mouse_pointer.png
new file mode 100644
index 000000000..28b95493e
Binary files /dev/null and b/project/themes/Keen/mouse_pointer.png differ
diff --git a/project/themes/convert.sh b/project/themes/convert.sh
index 63ffdc2ad..ffe55d0fc 100755
--- a/project/themes/convert.sh
+++ b/project/themes/convert.sh
@@ -149,20 +149,35 @@ for f in Keen/*.png; do
 done
 
 rm -f ../res/raw/keen.raw
-printf '\000\000\000\012' > ../res/raw/keen.raw # size, 012 = 10
+printf '\000\000\000\030' > ../res/raw/keen.raw # size, 030 = 24
 
 for F in \
-keen-01 \
+dpad \
+dpad_left \
+dpad_right \
+dpad_up \
+dpad_down \
 \
-keen-02 \
-keen-03 \
-keen-04 \
-keen-05 \
-keen-06 \
-keen-07 \
-keen-08 \
-keen-09 \
-keen-10 \
+1auto_pressed \
+1auto \
+2auto_pressed \
+2auto \
+\
+1 \
+1pressed \
+2 \
+2pressed \
+3 \
+3pressed \
+4 \
+4pressed \
+5 \
+5pressed \
+6 \
+6pressed \
+keyboard \
+keyboard \
+mouse_pointer \
 ; do
 	if [ \! -e ../res/raw/$F.png.raw ]; then
 		echo Cannot find ../res/raw/$F.png.raw - check if all files are in place
@@ -172,7 +187,7 @@ keen-10 \
 	cat ../res/raw/$F.png.raw >> ../res/raw/keen.raw
 done
 
-rm ../res/raw/keen*.png.raw
+rm ../res/raw/*.png.raw
 
 gzip -9 < ../res/raw/keen.raw > ../res/raw/keen.raw.gz
 mv -f ../res/raw/keen.raw.gz ../res/raw/keen.raw