diff --git a/build.sh b/build.sh
index 0d2245927..a67f6a53f 100755
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,7 @@ NDKBUILDPATH=$PATH
 export `grep "AppFullName=" AndroidAppSettings.cfg`
 if ( grep "package $AppFullName;" project/src/Globals.java > /dev/null && \
 		[ "`readlink AndroidAppSettings.cfg`" -ot "project/src/Globals.java" ] && \
-		[ -z "`find project/java/* -cnewer project/src/Globals.java`" ] && \
+		[ -z "`find project/java/* project/AndroidManifestTemplate.xml -cnewer project/src/Globals.java`" ] && \
 		[ -z "`find project/jni/application/src/AndroidData/* -cnewer project/src/Globals.java`" ] ) ; then true ; else
 	./ChangeAppSettings.sh -a
 	sleep 1
diff --git a/project/java/Globals.java b/project/java/Globals.java
index abcf2a527..def135c37 100644
--- a/project/java/Globals.java
+++ b/project/java/Globals.java
@@ -69,7 +69,7 @@ class Globals {
 	public static boolean UseTouchscreenKeyboard = true;
 	public static int TouchscreenKeyboardSize = 0;
 	public static int TouchscreenKeyboardDrawSize = 1;
-	public static int TouchscreenKeyboardTheme = 1;
+	public static int TouchscreenKeyboardTheme = 2;
 	public static int TouchscreenKeyboardTransparency = 2;
 	public static int AccelerometerSensitivity = 2;
 	public static int AccelerometerCenterPos = 2;
diff --git a/project/java/Settings.java b/project/java/Settings.java
index 5b9c5f9e4..5273dca27 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -2559,8 +2559,8 @@ class Settings
 		{
 			if(Globals.TouchscreenKeyboardTheme < 0)
 				Globals.TouchscreenKeyboardTheme = 0;
-			if(Globals.TouchscreenKeyboardTheme > 2)
-				Globals.TouchscreenKeyboardTheme = 2;
+			if(Globals.TouchscreenKeyboardTheme > 1) // TODO: disabled Sun theme because it's not finished yet
+				Globals.TouchscreenKeyboardTheme = 1;
 
 			if( Globals.TouchscreenKeyboardTheme == 0 )
 			{
diff --git a/project/jni/application/src b/project/jni/application/src
index 0a7ca3edf..104f796a6 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-gemrb-sdl-1.3
\ No newline at end of file
+ballfield
\ No newline at end of file