diff --git a/platformio.ini b/platformio.ini
index 0f352ee7b..3203b5040 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,19 +23,19 @@ libdeps_dir = .piolibdeps
 env_default = megaatmega2560
 
 [common]
+default_src_filter = +<src/*> -<src/config>
+build_flags = -fmax-errors=5
+  -g
+  -ggdb
 lib_deps =
   https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
   LiquidCrystal_I2C@1.1.2
   TMC2130Stepper
   https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.3.zip
   Adafruit NeoPixel@1.1.3
-  https://github.com/lincomatic/LiquidTWI2/archive/master.zip
-  https://github.com/trinamic/TMC26XStepper/archive/master.zip
-  https://github.com/ameyer/Arduino-L6470/archive/master.zip
-
-default_src_filter = +<src/*> -<src/config>
-
-build_flags = -fmax-errors=5
+  https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip
+  https://github.com/ameyer/Arduino-L6470/archive/3cd0993.zip
+  https://github.com/trinamic/TMC26XStepper/archive/c1921b4.zip
 
 #################################
 #                               #
@@ -71,30 +71,6 @@ board_f_cpu = 16000000L
 lib_deps    = ${common.lib_deps}
 src_filter  = ${common.default_src_filter}
 
-#
-# Melzi and clones (ATmega1284p)
-#
-[env:melzi]
-platform     = atmelavr
-framework    = arduino
-board        = sanguino_atmega1284p
-build_flags  = ${common.build_flags}
-upload_speed = 57600
-lib_deps     = ${common.lib_deps}
-src_filter   = ${common.default_src_filter}
-
-#
-# Melzi and clones (Optiboot bootloader)
-#
-[env:melzi_optiboot]
-platform     = atmelavr
-framework    = arduino
-board        = sanguino_atmega1284p
-build_flags  = ${common.build_flags}
-upload_speed = 115200
-lib_deps     = ${common.lib_deps}
-src_filter   = ${common.default_src_filter}
-
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
 #
@@ -107,7 +83,7 @@ framework   = arduino
 board       = due
 build_flags = ${common.build_flags}
 lib_deps    = ${common.lib_deps}
-lib_ignore  = TMC26XStepper
+lib_ignore  = c1921b4
 src_filter  = ${common.default_src_filter}
 
 #
@@ -163,6 +139,30 @@ debug_server   =
   auto
   -noir
 
+#
+# Melzi and clones (ATmega1284p)
+#
+[env:melzi]
+platform     = atmelavr
+framework    = arduino
+board        = sanguino_atmega1284p
+build_flags  = ${common.build_flags}
+upload_speed = 57600
+lib_deps     = ${common.lib_deps}
+src_filter   = ${common.default_src_filter}
+
+#
+# Melzi and clones (Optiboot bootloader)
+#
+[env:melzi_optiboot]
+platform     = atmelavr
+framework    = arduino
+board        = sanguino_atmega1284p
+build_flags  = ${common.build_flags}
+upload_speed = 115200
+lib_deps     = ${common.lib_deps}
+src_filter   = ${common.default_src_filter}
+
 #
 # RAMBo
 #