diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml
index 9c08786ae..bef3c83e7 100644
--- a/project/AndroidManifest.xml
+++ b/project/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.teeworlds"
-      android:versionCode="5201"
-      android:versionName="0.5.2.01"
+      package="com.googlecode.opentyrian"
+      android:versionCode="2108"
+      android:versionName="2.1.08"
       android:installLocation="preferExternal"
 >
     <application android:label="@string/app_name" 
diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 0c092b81b..42bae7536 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -1,6 +1,6 @@
 
 # The namespace in Java file, with dots replaced with underscores
-SDL_JAVA_PACKAGE_PATH := com_teeworlds
+SDL_JAVA_PACKAGE_PATH := com_googlecode_opentyrian
 
 # Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here
 # SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := com_teeworlds
 # Typically /sdcard/alienblaster 
 # Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder
 # Your application will just set current directory there
-SDL_CURDIR_PATH := com.teeworlds
+SDL_CURDIR_PATH := com.googlecode.opentyrian
 
 # Android Dev Phone G1 has trackball instead of cursor keys, and 
 # sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -21,15 +21,15 @@ SDL_TRACKBALL_KEYUP_DELAY := 1
 
 # If the application designed for higher screen resolution enable this to get the screen
 # resized in HW-accelerated way, however it eats a tiny bit of CPU
-SDL_VIDEO_RENDER_RESIZE := 0
+SDL_VIDEO_RENDER_RESIZE := 1
 
-COMPILED_LIBRARIES := sdl_image sdl_mixer
+COMPILED_LIBRARIES := sdl_net
 
-APPLICATION_ADDITIONAL_CFLAGS := -O2 -DCONF_FAMILY_UNIX=1
+APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
 
-APPLICATION_ADDITIONAL_LDFLAGS := -Lbin/ndk/local/armeabi -lfreetype
+APPLICATION_ADDITIONAL_LDFLAGS := 
 
-SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=RSHIFT -DSDL_ANDROID_KEYCODE_2=KP_PLUS -DSDL_ANDROID_KEYCODE_3=KP_MINUS -DSDL_ANDROID_KEYCODE_4=ESCAPE -DSDL_ANDROID_KEYCODE_5=F10
+SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=SPACE -DSDL_ANDROID_KEYCODE_1=RETURN -DSDL_ANDROID_KEYCODE_2=LCTRL -DSDL_ANDROID_KEYCODE_3=LALT -DSDL_ANDROID_KEYCODE_4=RETURN
 
 # If SDL_Mixer should link to libMAD
 SDL_MIXER_USE_LIBMAD :=
diff --git a/project/jni/Application.mk b/project/jni/Application.mk
index fdf135509..5d0b6ce4e 100644
--- a/project/jni/Application.mk
+++ b/project/jni/Application.mk
@@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/..
 # sdl_image depends on png and jpeg
 # sdl_ttf depends on freetype
 
-APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_image sdl_mixer
+APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_net
 
 APP_ABI := armeabi
diff --git a/project/jni/application/src b/project/jni/application/src
index 299033683..7fa7b8f4e 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-teeworlds
\ No newline at end of file
+opentyrian
\ No newline at end of file
diff --git a/project/res/values/strings.xml b/project/res/values/strings.xml
index 6a74a6572..bdeb1e31a 100644
--- a/project/res/values/strings.xml
+++ b/project/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">TeeWorlds</string>
+    <string name="app_name">OpenTyrian</string>
 </resources>
diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java
index a6a1efd6d..b46b829e0 100644
--- a/project/src/Accelerometer.java
+++ b/project/src/Accelerometer.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/Audio.java b/project/src/Audio.java
index 4e601c64f..8e2da1863 100644
--- a/project/src/Audio.java
+++ b/project/src/Audio.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 
 import android.app.Activity;
diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java
index 9e13aa72f..13c2dafe4 100644
--- a/project/src/DataDownloader.java
+++ b/project/src/DataDownloader.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java
index aa2c30c3a..25aca20b7 100644
--- a/project/src/GLSurfaceView_SDL.java
+++ b/project/src/GLSurfaceView_SDL.java
@@ -18,7 +18,7 @@
    fixed with a hammer and rasp to work with libSDL port */
 
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import java.io.Writer;
 import java.util.ArrayList;
diff --git a/project/src/Globals.java b/project/src/Globals.java
index 7601e6cc3..57eb31bdd 100644
--- a/project/src/Globals.java
+++ b/project/src/Globals.java
@@ -1,14 +1,14 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import android.app.Activity;
 import android.content.Context;
 
 class Globals {
-	public static String ApplicationName = "TeeWorlds";
+	public static String ApplicationName = "OpenTyrian";
 
 	// Should be zip file
-	public static String DataDownloadUrl = "Game data is 5 Mb|http://sourceforge.net/projects/libsdl-android/files/TeeWorlds/teeworlds.zip/download";
+	public static String DataDownloadUrl = "Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip";
 
 	// Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D
 	public static boolean NeedDepthBuffer = false;
@@ -27,7 +27,7 @@ class Globals {
 	
 	public static boolean AppUsesMultitouch = false;
 
-	public static int AppTouchscreenKeyboardKeysAmount = 2;
+	public static int AppTouchscreenKeyboardKeysAmount = 4;
 
 	public static int AppTouchscreenKeyboardKeysAmountAutoFire = 1;
 
@@ -48,5 +48,5 @@ class Globals {
 }
 
 class LoadLibrary {
-	public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_mixer"); };
+	public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_net"); };
 }
diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java
index 86a9341ee..8af915268 100644
--- a/project/src/MainActivity.java
+++ b/project/src/MainActivity.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/Settings.java b/project/src/Settings.java
index 363a9db58..655a44976 100644
--- a/project/src/Settings.java
+++ b/project/src/Settings.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/Video.java b/project/src/Video.java
index c600aae45..01411d628 100644
--- a/project/src/Video.java
+++ b/project/src/Video.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.teeworlds;
+package com.googlecode.opentyrian;
 
 import javax.microedition.khronos.opengles.GL10;