diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 640aa2a3..8ab4ff7a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,7 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="in.celest.xash3d.hl"
       android:versionCode="0"
-      android:versionName="0.15pre"
+      android:versionName="0.15"
       android:installLocation="auto">
 
     <!-- Create a Java class extending SDLActivity and place it in a
@@ -27,7 +27,7 @@
 				  android:windowSoftInputMode="adjustResize"
                   >
 			<intent-filter>
-						<action android:name=".LauncherActivity"/>
+						<action android:name="in.celest.xash3d.LauncherActivity"/>
                         <action android:name="android.intent.action.MAIN" />
                         <category android:name="android.intent.category.LAUNCHER" />
         	</intent-filter>
@@ -64,7 +64,7 @@
     </application>
 
     <!-- Android 2.3 -->
-    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14" />
 
     <!-- OpenGL ES 1.1 -->
     <uses-feature android:glEsVersion="0x00010000" /> 
diff --git a/build-test.sh b/build-test.sh
new file mode 100644
index 00000000..ba14de6d
--- /dev/null
+++ b/build-test.sh
@@ -0,0 +1,13 @@
+ANDROID_JAR=../android-13.jar
+AAPT=./../aapt
+DX=./../dx
+APKBUILDER=./../apkbuilder
+mkdir gen
+mkdir bin
+$AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
+$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR:libs/com.bda.controller.jar src/org/libsdl/app/SDLActivity.java src/com/beloko/games/hl/NativeLib.java src/com/beloko/touchcontrols/* gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*  
+$DX --dex --output=bin/classes.dex bin/classes/ libs/com.bda.controller.jar
+/mnt/app/apktool/aapt package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
+zip bin/xash3d.apk.unaligned assets/*
+$APKBUILDER bin/xash3d.apk -u -nf libs/ -rj libs -f bin/classes.dex -z bin/xash3d.apk.unaligned
+java -jar /mnt/app/apktool/signapk.jar /mnt/app/apktool/testkey.x509.pem /mnt/app/apktool/testkey.pk8 bin/xash3d.apk bin/xash3d-signed.apk
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b7f49b48..779bda62 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Half-life</string>
+    <string name="app_name">Xash3D</string>
 	<string name="launcher_name">Xash3D</string>
+	<string name="launcher_name_test">Xash3D_test</string>
     <string-array name="double_tap_actions">
         <item>None</item>
         <item>Shoot</item>
@@ -22,6 +23,7 @@
     <string name="hello_world">Hello world!</string>
 	<string name="touch_set">Controls settings</string>
 	<string name="text_shortcut">Xash3D shortcut</string>
+	<string name="text_shortcut_test">Xash3D_test shortcut</string>
 	<string name="shortcut_button_save">Save shortcut</string>
 	<string name="gamedir">Mod directory</string>
 	<string name="shortcut_name">Shortcut name</string>
diff --git a/src/com/beloko/touchcontrols/TouchControlsSettings.java b/src/com/beloko/touchcontrols/TouchControlsSettings.java
index 8101cb56..2d420337 100644
--- a/src/com/beloko/touchcontrols/TouchControlsSettings.java
+++ b/src/com/beloko/touchcontrols/TouchControlsSettings.java
@@ -71,12 +71,17 @@ public class TouchControlsSettings {
 				}
 				 */
 				Button add_rem_button = (Button)dialog.findViewById(R.id.add_remove_button);
