diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f9f72df1..93c7d0b8 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -797,22 +797,24 @@
  *          TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
  * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
  */
-#define X_DRIVER_TYPE  A4988
-#define Y_DRIVER_TYPE  A4988
-#define Z_DRIVER_TYPE  A4988
-//#define X2_DRIVER_TYPE A4988
-//#define Y2_DRIVER_TYPE A4988
-//#define Z2_DRIVER_TYPE A4988
-//#define Z3_DRIVER_TYPE A4988
-//#define Z4_DRIVER_TYPE A4988
-#define E0_DRIVER_TYPE A4988
-#define E1_DRIVER_TYPE A4988
-//#define E2_DRIVER_TYPE A4988
-//#define E3_DRIVER_TYPE A4988
-//#define E4_DRIVER_TYPE A4988
-//#define E5_DRIVER_TYPE A4988
-//#define E6_DRIVER_TYPE A4988
-//#define E7_DRIVER_TYPE A4988
+#if ENABLED(KNUTWURST_TMC)
+    #define X_DRIVER_TYPE  TMC2208_STANDALONE
+    #define Y_DRIVER_TYPE  TMC2208_STANDALONE
+    #define Z_DRIVER_TYPE  TMC2208_STANDALONE
+    #define E0_DRIVER_TYPE TMC2208_STANDALONE
+    #define E1_DRIVER_TYPE TMC2208_STANDALONE
+#else
+    #if ENABLED(KNUTWURST_MEGA_P)
+        #define X_DRIVER_TYPE  TMC2208_STANDALONE
+        #define Y_DRIVER_TYPE  TMC2208_STANDALONE
+    #else
+        #define X_DRIVER_TYPE  A4988
+        #define Y_DRIVER_TYPE  A4988
+    #endif
+    #define Z_DRIVER_TYPE  A4988
+    #define E0_DRIVER_TYPE A4988
+    #define E1_DRIVER_TYPE A4988
+#endif
 
 // Enable this feature if all enabled endstop pins are interrupt-capable.
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ee046588..227af177 100755
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1715,8 +1715,8 @@
  * Override the default value based on the driver type set in Configuration.h.
  */
 #if NONE(KNUTWURST_MEGA_P, KNUTWURST_TMC)
-  #define MINIMUM_STEPPER_POST_DIR_DELAY 200
-  #define MINIMUM_STEPPER_PRE_DIR_DELAY 200
+  //#define MINIMUM_STEPPER_POST_DIR_DELAY 200
+  //#define MINIMUM_STEPPER_PRE_DIR_DELAY 200
 #endif
 
 /**
@@ -1730,8 +1730,9 @@
  *
  * Override the default value based on the driver type set in Configuration.h.
  */
-#define MINIMUM_STEPPER_PULSE 1
-
+#if NONE(KNUTWURST_MEGA_P, KNUTWURST_TMC)
+    //#define MINIMUM_STEPPER_PULSE 1
+#endif
 /**
  * Maximum stepping rate (in Hz) the stepper driver allows
  *  If undefined, defaults to 1MHz / (2 * MINIMUM_STEPPER_PULSE)