diff --git a/platformio.ini b/platformio.ini
index 66b3dd134acb500c12c96d4cb1b2c9c8f2cfbb23..337c6474b4fa1b74d1433beda418461cb728e0ad 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,7 +26,7 @@ lib_deps =
   https://github.com/trinamic/TMC26XStepper.git
   https://github.com/adafruit/Adafruit_NeoPixel.git
   https://github.com/ameyer/Arduino-L6470.git
-  U8glib-HAL
+  
 
 
 default_src_filter = +<src/*> -<src/config>
@@ -49,9 +49,9 @@ platform    = atmelavr
 framework   = arduino
 board       = megaatmega2560
 build_flags = -I $BUILDSRC_DIR
-  -fmax-errors=5
 board_f_cpu = 16000000L
 lib_deps    = ${common.lib_deps}
+  U8glib-HAL
 src_filter  = ${common.default_src_filter}
 
 #
@@ -64,34 +64,7 @@ board       = megaatmega1280
 build_flags = -I $BUILDSRC_DIR
 board_f_cpu = 16000000L
 lib_deps    = ${common.lib_deps}
-src_filter  = ${common.default_src_filter}
-
-#
-# Teensy++ 2.0
-#
-# - PrintrBoard
-# - PrintrBoard Rev.F
-# - Brainwave Pro
-#
-[env:teensy20]
-platform      = teensy
-framework     = arduino
-board         = teensy20pp
-build_flags   = -I $BUILDSRC_DIR
-#board_f_cpu  = 20000000L     ; Bug in Arduino framework disallows boards running at 20Mhz
-lib_deps      = ${common.lib_deps}
-src_filter    = ${common.default_src_filter}
-
-#
-# RAMBo
-#
-[env:rambo]
-platform    = atmelavr
-framework   = arduino
-board       = reprap_rambo
-build_flags = -I $BUILDSRC_DIR
-board_f_cpu = 16000000L
-lib_deps    = ${common.lib_deps}
+  U8glib-HAL
 src_filter  = ${common.default_src_filter}
 
 #
@@ -103,18 +76,9 @@ framework    = arduino
 board        = sanguino_atmega1284p
 upload_speed = 57600
 lib_deps     = ${common.lib_deps}
+  U8glib-HAL
 src_filter   = ${common.default_src_filter}
 
-#
-# Sanguinololu (ATmega644p)
-#
-[env:sanguino_atmega644p]
-platform   = atmelavr
-framework  = arduino
-board      = sanguino_atmega644p
-lib_deps   = ${common.lib_deps}
-src_filter = ${common.default_src_filter}
-
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
 #
@@ -127,18 +91,7 @@ framework   = arduino
 board       = due
 build_flags = -I $BUILDSRC_DIR
 lib_deps    = ${common.lib_deps}
-src_filter  = ${common.default_src_filter}
-
-#
-# Teensy 3.5 / 3.6 (ARM Cortex-M4)
-#
-[env:teensy35]
-platform    = teensy
-framework   = arduino
-board       = teensy35
-build_flags = -I $BUILDSRC_DIR
-lib_deps    = ${common.lib_deps}
-lib_ignore  = Adafruit NeoPixel
+  U8glib-HAL
 src_filter  = ${common.default_src_filter}
 
 #
@@ -191,10 +144,65 @@ debug_server   =
   auto
   -noir
 
+#
+# RAMBo
+#
+[env:rambo]
+platform    = atmelavr
+framework   = arduino
+board       = reprap_rambo
+build_flags = -I $BUILDSRC_DIR
+board_f_cpu = 16000000L
+lib_deps    = ${common.lib_deps}
+  U8glib-HAL
+src_filter  = ${common.default_src_filter}
+
+#
+# Sanguinololu (ATmega644p)
+#
+[env:sanguino_atmega644p]
+platform   = atmelavr
+framework  = arduino
+board      = sanguino_atmega644p
+lib_deps   = ${common.lib_deps}
+  U8glib-HAL
+src_filter = ${common.default_src_filter}
+
 [env:STM32F1]
 platform    = ststm32
 framework   = arduino
 board       = genericSTM32F103RE
 build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py
 lib_deps    = ${common.lib_deps}
+  U8glib-HAL
+src_filter  = ${common.default_src_filter}
+
+#
+# Teensy++ 2.0
+#
+# - PrintrBoard
+# - PrintrBoard Rev.F
+# - Brainwave Pro
+#
+[env:teensy20]
+platform      = teensy
+framework     = arduino
+board         = teensy20pp
+build_flags   = -I $BUILDSRC_DIR
+#board_f_cpu  = 20000000L     ; Bug in Arduino framework disallows boards running at 20Mhz
+lib_deps      = ${common.lib_deps}
+  U8glib-HAL
+src_filter    = ${common.default_src_filter}
+
+#
+# Teensy 3.5 / 3.6 (ARM Cortex-M4)
+#
+[env:teensy35]
+platform    = teensy
+framework   = arduino
+board       = teensy35
+build_flags = -I $BUILDSRC_DIR
+lib_deps    = ${common.lib_deps}
+  U8glib-HAL
+lib_ignore  = Adafruit NeoPixel
 src_filter  = ${common.default_src_filter}