diff --git a/project/java/SettingsMenuMisc.java b/project/java/SettingsMenuMisc.java
index d26c6c1af..29cec0d90 100644
--- a/project/java/SettingsMenuMisc.java
+++ b/project/java/SettingsMenuMisc.java
@@ -469,6 +469,8 @@ class SettingsMenuMisc extends SettingsMenu
 		{
 			String readmes[] = Globals.ReadmeText.split("\\^");
 			String lang = new String(Locale.getDefault().getLanguage()) + ":";
+			if( p.isRunningOnOUYA() )
+				lang = "ouya:";
 			String readme = readmes[0];
 			String buttonName = "", buttonUrl = "";
 			for( String r: readmes )
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 57aeefafb..07c011b6c 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 57aeefafb2f4b1551e5cec8041e7636e4ff31ab7
+Subproject commit 07c011b6ccb275fc2b69dbd6e7ee8dba6223e59a
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index f09763479..1aa8636cd 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit f0976347952195fbabf83c8d23de3262a5f84207
+Subproject commit 1aa8636cdb32937d8081efc9d43f00060e6d1704
diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
index 6525434a1..8adefe24e 100644
--- a/project/jni/application/teeworlds/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -133,10 +133,10 @@ AppTouchscreenKeyboardKeysAmount=4
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 
 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
-RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RCTRL RETURN"
+RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RETURN RCTRL"
 
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
-RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Fire Hook"
+RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Hook Fire"
 
 # Redefine gamepad keys to SDL keysyms, button order is:
 # A B X Y L1 R1 L2 R2 LThumb RThumb
@@ -172,7 +172,7 @@ AppVersionName="0.6.2.13"
 ResetSdlConfigForThisVersion=y
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
-DeleteFilesOnUpgrade="data .teeworlds"
+DeleteFilesOnUpgrade="%"
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
@@ -202,7 +202,7 @@ 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?)
-ReadmeText='Tap left joystick to launch hook\\\\nSwipe left joystick up or down to jump'
+ReadmeText='Tap left joystick to launch hook\\\\nSwipe left joystick up or down to jump^ouya:'
 
 # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
 # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge
diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src
index ed4762a91..27ef72de4 160000
--- a/project/jni/application/teeworlds/src
+++ b/project/jni/application/teeworlds/src
@@ -1 +1 @@
-Subproject commit ed4762a9135be11b2cbcc743e36190c12fadda1f
+Subproject commit 27ef72de425b35f656abf9f07a6cc4f43e80bb2b
diff --git a/todo.txt b/todo.txt
index 3bf9e7136..331da6055 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,8 +1,6 @@
 Requested features, might never get implemented
 ===============================================
 
-- Option for default on-screen key theme in AndroidAppSettings.cfg.
-
 - Select between normal mouse input and magnifying glass/relative input automatically, based on screen size.
 
 - Show/hide screen controls with longpress on Text Edit button.
@@ -14,7 +12,7 @@ Requested features, might never get implemented
 
 - Control screen brightness with SDL_SetGamma().
 
-- Zoom in-out whole screen in SW mode with some SDL key or gesture, as in AndroidVNC. -
+- Zoom in-out whole screen in SW mode with some SDL key or gesture, as in AndroidVNC.
 
 - Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported).
   This is not relevant already, as every device around is fast enough with GL.
@@ -34,4 +32,8 @@ TODO, which will get actually done
 
 - OpenArena: move 3-rd person camera to the side, above shoulder.
 
+- OpenArena: finish Ouya port.
+
 - SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper.
+
+- UfoAI: huge huge update.
\ No newline at end of file