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/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/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/todo.txt b/todo.txt
index 058725f05..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.