diff --git a/project/jni/application/xmoto/AndroidAppSettings.cfg b/project/jni/application/xmoto/AndroidAppSettings.cfg
index 6096d1006..65b56261a 100644
--- a/project/jni/application/xmoto/AndroidAppSettings.cfg
+++ b/project/jni/application/xmoto/AndroidAppSettings.cfg
@@ -203,13 +203,13 @@ NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP"
 
 # Number of virtual keyboard keys (currently 6 is maximum)
-AppTouchscreenKeyboardKeysAmount=4
+AppTouchscreenKeyboardKeysAmount=5
 
 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
-RedefinedKeysScreenKb="KP5 KP8 SPACE TAB"
+RedefinedKeysScreenKb="KP8 KP5 SPACE TAB F2"
 
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
-RedefinedKeysScreenKbNames="Drive Brake Direction Inspect"
+RedefinedKeysScreenKbNames="Drive Brake Direction Inspect Ghost"
 
 # On-screen keys theme
 # 0 = Ultimate Droid by Sean Stieber (green, with cross joystick)
@@ -287,7 +287,7 @@ AppLdflags='-O3'
 AppOverlapsSystemHeaders=n
 
 # Build only following subdirs (empty will build all dirs, ignored with custom script)
-AppSubdirsBuild='src/src/* src/vendor/bzip2 src/vendor/chipmunk src/vendor/libccd/* src/vendor/md5sum/* src/vendor/ode/* src/vendor/xdgbasedir/*'
+AppSubdirsBuild='src/src/* src/vendor/bzip2 src/vendor/chipmunk src/vendor/libccd/* src/vendor/md5sum/* src/vendor/ode/* src/vendor/xdgbasedir/* src/vendor/xdgbasedir'
 
 # Exclude these files from build
 AppBuildExclude='src/src/helpers/HighPrecisionTimerWin32.cpp'
diff --git a/project/jni/application/xmoto/src b/project/jni/application/xmoto/src
index b6e269dbf..9958a6b62 160000
--- a/project/jni/application/xmoto/src
+++ b/project/jni/application/xmoto/src
@@ -1 +1 @@
-Subproject commit b6e269dbf454e1a50f9b74b2c4596ae1325372d8
+Subproject commit 9958a6b622bf2d87b0f854d996a4fc9fb156dfde