diff --git a/project/jni/application/opentyrian/AppSettings.cfg b/project/jni/application/opentyrian/AppSettings.cfg
index ded47d971..a40988b0c 100644
--- a/project/jni/application/opentyrian/AppSettings.cfg
+++ b/project/jni/application/opentyrian/AppSettings.cfg
@@ -14,8 +14,8 @@ RedefinedKeys="SPACE RETURN LCTRL LALT RETURN"
 AppTouchscreenKeyboardKeysAmount=4
 AppTouchscreenKeyboardKeysAmountAutoFire=1
 MultiABI=n
-AppVersionCode=2106
-AppVersionName="2.1.06"
+AppVersionCode=2107
+AppVersionName="2.1.07"
 CompiledLibraries="sdl_net"
 AppCflags='-finline-functions -O2'
 AppLdflags=''
diff --git a/project/jni/application/opentyrian/src/keyboard.cpp b/project/jni/application/opentyrian/src/keyboard.cpp
index 64b95d73d..134508b1e 100644
--- a/project/jni/application/opentyrian/src/keyboard.cpp
+++ b/project/jni/application/opentyrian/src/keyboard.cpp
@@ -45,7 +45,7 @@ bool input_grab_enabled = true,
 #else
 bool input_grab_enabled = false,
 #endif
-     input_grabbed = false;
+       input_grabbed = false;
 
 
 void flush_events_buffer( void )
diff --git a/project/jni/application/opentyrian/src/mainint.cpp b/project/jni/application/opentyrian/src/mainint.cpp
index 89b30b1f0..ea1b09b31 100644
--- a/project/jni/application/opentyrian/src/mainint.cpp
+++ b/project/jni/application/opentyrian/src/mainint.cpp
@@ -3136,6 +3136,7 @@ redo:
 				service_SDL_events(false);
 
 				/* mouse input */
+				/*
 				if ((inputDevice == 0 || inputDevice == 2) && has_mouse)
 				{
 					button[0] |= mouse_pressed[0];
@@ -3154,18 +3155,24 @@ redo:
 						set_mouse_position(159, 100);
 					}
 				}
+				*/
+
 
 				/* keyboard input */
-				if ((inputDevice == 0 || inputDevice == 1) && !play_demo)
+				if ((inputDevice == 0 || inputDevice == 1 || inputDevice == 2) && !play_demo)
 				{
-					if (keysactive[keySettings[0]])
+					if (keysactive[keySettings[0]] ||
+						(has_mouse && mouse_pressed[0] && mouse_y < this_player->y))
 						this_player->y -= CURRENT_KEY_SPEED;
-					if (keysactive[keySettings[1]])
+					if (keysactive[keySettings[1]] ||
+						(has_mouse && mouse_pressed[0] && mouse_y > this_player->y))
 						this_player->y += CURRENT_KEY_SPEED;
 
-					if (keysactive[keySettings[2]])
+					if (keysactive[keySettings[2]] ||
+						(has_mouse && mouse_pressed[0] && mouse_x < this_player->x))
 						this_player->x -= CURRENT_KEY_SPEED;
-					if (keysactive[keySettings[3]])
+					if (keysactive[keySettings[3]] ||
+						(has_mouse && mouse_pressed[0] && mouse_x > this_player->x))
 						this_player->x += CURRENT_KEY_SPEED;
 
 					button[0] = button[0] || keysactive[keySettings[4]];
@@ -3217,7 +3224,8 @@ redo:
 					*mouseY_ = this_player->y - (*mouseY_ - this_player->y);
 					mouseYC = -mouseYC;
 				}
-
+				
+				
 				accelXC += this_player->x - *mouseX_;
 				accelYC += this_player->y - *mouseY_;
 
@@ -3247,6 +3255,7 @@ redo:
 					accelYC++;
 				else if (mouseYC < -2)
 					accelYC--;
+				
 
 			}   /*endLevel*/