diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp
index 52b0e41df..4583998dd 100644
--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -657,6 +657,7 @@ int main(int argc, char* argv[])
 		SDL_FillRect(screen, &r, color);
 
 		SDL_Flip(SDL_GetVideoSurface());
+		__android_log_print(ANDROID_LOG_INFO, "Ballfield", "SDL_Flip");
 		SDL_Event evt;
 		while( SDL_PollEvent(&evt) )
 		{
diff --git a/project/jni/application/opentyrian/AndroidAppSettings.cfg b/project/jni/application/opentyrian/AndroidAppSettings.cfg
index 55373171f..80e214db1 100644
--- a/project/jni/application/opentyrian/AndroidAppSettings.cfg
+++ b/project/jni/application/opentyrian/AndroidAppSettings.cfg
@@ -25,16 +25,16 @@ AppUsesJoystick=n
 AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
-RedefinedKeys="SPACE RETURN LCTRL LALT SPACE"
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE"
 AppTouchscreenKeyboardKeysAmount=4
-AppTouchscreenKeyboardKeysAmountAutoFire=1
-RedefinedKeysScreenKb="SPACE RETURN LCTRL LALT"
+AppTouchscreenKeyboardKeysAmountAutoFire=0
+RedefinedKeysScreenKb="SPACE RETURN LALT LCTRL"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=2117
-AppVersionName="2.1.17"
+AppVersionCode=2119
+AppVersionName="2.1.19"
 ResetSdlConfigForThisVersion=y
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_net"
diff --git a/project/jni/application/opentyrian/src/tyrian2.cpp b/project/jni/application/opentyrian/src/tyrian2.cpp
index a856f78b1..72990cb7b 100644
--- a/project/jni/application/opentyrian/src/tyrian2.cpp
+++ b/project/jni/application/opentyrian/src/tyrian2.cpp
@@ -52,6 +52,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
+#include <android/log.h>
 
 inline static void blit_enemy( SDL_Surface *surface, unsigned int i, signed int x_offset, signed int y_offset, signed int sprite_offset );
 
@@ -3571,8 +3572,9 @@ bool JE_titleScreen( JE_boolean animate )
 			{
 				if (toupper(lastkey_char) == specialName[i][arcade_code_i[i]])
 					arcade_code_i[i]++;
-				else
+				else if(lastkey_char != '\0')
 					arcade_code_i[i] = 0;
+				//__android_log_print(ANDROID_LOG_INFO, "Tyrian", "Got key: %d = '%c' = '%c', code[%d] = '%s', matched %d", (int)lastkey_char, lastkey_char, toupper(lastkey_char), i, specialName[i], arcade_code_i[i]);
 
 				if (arcade_code_i[i] > 0 && arcade_code_i[i] == strlen(specialName[i]))
 				{
diff --git a/project/jni/application/src b/project/jni/application/src
index 104f796a6..7fa7b8f4e 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ballfield
\ No newline at end of file
+opentyrian
\ No newline at end of file
diff --git a/project/jni/sdl-1.3/src/video/android/keymap.c b/project/jni/sdl-1.3/src/video/android/keymap.c
index 825589277..eb0eb69bc 100644
--- a/project/jni/sdl-1.3/src/video/android/keymap.c
+++ b/project/jni/sdl-1.3/src/video/android/keymap.c
@@ -133,11 +133,11 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
   keymap[KEYCODE_BUTTON_A] = SDL_KEY(A);
   keymap[KEYCODE_BUTTON_B] = SDL_KEY(B);
   keymap[KEYCODE_BUTTON_C] = SDL_KEY(C);
-  keymap[KEYCODE_BUTTON_X] = SDL_KEY(X);
-  keymap[KEYCODE_BUTTON_Y] = SDL_KEY(Y);
+  keymap[KEYCODE_BUTTON_X] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_0));
+  keymap[KEYCODE_BUTTON_Y] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_1));
   keymap[KEYCODE_BUTTON_Z] = SDL_KEY(Z);
-  keymap[KEYCODE_BUTTON_L1] = SDL_KEY(LSHIFT);
-  keymap[KEYCODE_BUTTON_R1] = SDL_KEY(RSHIFT);
+  keymap[KEYCODE_BUTTON_L1] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_2));
+  keymap[KEYCODE_BUTTON_R1] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3));
   keymap[KEYCODE_BUTTON_L2] = SDL_KEY(LCTRL);
   keymap[KEYCODE_BUTTON_R2] = SDL_KEY(RCTRL);
   keymap[KEYCODE_BUTTON_THUMBL] = SDL_KEY(LALT);