diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 6f1e14cd6..9251072eb 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -968,7 +968,7 @@ echo AppCmdline=\'$AppCmdline\' >> AndroidAppSettings.cfg
 echo >> AndroidAppSettings.cfg
 echo "# Here you may type readme text, which will be shown during startup. Format is:" >> AndroidAppSettings.cfg
 echo "# 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?)" >> AndroidAppSettings.cfg
-echo ReadmeText=\'$ReadmeText\' >> AndroidAppSettings.cfg
+echo ReadmeText=\'$ReadmeText\' | sed 's/\\\\n/\\\\\\\\n/g' >> AndroidAppSettings.cfg
 echo >> AndroidAppSettings.cfg
 echo "# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens" >> AndroidAppSettings.cfg
 echo "# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge" >> AndroidAppSettings.cfg
diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index 7d3a640d2..5dd62f296 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -12,7 +12,7 @@
         <activity android:name=".MainActivity"
                   android:label="@string/app_name"
                   android:alwaysRetainTaskState="true"
-                  android:launchMode="singleInstance"
+                  android:launchMode="singleTask"
                   android:screenOrientation="landscape"
                   android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|screenSize|smallestScreenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustPan"
diff --git a/project/java/SettingsMenuMisc.java b/project/java/SettingsMenuMisc.java
index 29cec0d90..2e9e30fd2 100644
--- a/project/java/SettingsMenuMisc.java
+++ b/project/java/SettingsMenuMisc.java
@@ -56,7 +56,9 @@ import android.widget.TextView;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.Button;
+import android.widget.Scroller;
 import android.view.View;
+import android.view.Gravity;
 import android.widget.LinearLayout;
 import android.text.Editable;
 import android.text.SpannedString;
@@ -494,12 +496,17 @@ class SettingsMenuMisc extends SettingsMenu
 				return;
 			}
 			TextView text = new TextView(p);
-			text.setMaxLines(1000);
+			text.setMaxLines(100);
+			//text.setScroller(new Scroller(p));
+			//text.setVerticalScrollBarEnabled(true);
 			text.setText(readme);
-			text.setLayoutParams(new ViewGroup.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.FILL_PARENT));
+			text.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+			text.setPadding(0, 5, 0, 20);
+			text.setTextSize(20.0f);
+			text.setGravity(Gravity.CENTER);
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);
 			ScrollView scroll = new ScrollView(p);
