diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index e567b80ac..0462a86c2 100644
--- a/Firmware/Configuration.h
+++ b/Firmware/Configuration.h
@@ -268,7 +268,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
 
 #define INVERT_X_DIR true     // for Mendel set to false, for Orca set to true
-#define INVERT_Y_DIR true     // for Mendel set to true, for Orca set to false
+#define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E1_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h
index 31e75b657..bd1f50e17 100644
--- a/Firmware/Configuration_prusa.h
+++ b/Firmware/Configuration_prusa.h
@@ -20,6 +20,7 @@ GENERAL SETTINGS
 
 // Prusa Single extruder multiple material suport
 //#define SNMM
+#define MK3
 
 // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)
 //#define E3D_PT100_EXTRUDER_WITH_AMP
@@ -34,9 +35,13 @@ AXIS SETTINGS
 
 // Steps per unit {X,Y,Z,E}
 #ifdef SNMM
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {100,100,3200/8,140}
+	#define DEFAULT_AXIS_STEPS_PER_UNIT   {100,100,3200/8,140}
 #else
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {100,100,3200/8,161.3}
+	#ifdef MK3
+		#define DEFAULT_AXIS_STEPS_PER_UNIT   {100,100,3200/8,133}
+	#else
+		#define DEFAULT_AXIS_STEPS_PER_UNIT   {100,100,3200/8,161.3}
+	#endif
 #endif
 
 
diff --git a/Firmware/Firmware.sublime-project b/Firmware/Firmware.sublime-project
index 7e53587ca..9d90b80f1 100644
--- a/Firmware/Firmware.sublime-project
+++ b/Firmware/Firmware.sublime-project
@@ -19,7 +19,7 @@
   			// avrdude -F -v -pm168 -cstk500v1 -P\\.\COM4 -b19200 -D -Uflash:w:"file.hex":i
   			// may need add path to avrdude config file: -C"c:\utils\arduino-0016\hardware\tools\avr\etc\avrdude.conf" if Arduino IDE installed in "c:\utils\arduino-0016\"
   			// https://typeunsafe.wordpress.com/2011/07/22/programming-arduino-with-avrdude/
-			"shell_cmd": "\"D:\\bin\\arduino-1.6.8\\arduino_debug.exe\" --pref build.path=..\\output --upload --port COM19 --board marlin:avr:rambo -v --preserve-temp-files Firmware.ino"
+			"shell_cmd": "\"D:\\bin\\arduino-1.6.8\\arduino_debug.exe\" --pref build.path=..\\output --upload --port COM9 --board marlin:avr:rambo -v --preserve-temp-files Firmware.ino"
 		},
 		{
 			"name": "map-data",
diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h
index 0267b3fcf..9a3505adb 100644
--- a/Firmware/pins_Einsy_1_0.h
+++ b/Firmware/pins_Einsy_1_0.h
@@ -30,9 +30,9 @@
 #define X_TMC2130_DIAG         64 // !!! changed from 40 (EINY03)
 #define X_STEP_PIN             37
 #define X_DIR_PIN              49
-#define X_MIN_PIN            12
+//#define X_MIN_PIN            12
 //#define X_MAX_PIN            30
-//#define X_MIN_PIN              X_TMC2130_DIAG
+#define X_MIN_PIN              X_TMC2130_DIAG
 #define X_MAX_PIN              X_TMC2130_DIAG
 #define X_ENABLE_PIN           29
 #define X_MS1_PIN           -1
@@ -42,9 +42,9 @@
 #define Y_TMC2130_DIAG      69
 #define Y_STEP_PIN          36
 #define Y_DIR_PIN           48
-#define Y_MIN_PIN           11
+//#define Y_MIN_PIN           11
 //#define Y_MAX_PIN           24
-//#define Y_MIN_PIN           Y_TMC2130_DIAG
+#define Y_MIN_PIN           Y_TMC2130_DIAG
 #define Y_MAX_PIN           Y_TMC2130_DIAG
 #define Y_ENABLE_PIN        28
 #define Y_MS1_PIN           -1
diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp
index 4b549a0de..e3e64ea2e 100644
--- a/Firmware/tmc2130.cpp
+++ b/Firmware/tmc2130.cpp
@@ -138,9 +138,9 @@ void tmc2130_init()
 	{
 		tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current[axis], tmc2130_current[axis]);
 		tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000);
-//		tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16));
-//		tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, __tcoolthrs(axis));
-		tmc2130_wr(axis, TMC2130_REG_GCONF, /* (axis < 2) ? TMC2130_GCONF_SGSENS : */ TMC2130_GCONF_NORMAL);
+		tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16));
+		tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, __tcoolthrs(axis));
+		tmc2130_wr(axis, TMC2130_REG_GCONF, (axis < 2) ? TMC2130_GCONF_SGSENS : TMC2130_GCONF_NORMAL);
 //		tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0);
 //		tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS);
 		//tmc2130_wr_THIGH(axis, TMC2130_THIGH);
@@ -247,7 +247,7 @@ void tmc2130_wr_MSLUTSTART(uint8_t axis, uint8_t start_sin, uint8_t start_sin90)
 	val |= (uint32_t)start_sin;
 	val |= ((uint32_t)start_sin90) << 16;
 	tmc2130_wr(axis, TMC2130_REG_MSLUTSTART, val);
-	//printf_P(PSTR("MSLUTSTART=%08lx (start_sin=%d start_sin90=%d)\n"), val, start_sin, start_sin90);
+	//printf_P(PSTR("MSLUTSTART=_08lx (start_sin=%d start_sin90=%d)\n"), val, start_sin, start_sin90);
 }
 
 void tmc2130_wr_MSLUTSEL(uint8_t axis, uint8_t x1, uint8_t x2, uint8_t x3, uint8_t w0, uint8_t w1, uint8_t w2, uint8_t w3)