diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
index 3e202b660..c5166473f 100644
--- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
@@ -23,10 +23,10 @@ AppVersionName="20.01.07"
 AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:logo.png:logo.png^!!Sloppy symlinks patch|:symlinks.tar.xz:symlinks-<ARCH>.tar.xz^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz"
 
 # 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="busybox usr tmp pulseaudio.conf libsdl-DownloadFinished-0.flag libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag"
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag"
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
@@ -299,7 +299,7 @@ AppSubdirsBuild=''
 AppBuildExclude=''
 
 # Application command line parameters, including app name as 0-th param
-AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 1200 -exec $SECURE_STORAGE_DIR/usr/bin/xloadimage	-onroot	-fullscreen	$UNSECURE_STORAGE_DIR/logo.png	;	logwrapper	$SECURE_STORAGE_DIR/img/proot.sh	/startx.sh'
+AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 1200 -exec $SECURE_STORAGE_DIR/usr/bin/start-debian.sh'
 
 # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
 # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge
diff --git a/project/jni/application/xserver-debian/AndroidData/start-debian.sh b/project/jni/application/xserver-debian/AndroidData/start-debian.sh
new file mode 100755
index 000000000..842cf819f
--- /dev/null
+++ b/project/jni/application/xserver-debian/AndroidData/start-debian.sh
@@ -0,0 +1,5 @@
+#!/system/bin/sh
+
+$SECURE_STORAGE_DIR/usr/bin/xloadimage -onroot -fullscreen $UNSECURE_STORAGE_DIR/logo.png
+
+logwrapper $SECURE_STORAGE_DIR/img/proot.sh /startx.sh
diff --git a/project/jni/application/xserver-debian/debian-image b/project/jni/application/xserver-debian/debian-image
index d8c195633..f8817d16f 160000
--- a/project/jni/application/xserver-debian/debian-image
+++ b/project/jni/application/xserver-debian/debian-image
@@ -1 +1 @@
-Subproject commit d8c195633777611f3c366b14f3cf43d56071c2f3
+Subproject commit f8817d16f610ee1b61fb7efb07b09e5d7c4d1a9e
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index b68df0dc5..d356d2510 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -89,6 +89,7 @@ cp -f $CURDIR/debian-image/proot-prebuilt/$1/* ./
 cp -f $CURDIR/debian-image/dist/proot.sh ./
 cp -f $CURDIR/debian-image/dist/postinstall-img.sh ./
 cp -f $CURDIR/AndroidData/postinstall.sh ./
+cp -f $CURDIR/AndroidData/start-debian.sh ./
 
 rm -f ../AndroidData/binaries-$1.zip
 rm -rf ../AndroidData/lib/$1
diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index 892554cb2..a2454f076 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/project/jni/application/xserver/gfx.c
@@ -84,7 +84,8 @@ static int unpackFiles(const char *archive, const char *script, const char *dele
 	if( strlen(deleteOldDataMarkerFile) > 0 && stat( fname2, &st ) == 0 )
 	{
 		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Upgrade detected, showing warning dialog");
-		upgradeWarning = UPGRADE_WARNING_PROCEED;
+		//upgradeWarning = UPGRADE_WARNING_PROCEED;
+		upgradeWarning = UPGRADE_WARNING_CANCEL;
 		/*
 		upgradeWarning = UPGRADE_WARNING_ASK;
 		while( upgradeWarning == UPGRADE_WARNING_ASK )
diff --git a/project/jni/application/xserver/java.patch b/project/jni/application/xserver/java.patch
index 064f506ad..282bb65d5 100644
--- a/project/jni/application/xserver/java.patch
+++ b/project/jni/application/xserver/java.patch
@@ -161,11 +161,12 @@
 +}
 --- Settings.java
 +++ Settings.java
-@@ -636,6 +636,7 @@ public class Settings
+@@ -637,6 +638,8 @@
  
  	static void setEnvVars(MainActivity p)
  	{
 +		nativeSetEnv( "AUDIO_NATIVE_SAMPLE_RATE", String.valueOf(android.media.AudioTrack.getNativeOutputSampleRate(android.media.AudioManager.STREAM_MUSIC)) );
++		nativeSetEnv( "OS_VERSION", System.getProperty("os.version", "4.0.0") );
  		String lang = new String(Locale.getDefault().getLanguage());
  		if( Locale.getDefault().getCountry().length() > 0 )
  			lang = lang + "_" + Locale.getDefault().getCountry();