diff --git a/.gitignore b/.gitignore
index b9564a031..500d6ce7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,8 @@ project/jni/application/*/libapplication*.so
 project/jni/application/src
 project/res/drawable-xhdpi/ouya_icon.png
 project/res/drawable/app_icon.png
+project/proguard-project.txt
+project/themes/converter
+
+
 
diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src
index 1eb04e501..6a61afd4a 160000
--- a/project/jni/application/hid-pc-keyboard/src
+++ b/project/jni/application/hid-pc-keyboard/src
@@ -1 +1 @@
-Subproject commit 1eb04e5013dcbf5bd3536cc959b04f474c3cbafd
+Subproject commit 6a61afd4a2d5422f841abe720cee8fb99cb0ce96
diff --git a/project/jni/application/openttd/.gitignore b/project/jni/application/openttd/.gitignore
new file mode 100644
index 000000000..2b107e500
--- /dev/null
+++ b/project/jni/application/openttd/.gitignore
@@ -0,0 +1 @@
+openttd-build-*
diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index 71cd02542..393d3f93b 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -2,7 +2,7 @@
 
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
-VER=1.4.0-beta5
+VER=build
 
 [ -d openttd-$VER-$1 ] || mkdir -p openttd-$VER-$1/bin/baseset
 
diff --git a/project/jni/application/supertux/.gitignore b/project/jni/application/supertux/.gitignore
new file mode 100644
index 000000000..137d334da
--- /dev/null
+++ b/project/jni/application/supertux/.gitignore
@@ -0,0 +1 @@
+supertux
diff --git a/project/jni/application/teeworlds/.gitignore b/project/jni/application/teeworlds/.gitignore
new file mode 100644
index 000000000..b52e154fa
--- /dev/null
+++ b/project/jni/application/teeworlds/.gitignore
@@ -0,0 +1 @@
+AndroidData
diff --git a/project/jni/application/xserver-debian/xserver b/project/jni/application/xserver-debian/xserver
index 5eecca50c..3cce1acc1 160000
--- a/project/jni/application/xserver-debian/xserver
+++ b/project/jni/application/xserver-debian/xserver
@@ -1 +1 @@
-Subproject commit 5eecca50cbd8bad6eb9d2804094b0a603413ff8f
+Subproject commit 3cce1acc1f943ded8491e1be814aebfce6e09023
diff --git a/project/jni/application/xserver/.gitignore b/project/jni/application/xserver/.gitignore
index 5761abcfd..8b4cf3c1c 100644
--- a/project/jni/application/xserver/.gitignore
+++ b/project/jni/application/xserver/.gitignore
@@ -1 +1,3 @@
 *.o
+AndroidData/binaries-*
+tmp-*
diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg
index 433eadff1..7315a3190 100644
--- a/project/jni/application/xserver/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="XServer XSDL"
 AppFullName=x.org.server
 
 # Application version code (integer)
-AppVersionCode=11115
+AppVersionCode=11116
 
 # Application user-visible version name (string)
-AppVersionName="1.11.15"
+AppVersionName="1.11.16"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -21,7 +21,7 @@ AppVersionName="1.11.15"
 AppDataDownloadUrl="!!Data files|:data.tar.gz:data-1.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^Additional fonts (90Mb)|:xfonts.tar.gz:http://sourceforge.net/projects/libsdl-android/files/apk/XServer-XSDL/xfonts.tgz/download"
 
 # Reset SDL config when updating application to the new version (y) / (n)
-ResetSdlConfigForThisVersion=y
+ResetSdlConfigForThisVersion=n
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
 DeleteFilesOnUpgrade="%"
diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c
index d21a97be8..7d48072bc 100644
--- a/project/jni/application/xserver/main.c
+++ b/project/jni/application/xserver/main.c
@@ -51,12 +51,10 @@ int main( int argc, char* argv[] )
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Actual video resolution %d/%dx%d/%d", resolutionW, displayW, resolutionH, displayH);
 	setupEnv();
 
-	SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_0, 0);
-	SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_1, 0);
-	SDL_ANDROID_SetScreenKeyboardButtonShown(SDL_ANDROID_SCREENKEYBOARD_BUTTON_2, 0);
+	SDL_ANDROID_SetScreenKeyboardShown(0);
 
 	XSDL_initSDL();
-	
+
 	XSDL_unpackFiles();
 
 	XSDL_showConfigMenu(&resolutionW, &displayW, &resolutionH, &displayH);
@@ -164,6 +162,8 @@ int main( int argc, char* argv[] )
 		argnum += 2;
 	}
 
+	SDL_ANDROID_SetScreenKeyboardShown(1);
+
 	if( screenButtons )
 	{
 		SDL_Rect pos;