diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 30e98be35..07c011b6c 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 30e98be3582cca3009f371ca2f9a7334e24e1582
+Subproject commit 07c011b6ccb275fc2b69dbd6e7ee8dba6223e59a
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index 278f04520..4b83db91a 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 278f045202ff1bc0c1911b6c3d441909ba93ee87
+Subproject commit 4b83db91ab39b9cae27f087fe1a0a8ba9f30d43d
diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src
index e5489c8c0..34b64249c 160000
--- a/project/jni/application/teeworlds/src
+++ b/project/jni/application/teeworlds/src
@@ -1 +1 @@
-Subproject commit e5489c8c089e57d88bbaa90df0176d5e5d4c6351
+Subproject commit 34b64249c46a90ce127f32b3ef41a565b8a70a61
diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
index 126cc5231..77e2390cb 100644
--- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
@@ -175,10 +175,10 @@ MultiABI=armeabi-v7a
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=28206
+AppVersionCode=28207
 
 # Application user-visible version name (string)
-AppVersionName="2.8.2.06"
+AppVersionName="2.8.2.07"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index 96e628554..bbbd904f9 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -58,7 +58,7 @@ xkb/.libs/libxkbstubs.a \
 composite/.libs/libcomposite.a \
 os/.libs/libos.a \
 hw/kdrive/linux/.libs/liblinux.a \
--lpixman-1 -lXfont -lXau -lXdmcp -lfontenc -lts -lfreetype' \
+-lpixman-1 -lXfont -lXau -lXdmcp -lfontenc -lts -lfreetype -landroid-shmem' \
 || exit 1
 
 #-lfreetype is inside -lsdl_ttf
diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index 3e5ad2450..f3954b4f8 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/project/jni/application/xserver/gfx.c
@@ -36,7 +36,7 @@ void * unpackFilesThread(void * unused)
 	if( stat( fname, &st ) == 0 )
 	{
 		unpackFinished = 1;
-		return 1;
+		return (void *)1;
 	}
 
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Unpacking data");
@@ -49,7 +49,7 @@ void * unpackFilesThread(void * unused)
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot copy busybox");
 		unpackFinished = 1;
-		return 0;
+		return (void *)0;
 	}
 
 	for(;;)
@@ -60,7 +60,7 @@ void * unpackFilesThread(void * unused)
 		{
 			__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot copy busybox");
 			unpackFinished = 1;
-			return 1;
+			return (void *)1;
 		}
 		fwrite( buf, 1, cnt, fo );
 		if( cnt < sizeof(buf) )
@@ -74,7 +74,7 @@ void * unpackFilesThread(void * unused)
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot chmod busybox");
 		unpackFinished = 1;
-		return 0;
+		return (void *)0;
 	}
 
 	if( stat( "data.tar.gz", &st ) == 0 )
@@ -92,7 +92,7 @@ void * unpackFilesThread(void * unused)
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Error extracting data");
 		unpackFinished = 1;
-		return 0;
+		return (void *)0;
 	}
 
 	int unpackProgressKb = 0;
@@ -104,7 +104,7 @@ void * unpackFilesThread(void * unused)
 		{
 			__android_log_print(ANDROID_LOG_INFO, "XSDL", "Error extracting data");
 			unpackFinished = 1;
-			return 1;
+			return (void *)1;
 		}
 		fwrite( buf, 1, cnt, fo );
 		if( cnt < sizeof(buf) )
@@ -122,7 +122,7 @@ void * unpackFilesThread(void * unused)
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Error extracting data");
 		unpackFinished = 1;
-		return 0;
+		return (void *)0;
 	}
 
 	remove("data.tar.gz");
@@ -135,7 +135,7 @@ void * unpackFilesThread(void * unused)
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "No postinstall script");
 		unpackFinished = 1;
-		return 1;
+		return (void *)1;
 	}
 
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Running postinstall scipt");
@@ -145,7 +145,7 @@ void * unpackFilesThread(void * unused)
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "ERROR: Cannot launch postinstall scipt");
 		unpackFinished = 1;
-		return 0;
+		return (void *)0;
 	}
 	for(;;)
 	{
@@ -158,7 +158,7 @@ void * unpackFilesThread(void * unused)
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Postinstall scipt exited with status %d", pclose(fo));
 
 	unpackFinished = 1;
-	return 1;
+	return (void *)1;
 }
 
 void XSDL_unpackFiles()
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index b4dd6771e..0669077a6 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit b4dd6771eb3d6e2e9f062373776cb9a20b187949
+Subproject commit 0669077a6d5623c40f150d9a4530d9f00874849f