+				if(quakeIf != null)
+				{
 				add_rem_button.setOnClickListener(new OnClickListener() {
 					@Override
 					public void onClick(View v) {
 						TouchControlsEditing.show(activity);
 					}
 				});
+				}
+				else
+				add_rem_button.setEnabled(false);
 
 				alphaSeek.setProgress(alpha);
 				fwdSeek.setProgress(fwdSens);
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
new file mode 100644
index 00000000..6c817ec0
--- /dev/null
+++ b/test/AndroidManifest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Replace org.libsdl.app with the identifier of your game below, e.g.
+     com.gamemaker.game
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="in.celest.xash3d.hl.test"
+      android:versionCode="0"
+      android:versionName="0.15pre"
+      android:installLocation="auto">
+
+    <!-- Create a Java class extending SDLActivity and place it in a
+         directory under src matching the package, e.g.
+         	src/com/gamemaker/game/MyGame.java
+
+         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
+         in the XML below.
+
+         An example Java class can be found in README-android.txt
+    -->
+    <application android:label="@string/launcher_name_test"
+                 android:icon="@drawable/ic_launcher"
+                 android:allowBackup="true"
+                 
+                 android:hardwareAccelerated="true">
+        <activity android:name="in.celest.xash3d.LauncherActivity"
+                  android:label="@string/launcher_name_test"
+				  android:windowSoftInputMode="adjustResize"
+                  >
+			<intent-filter>
+						<action android:name="in.celest.xash3d.LauncherActivity"/>
+                        <action android:name="android.intent.action.MAIN" />
+                        <category android:name="android.intent.category.LAUNCHER" />
+        	</intent-filter>
+        </activity>
+		<activity android:name="in.celest.xash3d.ShortcutActivity" android:label="@string/text_shortcut_test" android:theme="@android:style/Theme.Dialog">
+			<intent-filter>
+				<action android:name="android.intent.action.CREATE_SHORTCUT" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+	<activity android:name="org.libsdl.app.SDLActivity"
+	   android:screenOrientation="sensorLandscape"
+	   android:configChanges="orientation|screenSize"
+		android:windowSoftInputMode="adjustResize"
+	   android:label="@string/app_name"
+		android:taskAffinity="org.libsdl.app.SDLActivity"
+	   >
+		<!--<intent-filter>
+			As user can add now empty shortcut, disable this
+			<action android:name="org.libsdl.app.SDLActivity"/>
+			<action android:name="android.intent.action.MAIN" />
+			<category android:name="android.intent.category.LAUNCHER" />
+		</intent-filter>-->
+		<intent-filter>
+			<action android:name="android.intent.action.VIEW"/>
+			<category android:name="android.intent.category.DEFAULT" />
+			<data android:mimeType="xash3d.android/game"/>
+		</intent-filter>
+	</activity>
+	<activity android:name="in.celest.xash3d.XashActivity"
+		android:screenOrientation="landscape"
+		android:label="@string/app_name">
+	</activity> 
+    </application>
+
+    <!-- Android 2.3 -->
+    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="9" />
+
+    <!-- OpenGL ES 1.1 -->
+    <uses-feature android:glEsVersion="0x00010000" /> 
+
+    <!-- Allow writing to external storage -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
+    <uses-permission android:name="android.permission.INTERNET" /> 
+</manifest> 
diff --git a/test/res/drawable b/test/res/drawable
new file mode 120000
index 00000000..7be9e630
--- /dev/null
+++ b/test/res/drawable
@@ -0,0 +1 @@
+../../res/drawable
\ No newline at end of file
diff --git a/test/res/drawable-hdpi/ic_launcher.png b/test/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..8ec8cec5
Binary files /dev/null and b/test/res/drawable-hdpi/ic_launcher.png differ
diff --git a/test/res/drawable-mdpi/ic_launcher.png b/test/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..dd751c75
Binary files /dev/null and b/test/res/drawable-mdpi/ic_launcher.png differ
diff --git a/test/res/drawable-xhdpi/ic_launcher.png b/test/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..bd51c964
Binary files /dev/null and b/test/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/test/res/layout b/test/res/layout
new file mode 120000
index 00000000..bdccb1bc
--- /dev/null
+++ b/test/res/layout
@@ -0,0 +1 @@
+../../res/layout/
\ No newline at end of file
diff --git a/test/res/values b/test/res/values
new file mode 120000
index 00000000..aa747e03
--- /dev/null
+++ b/test/res/values
@@ -0,0 +1 @@
+../../res/values/
\ No newline at end of file
diff --git a/test/res/values-ru b/test/res/values-ru
new file mode 120000
index 00000000..b8b3365a
--- /dev/null
+++ b/test/res/values-ru
@@ -0,0 +1 @@
+../../res/values-ru/
\ No newline at end of file