diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
index c3c9a64d4..8df161745 100644
--- a/project/jni/application/teeworlds/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -21,13 +21,13 @@ AppNeedsTwoButtonMouse=n
 ShowMouseCursor=n
 ForceRelativeMouseMode=n
 AppNeedsArrowKeys=y
-AppNeedsTextInput=y
-AppUsesJoystick=y
+AppNeedsTextInput=n
+AppUsesJoystick=n
 AppUsesAccelerometer=y
-AppUsesMultitouch=y
-NonBlockingSwapBuffers=n
-RedefinedKeys="SPACE RETURN LEFT RIGHT LSHIFT ESCAPE RSHIFT LSHIFT"
-AppTouchscreenKeyboardKeysAmount=6
+AppUsesMultitouch=n
+NonBlockingSwapBuffers=y
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP"
+AppTouchscreenKeyboardKeysAmount=4
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SPACE RETURN LEFT RIGHT RSHIFT LSHIFT"
 StartupMenuButtonTimeout=3000
@@ -37,7 +37,7 @@ MultiABI=n
 AppVersionCode=06108
 AppVersionName="0.6.1.08"
 ResetSdlConfigForThisVersion=y
-DeleteFilesOnUpgrade="data"
+DeleteFilesOnUpgrade="data .teeworlds"
 CompiledLibraries="sdl_image freetype glu"
 CustomBuildScript=n
 AppCflags='-O3'
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
index 676a27295..922daed9b 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
@@ -1040,11 +1040,14 @@ static void ANDROID_UpdateRects(_THIS, int numrects, SDL_Rect *rects)
 void ANDROID_GL_SwapBuffers(_THIS)
 {
 	//__android_log_print(ANDROID_LOG_INFO, "libSDL", "ANDROID_GL_SwapBuffers");
+	// TeeWorlds use hacky hack to draw from separate thread, however it works surprisingly well
+	/*
 	if( !SDL_ANDROID_InsideVideoThread() )
 	{
 		__android_log_print(ANDROID_LOG_INFO, "libSDL", "Error: calling %s not from the main thread!", __PRETTY_FUNCTION__);
 		return;
 	}
+	*/
 
 	SDL_ANDROID_CallJavaSwapBuffers();
 };