-			scroll.addView(text);
+			scroll.addView(text, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 			Button ok = new Button(p);
 			final AlertDialog alertDismiss[] = new AlertDialog[1];
 			ok.setOnClickListener(new View.OnClickListener()
@@ -513,6 +520,7 @@ class SettingsMenuMisc extends SettingsMenu
 			LinearLayout layout = new LinearLayout(p);
 			layout.setOrientation(LinearLayout.VERTICAL);
 			layout.addView(scroll);
+			//layout.addView(text);
 			layout.addView(ok);
 			if( buttonName.length() > 0 )
 			{
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 07c011b6c..030eabf95 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 07c011b6ccb275fc2b69dbd6e7ee8dba6223e59a
+Subproject commit 030eabf95ab5815f471fae2d39bb2cc82f38da50
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index 4b83db91a..278f04520 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 4b83db91ab39b9cae27f087fe1a0a8ba9f30d43d
+Subproject commit 278f045202ff1bc0c1911b6c3d441909ba93ee87
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 8c8a2a328..0663c1525 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -138,6 +138,17 @@ RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINU
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
 RedefinedKeysScreenKbNames="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
 
+# On-screen keys theme
+# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
+# 1 = Simple Theme by Beholder (white, with gamepad joystick)
+# 2 = Sun by Sirea (yellow, with round joystick)
+# 3 = Keen by Gerstrong (multicolor, with round joystick)
+TouchscreenKeysTheme=2
+
+# Redefine gamepad keys to SDL keysyms, button order is:
+# A B X Y L1 R1 L2 R2 LThumb RThumb
+RedefinedKeysGamepad="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
+
 # How long to show startup menu button, in msec, 0 to disable startup menu
 StartupMenuButtonTimeout=3000
 
@@ -159,13 +170,13 @@ MultiABI=n
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=13225
+AppVersionCode=13226
 
 # Application user-visible version name (string)
-AppVersionName="1.3.2.25"
+AppVersionName="1.3.2.26"
 
 # Reset SDL config when updating application to the new version (y) / (n)
-ResetSdlConfigForThisVersion=n
+ResetSdlConfigForThisVersion=y
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
 DeleteFilesOnUpgrade="%"
@@ -198,7 +209,7 @@ AppCmdline='openttd'
 
 # 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='^You may press "Home" now - the data will be downloaded in background'
+ReadmeText='Official Transport Tycoon for Android\\\\nAvailable on Google Play\\\\nJust for $6.99, tablets only\\\\n\\\\nOpenTTD is not affiliated with this game^button:Google Play:https://play.google.com/store/apps/details?id=com.thirtyonex.TransportTycoon'
 
 # 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/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
index 2ae6472a7..dac5ea200 100644
--- a/project/jni/application/teeworlds/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -170,10 +170,10 @@ MultiABI=y
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=06214
+AppVersionCode=06215
 
 # Application user-visible version name (string)
-AppVersionName="0.6.2.14"
+AppVersionName="0.6.2.15"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y
diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src
index 34b64249c..e5489c8c0 160000
--- a/project/jni/application/teeworlds/src
+++ b/project/jni/application/teeworlds/src
@@ -1 +1 @@
-Subproject commit 34b64249c46a90ce127f32b3ef41a565b8a70a61
+Subproject commit e5489c8c089e57d88bbaa90df0176d5e5d4c6351
diff --git a/project/jni/png/Android.mk b/project/jni/png/Android.mk
index d21d3fad3..de136b57d 100644
--- a/project/jni/png/Android.mk
+++ b/project/jni/png/Android.mk
@@ -20,7 +20,7 @@ pngwrite.c \
 pngwtran.c \
 pngwutil.c \
 
-common_CFLAGS := -O3
+common_CFLAGS := -O3 -DHAVE_CONFIG_H
 
 common_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)
 
diff --git a/project/jni/png/config.h b/project/jni/png/config.h
new file mode 100644
index 000000000..78b1744cb
--- /dev/null
+++ b/project/jni/png/config.h
@@ -0,0 +1,110 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `feenableexcept' function. */
+/* #undef HAVE_FEENABLEEXCEPT */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+/* #undef HAVE_LIBM */
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `pow' function. */
+#define HAVE_POW 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libpng"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "png-mng-implement@lists.sourceforge.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libpng"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libpng 1.6.6"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libpng"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.6.6"
+
+/* Turn on ARM Neon optimizations at run-time */
+/* #undef PNG_ARM_NEON_API_SUPPORTED */
+
+/* Check for ARM Neon support at run-time */
+/* #undef PNG_ARM_NEON_CHECK_SUPPORTED */
+
+/* Enable ARM Neon optimizations */
+/* #undef PNG_ARM_NEON_OPT */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Version number of package */
+#define VERSION "1.6.6"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#define restrict __restrict
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+# define __restrict__
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/project/jni/png/include/pnglibconf.h b/project/jni/png/include/pnglibconf.h
index e31ff3dec..31ddb8afa 100644
--- a/project/jni/png/include/pnglibconf.h
+++ b/project/jni/png/include/pnglibconf.h
@@ -6,6 +6,7 @@
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
 
+
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
 /* and license in png.h */
diff --git a/todo.txt b/todo.txt
index 66416b422..482a8f6c9 100644
--- a/todo.txt
+++ b/todo.txt
@@ -20,6 +20,8 @@ Requested features, might never get implemented
 TODO, which will get actually done
 ==================================
 
+- Fix diagonal movements via analog gamepad with AppUsesJoystick=n.
+
 - TeeWorlds: fix Ouya bugs (whole-screen shrink, remove controls from settings), submit to Ouya store.
 
 - UQM: On-screen buttons are re-appearing when using gamepad and switching between game screens.
@@ -30,6 +32,22 @@ TODO, which will get actually done
 
 - OpenArena: move 3-rd person camera to the side, above shoulder.
 
+- OpenArena: chat text input should be faster.
+
+- OpenArena: Shift and Ctrl keys on USB keyboard do not work for text input.
+
+- OpenArena: Play silence if audio buffer underrun.
+
+- OpenArena: When entering with USB keyboard into chatbox, first 't' disappears.
+
+- OpenArena: enable mouse events, make mouse move with HOVER event, remove warnings.
+
+- OpenArena: Help image with controller buttons for Ouya: https://www.dropbox.com/s/ynrso4n8kpkf3b9/OUYA_Controller_Overlay-01.png
+
+- OpenArena: option to switch analog joysticks on gamepad.
+
+- OpenArena: move sliders with left/right arrows by 1/20 of total length.
+
 - SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper.
 
-- UfoAI: huge huge update.
\ No newline at end of file
+- UfoAI: huge huge update.