diff --git a/project/java/Video.java b/project/java/Video.java
index fb121fbb8..aa813587f 100644
--- a/project/java/Video.java
+++ b/project/java/Video.java
@@ -444,19 +444,27 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
 
 	public int swapBuffers() // Called from native code
 	{
-		synchronized(this)
-		{
-			this.notify();
-		}
 		if( ! super.SwapBuffers() && Globals.NonBlockingSwapBuffers )
+		{
+			synchronized(this)
+			{
+				this.notify();
+			}
 			return 0;
+		}
+
 		if(mGlContextLost) {
 			mGlContextLost = false;
 			Settings.SetupTouchscreenKeyboardGraphics(context); // Reload on-screen buttons graphics
 			DrawLogo(mGl);
 			super.SwapBuffers();
 		}
-		
+
+		// Unblock event processing thread only after we've finished rendering
+		synchronized(this)
+		{
+			this.notify();
+		}
 		return 1;
 	}
 
@@ -600,7 +608,7 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL {
 	public void limitEventRate(final MotionEvent event)
 	{
 		// Wait a bit, and try to synchronize to app framerate, or event thread will eat all CPU and we'll lose FPS
-		// With Froyo the rate of touch events is limited, but they are arriving faster then we're redrawing anyway
+		// With Froyo the rate of touch events seems to be limited by OS, but they are arriving faster then we're redrawing anyway
 		if((event.getAction() == MotionEvent.ACTION_MOVE ||
 			event.getAction() == MotionEvent.ACTION_HOVER_MOVE))
 		{
diff --git a/project/jni/application/milkytracker/AndroidAppSettings.cfg b/project/jni/application/milkytracker/AndroidAppSettings.cfg
index d4be9d125..e2019d259 100644
--- a/project/jni/application/milkytracker/AndroidAppSettings.cfg
+++ b/project/jni/application/milkytracker/AndroidAppSettings.cfg
@@ -31,10 +31,10 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SPACE TAB PLUS MINUS RETURN ESCAPE DELETE"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig'
-FirstStartMenuOptions=''
+FirstStartMenuOptions='new Settings.DummyMenu()'
 MultiABI=n
-AppVersionCode=0908504
-AppVersionName="0.90.85.04"
+AppVersionCode=0908505
+AppVersionName="0.90.85.05"
 ResetSdlConfigForThisVersion=y
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="jpeg png zzip"
diff --git a/project/jni/application/milkytracker/AndroidBuild.sh b/project/jni/application/milkytracker/AndroidBuild.sh
index b8d8cafc9..361269b1b 100755
--- a/project/jni/application/milkytracker/AndroidBuild.sh
+++ b/project/jni/application/milkytracker/AndroidBuild.sh
@@ -6,12 +6,15 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
 
+[ -d milkytracker-0.90.85 ] || { curl "http://www.milkytracker.org/files/milkytracker-0.90.85.tar.bz2" | bunzip2 | tar xv && patch -p0 < milkytrackey-0.90.85-android.diff || exit 1 ; }
+
 if [ \! -f milkytracker-0.90.85/configure ] ; then
 	sh -c "cd milkytracker-0.90.85 && ./autogen.sh"
 fi
 
 if [ \! -f milkytracker-0.90.85/Makefile ] ; then
+	env CFLAGS=-D__LOWRES__ \
 	../setEnvironment.sh sh -c "cd milkytracker-0.90.85 && ZZIP_CFLAGS='-I$LOCAL_PATH/../../zzip/include' ZZIP_LIBS='-L$LOCAL_PATH/../../../obj/local/armeabi -lzzip' LIBS=-lgnustl_static ./configure --host=arm-linux-androideabi"
 fi
 
-make -C milkytracker-0.90.85 && mv -f milkytracker-0.90.85/src/tracker/milkytracker libapplication.so
+make -j4 -C milkytracker-0.90.85 && mv -f milkytracker-0.90.85/src/tracker/milkytracker libapplication.so
diff --git a/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff b/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff
index 3e75056d3..64434e2c3 100644
--- a/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff
+++ b/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff
@@ -1,6 +1,3 @@
-Only in milkytracker-0.90.85: config.h
-Only in milkytracker-0.90.85: config.log
-Only in milkytracker-0.90.85: config.status
 diff -u -r milkytracker-0.90.85-old/configure milkytracker-0.90.85/configure
 --- milkytracker-0.90.85-old/configure	2010-01-02 02:03:37.000000000 +0200
 +++ milkytracker-0.90.85/configure	2011-07-04 16:43:35.374937729 +0300
@@ -100,220 +97,6 @@ diff -u -r milkytracker-0.90.85-old/configure milkytracker-0.90.85/configure
  SDL_VERSION=1.2.0
  
  # Check whether --with-sdl-prefix was given.
-@@ -5774,7 +5688,7 @@
- 
-   rm -f conf.sdltest
- 
--CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__"
-+CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__ -D__LOWRES__"
- 
- # Check that SDL supports the X11 wm
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SDL supports X11" >&5
-Only in milkytracker-0.90.85: Makefile
-Only in milkytracker-0.90.85/src/compression: DecompressorGZIP.o
-Only in milkytracker-0.90.85/src/compression: DecompressorLHA.o
-Only in milkytracker-0.90.85/src/compression: DecompressorLZX.o
-Only in milkytracker-0.90.85/src/compression: Decompressor.o
-Only in milkytracker-0.90.85/src/compression: DecompressorPP20.o
-Only in milkytracker-0.90.85/src/compression: DecompressorUMX.o
-Only in milkytracker-0.90.85/src/compression: DecompressorZIP.o
-Only in milkytracker-0.90.85/src/compression: .deps
-Only in milkytracker-0.90.85/src/compression: libcompression.a
-Only in milkytracker-0.90.85/src/compression: Makefile
-Only in milkytracker-0.90.85/src/compression: MyIO.o
-Only in milkytracker-0.90.85/src/compression: PP20.o
-Only in milkytracker-0.90.85/src/compression: unlha.o
-Only in milkytracker-0.90.85/src/compression: unlzx.o
-Only in milkytracker-0.90.85/src/compression: ZipExtractor.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: .deps
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: dir.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: err.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: fetch.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: file.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: fseeko.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: info.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: libzzip.a
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: Makefile
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: plugin.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: stat.o
-Only in milkytracker-0.90.85/src/compression/zziplib/generic: zip.o
-Only in milkytracker-0.90.85/src/fx: Camera.o
-Only in milkytracker-0.90.85/src/fx: .deps
-Only in milkytracker-0.90.85/src/fx: Filter.o
-Only in milkytracker-0.90.85/src/fx: Fire.o
-Only in milkytracker-0.90.85/src/fx: fpmath.o
-Only in milkytracker-0.90.85/src/fx: libfx.a
-Only in milkytracker-0.90.85/src/fx: Makefile
-Only in milkytracker-0.90.85/src/fx: Math3d.o
-Only in milkytracker-0.90.85/src/fx: ParticleBlobs.o
-Only in milkytracker-0.90.85/src/fx: ParticleEmitter.o
-Only in milkytracker-0.90.85/src/fx: ParticleFun.o
-Only in milkytracker-0.90.85/src/fx: ParticleFX.o
-Only in milkytracker-0.90.85/src/fx: ParticleScene.o
-Only in milkytracker-0.90.85/src/fx: Starfield.o
-Only in milkytracker-0.90.85/src/fx: TCBSpline.o
-Only in milkytracker-0.90.85/src/fx: TCBSplineTest.o
-Only in milkytracker-0.90.85/src/fx: TexturedGrid.o
-Only in milkytracker-0.90.85/src/fx: TexturedPlane.o
-Only in milkytracker-0.90.85/src/fx: Texture.o
-Only in milkytracker-0.90.85/src/fx: TwisterFX.o
-Only in milkytracker-0.90.85/src/fx: Twister.o
-Only in milkytracker-0.90.85/src: Makefile
-Only in milkytracker-0.90.85/src/midi: .deps
-Only in milkytracker-0.90.85/src/midi: Makefile
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriver_ALSA.o
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriverBase.o
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriver_JACK.o
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriverManager.o
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriver_NULL.o
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriver_SDL.o
-Only in milkytracker-0.90.85/src/milkyplay: AudioDriver_WAVWriter.o
-Only in milkytracker-0.90.85/src/milkyplay: ChannelMixer.o
-Only in milkytracker-0.90.85/src/milkyplay: .deps
-Only in milkytracker-0.90.85/src/milkyplay: ExporterXM.o
-Only in milkytracker-0.90.85/src/milkyplay: libmilkyplay.a
-Only in milkytracker-0.90.85/src/milkyplay: LittleEndian.o
-Only in milkytracker-0.90.85/src/milkyplay: Loader669.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderAMF.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderAMS.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderCBA.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderDBM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderDIGI.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderDSM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderDTM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderFAR.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderGDM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderIMF.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderIT.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderMDL.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderMOD.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderMTM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderMXM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderOKT.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderPLM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderPSM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderPTM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderS3M.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderSTM.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderULT.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderUNI.o
-Only in milkytracker-0.90.85/src/milkyplay: LoaderXM.o
-Only in milkytracker-0.90.85/src/milkyplay: Makefile
-Only in milkytracker-0.90.85/src/milkyplay: MasterMixer.o
-Only in milkytracker-0.90.85/src/milkyplay: PlayerBase.o
-Only in milkytracker-0.90.85/src/milkyplay: PlayerGeneric.o
-Only in milkytracker-0.90.85/src/milkyplay: PlayerSTD.o
-Only in milkytracker-0.90.85/src/milkyplay: ResamplerFactory.o
-Only in milkytracker-0.90.85/src/milkyplay: SampleLoaderAbstract.o
-Only in milkytracker-0.90.85/src/milkyplay: SampleLoaderAIFF.o
-Only in milkytracker-0.90.85/src/milkyplay: SampleLoaderALL.o
-Only in milkytracker-0.90.85/src/milkyplay: SampleLoaderGeneric.o
-Only in milkytracker-0.90.85/src/milkyplay: SampleLoaderIFF.o
-Only in milkytracker-0.90.85/src/milkyplay: SampleLoaderWAV.o
-Only in milkytracker-0.90.85/src/milkyplay: XIInstrument.o
-Only in milkytracker-0.90.85/src/milkyplay: XMFile.o
-Only in milkytracker-0.90.85/src/milkyplay: XModule.o
-Only in milkytracker-0.90.85/src/ppui: Button.o
-Only in milkytracker-0.90.85/src/ppui: CheckBox.o
-Only in milkytracker-0.90.85/src/ppui: Container.o
-Only in milkytracker-0.90.85/src/ppui: ContextMenu.o
-Only in milkytracker-0.90.85/src/ppui: Control.o
-Only in milkytracker-0.90.85/src/ppui: .deps
-Only in milkytracker-0.90.85/src/ppui: DialogBase.o
-Only in milkytracker-0.90.85/src/ppui: DialogFileSelector.o
-Only in milkytracker-0.90.85/src/ppui: DictionaryKey.o
-Only in milkytracker-0.90.85/src/ppui: Dictionary.o
-Only in milkytracker-0.90.85/src/ppui: DisplayDeviceFB_SDL.o
-Only in milkytracker-0.90.85/src/ppui: DisplayDevice_SDL.o
-Only in milkytracker-0.90.85/src/ppui: Event.o
-Only in milkytracker-0.90.85/src/ppui: Font.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_15BIT.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_16BIT.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_24bpp_generic.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_32bpp_generic.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_ARGB32.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_BGR24.o
-Only in milkytracker-0.90.85/src/ppui: Graphics_BGR24_SLOW.o
-Only in milkytracker-0.90.85/src/ppui: KeyboardBindingHandler.o
-Only in milkytracker-0.90.85/src/ppui: libppui.a
-Only in milkytracker-0.90.85/src/ppui: ListBoxFileBrowser.o
-Only in milkytracker-0.90.85/src/ppui: ListBox.o
-Only in milkytracker-0.90.85/src/ppui: Makefile
-Only in milkytracker-0.90.85/src/ppui: Menu.o
-Only in milkytracker-0.90.85/src/ppui: MessageBoxContainer.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: .deps
-Only in milkytracker-0.90.85/src/ppui/osinterface: libosinterface.a
-Only in milkytracker-0.90.85/src/ppui/osinterface: Makefile
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPMessageBox_SDL.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPMutex.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPOpenPanel_SDL.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPPathFactory.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPPath_POSIX.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPQuitSaveAlert_SDL.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPSavePanel_SDL.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: PPSystem_POSIX.o
-Only in milkytracker-0.90.85/src/ppui/osinterface: SDL_ModalLoop.o
-Only in milkytracker-0.90.85/src/ppui: PPUIConfig.o
-Only in milkytracker-0.90.85/src/ppui: RadioGroup.o
-Only in milkytracker-0.90.85/src/ppui: Screen.o
-Only in milkytracker-0.90.85/src/ppui: Scrollbar.o
-Only in milkytracker-0.90.85/src/ppui: Seperator.o
-Only in milkytracker-0.90.85/src/ppui: Slider.o
-Only in milkytracker-0.90.85/src/ppui: StaticText.o
-Only in milkytracker-0.90.85/src/ppui: Tools.o
-Only in milkytracker-0.90.85/src/ppui: TransparentContainer.o
-Only in milkytracker-0.90.85/src/tracker: AnimatedFXControl.o
-Only in milkytracker-0.90.85/src/tracker: ColorExportImport.o
-Only in milkytracker-0.90.85/src/tracker: ColorPaletteContainer.o
-Only in milkytracker-0.90.85/src/tracker: .deps
-Only in milkytracker-0.90.85/src/tracker: DialogChannelSelector.o
-Only in milkytracker-0.90.85/src/tracker: DialogEQ.o
-Only in milkytracker-0.90.85/src/tracker: DialogGroupSelection.o
-Only in milkytracker-0.90.85/src/tracker: DialogHandlers.o
-Only in milkytracker-0.90.85/src/tracker: DialogListBox.o
-Only in milkytracker-0.90.85/src/tracker: DialogPanning.o
-Only in milkytracker-0.90.85/src/tracker: DialogQuickChooseInstrument.o
-Only in milkytracker-0.90.85/src/tracker: DialogResample.o
-Only in milkytracker-0.90.85/src/tracker: DialogWithValues.o
-Only in milkytracker-0.90.85/src/tracker: DialogZap.o
-Only in milkytracker-0.90.85/src/tracker: EditorBase.o
-Only in milkytracker-0.90.85/src/tracker: EnvelopeContainer.o
-Only in milkytracker-0.90.85/src/tracker: EnvelopeEditorControl.o
-Only in milkytracker-0.90.85/src/tracker: EnvelopeEditor.o
-Only in milkytracker-0.90.85/src/tracker: EQConstants.o
-Only in milkytracker-0.90.85/src/tracker: Equalizer.o
-Only in milkytracker-0.90.85/src/tracker: FileExtProvider.o
-Only in milkytracker-0.90.85/src/tracker: FileIdentificator.o
-Only in milkytracker-0.90.85/src/tracker: GlobalColorConfig.o
-Only in milkytracker-0.90.85/src/tracker: InputControlListener.o
-Only in milkytracker-0.90.85/src/tracker: LogoBig.o
-Only in milkytracker-0.90.85/src/tracker: LogoSmall.o
-Only in milkytracker-0.90.85/src/tracker: Makefile
-Only in milkytracker-0.90.85/src/tracker: ModuleEditor.o
-Only in milkytracker-0.90.85/src/tracker: ModuleServices.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditorClipBoard.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditorControlEventListener.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditorControlKeyboard.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditorControl.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditorControlTransposeHandler.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditor.o
-Only in milkytracker-0.90.85/src/tracker: PatternEditorTools.o
-Only in milkytracker-0.90.85/src/tracker: PatternTools.o
-Only in milkytracker-0.90.85/src/tracker: PeakLevelControl.o
-Only in milkytracker-0.90.85/src/tracker: PianoControl.o
-Only in milkytracker-0.90.85/src/tracker: Piano.o
-Only in milkytracker-0.90.85/src/tracker: PlayerController.o
-Only in milkytracker-0.90.85/src/tracker: PlayerLogic.o
-Only in milkytracker-0.90.85/src/tracker: PlayerMaster.o
-Only in milkytracker-0.90.85/src/tracker: RecorderLogic.o
-Only in milkytracker-0.90.85/src/tracker: RecPosProvider.o
-Only in milkytracker-0.90.85/src/tracker: ResamplerHelper.o
-Only in milkytracker-0.90.85/src/tracker: SampleEditorControl.o
-Only in milkytracker-0.90.85/src/tracker: SampleEditorControlToolHandler.o
-Only in milkytracker-0.90.85/src/tracker: SampleEditor.o
-Only in milkytracker-0.90.85/src/tracker: SampleEditorResampler.o
-Only in milkytracker-0.90.85/src/tracker: SamplePlayer.o
-Only in milkytracker-0.90.85/src/tracker: ScopesControl.o
 diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp
 --- milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp	2009-02-22 12:20:39.000000000 +0200
 +++ milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp	2011-07-05 18:48:50.025434998 +0300
@@ -340,7 +123,7 @@ diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.
  			pp_uint32 deltat = PPGetTickCount() - lmyTime;
  			
 -			if (deltat > 500)
-+			if (deltat > 1500)
++			if (deltat > 2000)
  			{
  				lClickCount = 0;
  				lmyTime = PPGetTickCount();
@@ -349,7 +132,7 @@ diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.
  			pp_uint32 deltat = PPGetTickCount() - rmyTime;
  			
 -			if (deltat > 500)
-+			if (deltat > 1500)
++			if (deltat > 2000)
  			{
  				rClickCount = 0;
  				rmyTime = PPGetTickCount();
@@ -358,13 +141,13 @@ diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.
  			pp_uint32 deltat = PPGetTickCount() - lmyTime;
  			
 -			if (deltat < 500)
-+			if (deltat < 1500)
++			if (deltat < 2000)
  			{
  				p.x = localMouseX; p.y = localMouseY;				
 -				if (abs(p.x - llastClickPosition.x) < 4 &&
 -					abs(p.y - llastClickPosition.y) < 4)
-+				if (abs(p.x - llastClickPosition.x) < 50 &&
-+					abs(p.y - llastClickPosition.y) < 50)
++				if (abs(p.x - llastClickPosition.x) < 30 &&
++					abs(p.y - llastClickPosition.y) < 30)
  				{					
  					PPEvent myEvent(eLMouseDoubleClick, &p, sizeof(PPPoint));					
  					RaiseEventSerialized(&myEvent);
@@ -373,13 +156,13 @@ diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.
  			pp_uint32 deltat = PPGetTickCount() - rmyTime;
  			
 -			if (deltat < 500)
-+			if (deltat < 1500)
++			if (deltat < 2000)
  			{
  				p.x = localMouseX; p.y = localMouseY;				
 -				if (abs(p.x - rlastClickPosition.x) < 4 &&
 -					abs(p.y - rlastClickPosition.y) < 4)
-+				if (abs(p.x - rlastClickPosition.x) < 50 &&
-+					abs(p.y - rlastClickPosition.y) < 50)
++				if (abs(p.x - rlastClickPosition.x) < 30 &&
++					abs(p.y - rlastClickPosition.y) < 30)
  				{					
  					PPEvent myEvent(eRMouseDoubleClick, &p, sizeof(PPPoint));					
  					RaiseEventSerialized(&myEvent);
@@ -389,15 +172,15 @@ diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.
  		{
 -			PPEvent myEvent(eLMouseDrag, &p, sizeof(PPPoint));			
 -			RaiseEventSerialized(&myEvent);
-+			if (abs(p.x - llastClickPosition.x) < 50 &&
-+				abs(p.y - llastClickPosition.y) < 50)
++			if (abs(p.x - llastClickPosition.x) < 30 &&
++				abs(p.y - llastClickPosition.y) < 30)
 +			{
 +				PPEvent myEvent(eMouseMoved, &p, sizeof(PPPoint));
 +				RaiseEventSerialized(&myEvent);
 +			}
 +			else
 +			{
-+				llastClickPosition.x = -51;
++				llastClickPosition.x = -31;
 +				PPEvent myEvent(eLMouseDrag, &p, sizeof(PPPoint));
 +				RaiseEventSerialized(&myEvent);
 +			}
@@ -406,54 +189,18 @@ diff -u -r milkytracker-0.90.85-old/src/tracker/sdl/SDL_Main.cpp milkytracker-0.
  		{
 -			PPEvent myEvent(eRMouseDrag, &p, sizeof(PPPoint));			
 -			RaiseEventSerialized(&myEvent);
-+			if (abs(p.x - rlastClickPosition.x) < 50 &&
-+				abs(p.y - rlastClickPosition.y) < 50)
++			if (abs(p.x - rlastClickPosition.x) < 30 &&
++				abs(p.y - rlastClickPosition.y) < 30)
 +			{
 +				PPEvent myEvent(eMouseMoved, &p, sizeof(PPPoint));
 +				RaiseEventSerialized(&myEvent);
 +			}
 +			else
 +			{
-+				rlastClickPosition.x = -51;
++				rlastClickPosition.x = -31;
 +				PPEvent myEvent(eRMouseDrag, &p, sizeof(PPPoint));
 +				RaiseEventSerialized(&myEvent);
 +			}
  		}
  	}
  }
-Only in milkytracker-0.90.85/src/tracker: SDL_KeyTranslation.o
-Only in milkytracker-0.90.85/src/tracker: SDL_Main.o
-Only in milkytracker-0.90.85/src/tracker: SectionAbout.o
-Only in milkytracker-0.90.85/src/tracker: SectionAbstract.o
-Only in milkytracker-0.90.85/src/tracker: SectionAdvancedEdit.o
-Only in milkytracker-0.90.85/src/tracker: SectionDiskMenu.o
-Only in milkytracker-0.90.85/src/tracker: SectionHDRecorder.o
-Only in milkytracker-0.90.85/src/tracker: SectionInstruments.o
-Only in milkytracker-0.90.85/src/tracker: SectionOptimize.o
-Only in milkytracker-0.90.85/src/tracker: SectionQuickOptions.o
-Only in milkytracker-0.90.85/src/tracker: SectionSamples.o
-Only in milkytracker-0.90.85/src/tracker: SectionSettings.o
-Only in milkytracker-0.90.85/src/tracker: SectionSwitcher.o
-Only in milkytracker-0.90.85/src/tracker: SectionTranspose.o
-Only in milkytracker-0.90.85/src/tracker: SectionUpperLeft.o
-Only in milkytracker-0.90.85/src/tracker: SongLengthEstimator.o
-Only in milkytracker-0.90.85/src/tracker: SystemMessage.o
-Only in milkytracker-0.90.85/src/tracker: TabHeaderControl.o
-Only in milkytracker-0.90.85/src/tracker: TabManager.o
-Only in milkytracker-0.90.85/src/tracker: TabTitleProvider.o
-Only in milkytracker-0.90.85/src/tracker: TitlePageManager.o
-Only in milkytracker-0.90.85/src/tracker: ToolInvokeHelper.o
-Only in milkytracker-0.90.85/src/tracker: TrackerConfig.o
-Only in milkytracker-0.90.85/src/tracker: TrackerInit.o
-Only in milkytracker-0.90.85/src/tracker: TrackerKeyboard.o
-Only in milkytracker-0.90.85/src/tracker: Tracker.o
-Only in milkytracker-0.90.85/src/tracker: TrackerSettingsDatabase.o
-Only in milkytracker-0.90.85/src/tracker: TrackerSettings.o
-Only in milkytracker-0.90.85/src/tracker: TrackerShortCuts.o
-Only in milkytracker-0.90.85/src/tracker: TrackerShutDown.o
-Only in milkytracker-0.90.85/src/tracker: TrackerStartUp.o
-Only in milkytracker-0.90.85/src/tracker: TrackerUpdate.o
-Only in milkytracker-0.90.85/src/tracker: Undo.o
-Only in milkytracker-0.90.85/src/tracker: VRand.o
-Only in milkytracker-0.90.85/src/tracker: Zapper.o
-Only in milkytracker-0.90.85: stamp-h1
diff --git a/project/jni/application/milkytracker/readme.txt b/project/jni/application/milkytracker/readme.txt
index 4ad2b43b1..d84cba1ea 100644
--- a/project/jni/application/milkytracker/readme.txt
+++ b/project/jni/application/milkytracker/readme.txt
@@ -1,8 +1,8 @@
 You should download the SDL for Andorid repository from https://github.com/pelya/commandergenius
 and also the MilkyTracker sources - extract them to the directory  project/jni/application/milkytracker in the SDL repo.
-To compile you will need to install need a recent Android SDK and NDK r7b, and put the dirs
-android-ndk-r7b
-android-ndk-r7b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
+To compile you will need to install need a recent Android SDK and NDK r8, and put the dirs
+android-ndk-r8
+android-ndk-r8/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
 android-sdk-linux
 android-sdk-linux/tools
 android-sdk-linux/platform-tools
diff --git a/project/jni/application/opentyrian/AndroidAppSettings.cfg b/project/jni/application/opentyrian/AndroidAppSettings.cfg
index 80e214db1..db70a6208 100644
--- a/project/jni/application/opentyrian/AndroidAppSettings.cfg
+++ b/project/jni/application/opentyrian/AndroidAppSettings.cfg
@@ -33,8 +33,8 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=2119
-AppVersionName="2.1.19"
+AppVersionCode=2120
+AppVersionName="2.1.20"
 ResetSdlConfigForThisVersion=y
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_net"
diff --git a/project/jni/application/sc2/AndroidAppSettings.cfg b/project/jni/application/sc2/AndroidAppSettings.cfg
index 92540e17e..0957232c5 100644
--- a/project/jni/application/sc2/AndroidAppSettings.cfg
+++ b/project/jni/application/sc2/AndroidAppSettings.cfg
@@ -33,8 +33,8 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions=''
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=07021
-AppVersionName="0.7.0.21"
+AppVersionCode=07022
+AppVersionName="0.7.0.22"
 ResetSdlConfigForThisVersion=y
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_image tremor ogg"
diff --git a/project/jni/application/setEnvironment-r5b.sh b/project/jni/application/setEnvironment-r5b.sh
index ce3d85a6b..0633be66c 100755
--- a/project/jni/application/setEnvironment-r5b.sh
+++ b/project/jni/application/setEnvironment-r5b.sh
@@ -38,6 +38,7 @@ echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
 done
 )
 
+
 MISSING_INCLUDE=
 MISSING_LIB=
 
@@ -61,7 +62,7 @@ CFLAGS="\
 -isystem$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include \
 -isystem$LOCAL_PATH/../sdl-1.2/include \
 `echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"` \
-$MISSING_INCLUDE"
+$MISSING_INCLUDE $CFLAGS"
 
 SHARED="-shared -Wl,-soname,libapplication.so"
 if [ -n "$BUILD_EXECUTABLE" ]; then
@@ -87,7 +88,7 @@ $NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libz.so \
 -L$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \
 -L$LOCAL_PATH/../../obj/local/armeabi -Wl,--no-undefined -Wl,-z,noexecstack \
 -Wl,-rpath-link=$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib -lsupc++ \
-$MISSING_LIB"
+$MISSING_LIB $LDFLAGS"
 
 #echo env CFLAGS=\""$CFLAGS"\" LDFLAGS=\""$LDFLAGS"\" "$@"
 
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
index 1aad5ea4e..eccaf4cb7 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
@@ -1169,12 +1169,18 @@ void SDL_ANDROID_MultiThreadedVideoLoop()
 					ANDROID_VideoQuit(videoThread._this);
 					break;
 				case CMD_UPDATERECTS:
-					ANDROID_FlipHWSurfaceInternal(videoThread.numrects, videoThread.rects);
-					swapBuffersNeeded = 1;
+					if( ! SDL_ANDROID_CompatibilityHacks ) // DIRTY HACK for MilkyTracker
+					{
+						ANDROID_FlipHWSurfaceInternal(videoThread.numrects, videoThread.rects);
+						swapBuffersNeeded = 1;
+					}
 					break;
 				case CMD_FLIP:
-					ANDROID_FlipHWSurfaceInternal(0, NULL);
-					swapBuffersNeeded = 1;
+					if( ! SDL_ANDROID_CompatibilityHacks ) // DIRTY HACK for MilkyTracker
+					{
+						ANDROID_FlipHWSurfaceInternal(0, NULL);
+						swapBuffersNeeded = 1;
+					}
 					break;
 			}
 			videoThread.execute = 0;
diff --git a/project/jni/setCrossEnvironment.sh b/project/jni/setCrossEnvironment.sh
index d3bfbc81d..6e86c340d 100755
--- a/project/jni/setCrossEnvironment.sh
+++ b/project/jni/setCrossEnvironment.sh
@@ -35,7 +35,7 @@ CFLAGS="\
 -DNDEBUG -O2 -g \
 -isystem$NDK/sources/cxx-stl/gnu-libstdc++/include \
 -isystem$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include \
-$MISSING_INCLUDE"
+$MISSING_INCLUDE $CFLAGS"
 
 SHARED="-shared -Wl,-soname,libapplication.so"
 if [ -n "$BUILD_EXECUTABLE" ]; then
@@ -60,7 +60,7 @@ LDFLAGS="\
 -Wl,--no-undefined -Wl,-z,noexecstack \
 -Wl,-rpath=/system/lib \
 -Wl,-rpath-link=$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \
-$MISSING_LIB"
+$MISSING_LIB $LDFLAGS"
 
 #echo env CFLAGS=\""$CFLAGS"\" LDFLAGS=\""$LDFLAGS"\" "$@"
 
diff --git a/readme.txt b/readme.txt
index 00a10e9bb..6932e4cc9 100644
--- a/readme.txt
+++ b/readme.txt
@@ -97,7 +97,7 @@ the app will re-download the data if URL does not match the saved URL from previ
 All devices have different screen resolutions, you may toggle automatic screen resizing
 in ChangeAppSettings.sh and draw to virtual 640x480 screen - it will be HW accelerated
 and will not impact performance. Automatic screen resizing does not work in SDL 1.3/2.0.
-SDL_ListModes()[0] will always return native screen resolution.
+SDL_GetVideoInfo() will always return native screen resolution.
 Also make sure that your HW textures are not wider than 1024 pixels, or it will fail to allocate such
 texture on HTC G1, and other low-end devices. Software surfaces may be of any size of course.