diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 63c73cc85..ec79d110d 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -25,6 +25,23 @@ echo "===== libSDL on Android configuration ====="
 echo
 echo "If you will supply empty string as answer the previous value will be used"
 
+if [ -z "$Debuggable" -o -z "$AUTO" ]; then
+echo
+echo -n "Debuggable Build? (y) or (n): ($Debuggable): "
+read var
+if [ -n "$var" ] ; then
+
+if [ "$var" = "y" ] ; then
+	Debuggable="true"
+else
+	Debuggable="false"	
+fi
+
+	CHANGED=1
+fi
+fi
+
+
 if [ -z "$LibSdlVersion" -o -z "$AUTO" ]; then
 echo
 echo -n "libSDL version to use (1.2, 1.3, or 2.0) ($LibSdlVersion): "
@@ -766,6 +783,9 @@ echo "# The application settings for Android libSDL port" >> AndroidAppSettings.
 echo >> AndroidAppSettings.cfg
 echo AppSettingVersion=$CHANGE_APP_SETTINGS_VERSION >> AndroidAppSettings.cfg
 echo >> AndroidAppSettings.cfg
+echo "# Debuggable Build? (y) or (n):" >> AndroidAppSettings.cfg
+echo Debuggable=$Debuggable >> AndroidAppSettings.cfg
+echo >> AndroidAppSettings.cfg
 echo "# libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)" >> AndroidAppSettings.cfg
 echo LibSdlVersion=$LibSdlVersion >> AndroidAppSettings.cfg
 echo >> AndroidAppSettings.cfg
@@ -1292,6 +1312,7 @@ echo Patching project/AndroidManifest.xml
 cat project/AndroidManifestTemplate.xml | \
 	sed "s/package=.*/package=\"$AppFullName\"/" | \
 	sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \
+	sed "s/android:debuggable=.*/android:debuggable=\"$Debuggable\"/" | \
 	sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
 	sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" > \
 	project/AndroidManifest.xml
diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg
index eee876ffe..e6127bb83 100644
--- a/project/jni/application/fheroes2/AndroidAppSettings.cfg
+++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg
@@ -2,6 +2,9 @@
 
 AppSettingVersion=19
 
+# Debuggable Build? (y) or (n):
+Debuggable=true
+
 # libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)
 LibSdlVersion=1.2
 
@@ -75,6 +78,10 @@ CompatibilityHacksSlowCompatibleEventQueue=y
 # Save and restore OpenGL state when drawing on-screen keyboard for apps that use SDL_OPENGL
 CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState=
 
+# Application uses SDL_UpdateRects() properly, and does not draw in any region outside those rects.
+# This improves drawing speed, but I know only one application that does that, and it's written by me (y)/(n)
+CompatibilityHacksProperUsageOfSDL_UpdateRects=
+
 # Application uses mouse (y) or (n), this will show mouse emulation dialog to the user
 AppUsesMouse=y
 
@@ -84,6 +91,9 @@ AppNeedsTwoButtonMouse=y
 # Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n)
 ShowMouseCursor=n
 
+# Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n)
+GenerateSubframeTouchEvents=
+
 # Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
 ForceRelativeMouseMode=n
 
@@ -138,6 +148,17 @@ RedefinedKeysScreenKb="LCTRL M SPACE C E C H T S L"
 # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
 RedefinedKeysScreenKbNames="LCTRL M SPACE C E C H T S L"
 
+# 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=1
+
+# Redefine gamepad keys to SDL keysyms, button order is:
+# A B X Y L1 R1 L2 R2 LThumb RThumb
+RedefinedKeysGamepad="LCTRL M SPACE C E C H T S L"
+
 # How long to show startup menu button, in msec, 0 to disable startup menu
 StartupMenuButtonTimeout=3000
 
@@ -159,10 +180,10 @@ MultiABI=n
 AppMinimumRAM=32
 
 # Application version code (integer)
-AppVersionCode=311200
+AppVersionCode=318200
 
 # Application user-visible version name (string)
-AppVersionName="3112.00"
+AppVersionName="3182.00"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n