219 files changed, 58 insertions, 23 deletions

diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
new file mode 100644
index 0000000000..05fb588d11
--- /dev/null
+++ b/keyboards/ergodox/Makefile
@@ -0,0 +1,34 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make = Make software.
+#
+# make clean = Clean out built project files.
+#
+# That's pretty much all you need. To compile, always go make clean, 
+# followed by make.
+#
+# For advanced users only:
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+#               (must have teensy_loader_cli installed).
+#
+#----------------------------------------------------------------------------
+SUBPROJECT_DEFAULT = ez
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE ?= no  # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE  ?= yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE  ?= yes # Audio control and System control(+450)
+CONSOLE_ENABLE   ?= no  # Console for debug(+400)
+COMMAND_ENABLE   ?= yes # Commands for debug and configuration
+CUSTOM_MATRIX    ?= yes # Custom matrix file for the ErgoDox EZ
+SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
+NKRO_ENABLE      ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+MIDI_ENABLE      ?= no  # MIDI controls
+UNICODE_ENABLE   ?= yes # Unicode
+
+ifndef QUANTUM_DIR
+	include ../../Makefile
+endif
diff --git a/keyboards/ergodox/ergodox.c b/keyboards/ergodox/ergodox.c
new file mode 100644
index 0000000000..992e95d811
--- /dev/null
+++ b/keyboards/ergodox/ergodox.c
@@ -0,0 +1,8 @@
+/*
+ * ergodox.c
+ *
+ *  Created on: 7 jul 2016
+ *      Author: Fred Wales
+ */
+
+
diff --git a/keyboards/ergodox/ergodox.h b/keyboards/ergodox/ergodox.h
new file mode 100644
index 0000000000..fe54e3260f
--- /dev/null
+++ b/keyboards/ergodox/ergodox.h
@@ -0,0 +1,11 @@
+#ifndef KEYBOARDS_ERGODOX_ERGODOX_H_
+#define KEYBOARDS_ERGODOX_ERGODOX_H_
+
+#ifdef SUBPROJECT_ez
+    #include "ez.h"
+#endif
+#ifdef SUBPROJECT_infinity
+    #include "infinity.h"
+#endif
+
+#endif /* KEYBOARDS_ERGODOX_ERGODOX_H_ */
diff --git a/keyboards/ergodox_ez/190hotfix.sh b/keyboards/ergodox/ez/190hotfix.sh
index bdc3adce22..bdc3adce22 100755
--- a/keyboards/ergodox_ez/190hotfix.sh
+++ b/keyboards/ergodox/ez/190hotfix.sh
diff --git a/keyboards/ergodox_ez/Makefile b/keyboards/ergodox/ez/Makefile
index 54edaed6d1..37e554b304 100644
--- a/keyboards/ergodox_ez/Makefile
+++ b/keyboards/ergodox/ez/Makefile
@@ -70,17 +70,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE  ?= yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE   ?= no  # Console for debug(+400)
-COMMAND_ENABLE   ?= yes # Commands for debug and configuration
-CUSTOM_MATRIX    ?= yes # Custom matrix file for the ErgoDox EZ
-SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
-NKRO_ENABLE      ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-MIDI_ENABLE      ?= no  # MIDI controls
-UNICODE_ENABLE   ?= yes # Unicode
 
 ifndef QUANTUM_DIR
-	include ../../Makefile
+	include ../../../Makefile
 endif
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox/ez/config.h
index 2bb56731b2..2bb56731b2 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox/ez/config.h
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox/ez/ez.c
index f0558d9f21..e7afc98590 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox/ez/ez.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ez.h"
 #include "i2cmaster.h"
 
 bool i2c_initialized = 0;
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox/ez/ez.h
index db4ec867bc..db4ec867bc 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox/ez/ez.h
diff --git a/keyboards/ergodox_ez/i2cmaster.h b/keyboards/ergodox/ez/i2cmaster.h
index 3917b9e6c0..3917b9e6c0 100644
--- a/keyboards/ergodox_ez/i2cmaster.h
+++ b/keyboards/ergodox/ez/i2cmaster.h
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox/ez/matrix.c
index dc29cf5cd0..a19bab90b2 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox/ez/matrix.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#include "ergodox_ez.h"
+#include "ez.h"
 #include "i2cmaster.h"
 #ifdef DEBUG_MATRIX_SCAN_RATE
 #include  "timer.h"
diff --git a/keyboards/ergodox_ez/readme.md b/keyboards/ergodox/ez/readme.md
index 67a5fb0951..67a5fb0951 100644
--- a/keyboards/ergodox_ez/readme.md
+++ b/keyboards/ergodox/ez/readme.md
diff --git a/keyboards/ergodox_ez/twimaster.c b/keyboards/ergodox/ez/twimaster.c
index f91c08e6e4..f91c08e6e4 100644
--- a/keyboards/ergodox_ez/twimaster.c
+++ b/keyboards/ergodox/ez/twimaster.c
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py b/keyboards/ergodox/ez/util/compile_keymap.py
index 7076a6ecb2..7076a6ecb2 100644
--- a/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py
+++ b/keyboards/ergodox/ez/util/compile_keymap.py
diff --git a/keyboards/ergodox_ez/util/readme.md b/keyboards/ergodox/ez/util/readme.md
index 26c5e5d99c..26c5e5d99c 100644
--- a/keyboards/ergodox_ez/util/readme.md
+++ b/keyboards/ergodox/ez/util/readme.md
diff --git a/keyboards/infinity_ergodox/MEMO.txt b/keyboards/ergodox/infinity/MEMO.txt
index e2886aa002..e2886aa002 100644
--- a/keyboards/infinity_ergodox/MEMO.txt
+++ b/keyboards/ergodox/infinity/MEMO.txt
diff --git a/keyboards/infinity_ergodox/Makefile b/keyboards/ergodox/infinity/Makefile
index 7edc03d8cc..942032f83c 100644
--- a/keyboards/infinity_ergodox/Makefile
+++ b/keyboards/ergodox/infinity/Makefile
@@ -57,14 +57,6 @@ OPT_DEFS = -DCORTEX_VTOR_INIT=0x00002000
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= yes	# Virtual DIP switch configuration
-## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
-MOUSEKEY_ENABLE ?= yes	# Mouse keys
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control
-CONSOLE_ENABLE ?= yes	# Console for debug
-COMMAND_ENABLE ?= yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE ?= yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE ?= yes	    # USB Nkey Rollover
 CUSTOM_MATRIX ?= yes # Custom matrix file
 SERIAL_LINK_ENABLE = yes
 VISUALIZER_ENABLE ?= yes
@@ -81,5 +73,5 @@ include drivers/gdisp/IS31FL3731C/driver.mk
 endif
 
 ifndef QUANTUM_DIR
-	include ../../Makefile
+	include ../../../Makefile
 endif
\ No newline at end of file
diff --git a/keyboards/infinity_ergodox/bootloader_defs.h b/keyboards/ergodox/infinity/bootloader_defs.h
index c67153be60..c67153be60 100644
--- a/keyboards/infinity_ergodox/bootloader_defs.h
+++ b/keyboards/ergodox/infinity/bootloader_defs.h
diff --git a/keyboards/infinity_ergodox/chconf.h b/keyboards/ergodox/infinity/chconf.h
index d59c35eb68..d59c35eb68 100644
--- a/keyboards/infinity_ergodox/chconf.h
+++ b/keyboards/ergodox/infinity/chconf.h
diff --git a/keyboards/infinity_ergodox/config.h b/keyboards/ergodox/infinity/config.h
index d24ee0f056..d24ee0f056 100644
--- a/keyboards/infinity_ergodox/config.h
+++ b/keyboards/ergodox/infinity/config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
index 2ea73f1fb3..2ea73f1fb3 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
index f32d0d8685..f32d0d8685 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
index 1d21f0c498..1d21f0c498 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
index bb28ad775e..bb28ad775e 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
index 16c3f80f53..16c3f80f53 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
index babfe2b367..babfe2b367 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
index 2554344321..2554344321 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
index b0ebcdc475..b0ebcdc475 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
index 290571ce5b..290571ce5b 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
index 889a1a0317..889a1a0317 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
index c33aea81a8..c33aea81a8 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
index 48587b9e14..48587b9e14 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
index 48636b33d6..48636b33d6 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
diff --git a/keyboards/infinity_ergodox/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h
index 8caa577b73..8caa577b73 100644
--- a/keyboards/infinity_ergodox/gfxconf.h
+++ b/keyboards/ergodox/infinity/gfxconf.h
diff --git a/keyboards/infinity_ergodox/halconf.h b/keyboards/ergodox/infinity/halconf.h
index 55dd5e88da..55dd5e88da 100644
--- a/keyboards/infinity_ergodox/halconf.h
+++ b/keyboards/ergodox/infinity/halconf.h
diff --git a/keyboards/infinity_ergodox/infinity_ergodox.c b/keyboards/ergodox/infinity/infinity.c
index 87ed40fabf..87ed40fabf 100644
--- a/keyboards/infinity_ergodox/infinity_ergodox.c
+++ b/keyboards/ergodox/infinity/infinity.c
diff --git a/keyboards/infinity_ergodox/infinity_ergodox.h b/keyboards/ergodox/infinity/infinity.h
index de72675946..de72675946 100644
--- a/keyboards/infinity_ergodox/infinity_ergodox.h
+++ b/keyboards/ergodox/infinity/infinity.h
diff --git a/keyboards/infinity_ergodox/keymaps/default/keymap.c b/keyboards/ergodox/infinity/keymaps/default/keymap.c
index f1e6b1c8ae..f1e6b1c8ae 100644
--- a/keyboards/infinity_ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodox/infinity/keymaps/default/keymap.c
diff --git a/keyboards/infinity_ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/infinity/keymaps/default/visualizer.c
index c0d335ce6a..c0d335ce6a 100644
--- a/keyboards/infinity_ergodox/keymaps/default/visualizer.c
+++ b/keyboards/ergodox/infinity/keymaps/default/visualizer.c
diff --git a/keyboards/infinity_ergodox/led.c b/keyboards/ergodox/infinity/led.c
index 77195bb358..77195bb358 100644
--- a/keyboards/infinity_ergodox/led.c
+++ b/keyboards/ergodox/infinity/led.c
diff --git a/keyboards/infinity_ergodox/matrix.c b/keyboards/ergodox/infinity/matrix.c
index 2b806cd649..2b806cd649 100644
--- a/keyboards/infinity_ergodox/matrix.c
+++ b/keyboards/ergodox/infinity/matrix.c
diff --git a/keyboards/infinity_ergodox/mcuconf.h b/keyboards/ergodox/infinity/mcuconf.h
index f6730b99ca..f6730b99ca 100644
--- a/keyboards/infinity_ergodox/mcuconf.h
+++ b/keyboards/ergodox/infinity/mcuconf.h
diff --git a/keyboards/ergodox_ez/keymaps/ab/Makefile b/keyboards/ergodox/keymaps/ab/Makefile
index b673c5ce52..b673c5ce52 100644
--- a/keyboards/ergodox_ez/keymaps/ab/Makefile
+++ b/keyboards/ergodox/keymaps/ab/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json b/keyboards/ergodox/keymaps/ab/keyboard-layout.json
index e2badad4de..e2badad4de 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json
+++ b/keyboards/ergodox/keymaps/ab/keyboard-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png b/keyboards/ergodox/keymaps/ab/keyboard-layout.png
index 740684461e..740684461e 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png
+++ b/keyboards/ergodox/keymaps/ab/keyboard-layout.png
diff --git a/keyboards/ergodox_ez/keymaps/ab/keymap.c b/keyboards/ergodox/keymaps/ab/keymap.c
index df6f334600..df6f334600 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keymap.c
+++ b/keyboards/ergodox/keymaps/ab/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/ab/readme.md b/keyboards/ergodox/keymaps/ab/readme.md
index 6b1ac2be35..6b1ac2be35 100644
--- a/keyboards/ergodox_ez/keymaps/ab/readme.md
+++ b/keyboards/ergodox/keymaps/ab/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
index 052517d70e..052517d70e 100644
--- a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
+++ b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md b/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
index f0dd3815c1..f0dd3815c1 100644
--- a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md
+++ b/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/keymap.c b/keyboards/ergodox/keymaps/alexjj/keymap.c
index 448f62da02..448f62da02 100644
--- a/keyboards/ergodox_ez/keymaps/alexjj/keymap.c
+++ b/keyboards/ergodox/keymaps/alexjj/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/readme.md b/keyboards/ergodox/keymaps/alexjj/readme.md
index 239e32d399..239e32d399 100644
--- a/keyboards/ergodox_ez/keymaps/alexjj/readme.md
+++ b/keyboards/ergodox/keymaps/alexjj/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg b/keyboards/ergodox/keymaps/alexjj/rl-layout.jpg
index e4e92bf464..e4e92bf464 100644
--- a/keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg
+++ b/keyboards/ergodox/keymaps/alexjj/rl-layout.jpg
diff --git a/keyboards/ergodox_ez/keymaps/algernon/COPYING b/keyboards/ergodox/keymaps/algernon/COPYING
index 94a9ed024d..94a9ed024d 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/COPYING
+++ b/keyboards/ergodox/keymaps/algernon/COPYING
diff --git a/keyboards/ergodox_ez/keymaps/algernon/Makefile b/keyboards/ergodox/keymaps/algernon/Makefile
index 6bf3976b9d..6bf3976b9d 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/Makefile
+++ b/keyboards/ergodox/keymaps/algernon/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/algernon/config.h b/keyboards/ergodox/keymaps/algernon/config.h
index 9bb1025be5..9bb1025be5 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/config.h
+++ b/keyboards/ergodox/keymaps/algernon/config.h
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
index 3df68ea53d..3df68ea53d 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
index 7b25a05b3a..7b25a05b3a 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png b/keyboards/ergodox/keymaps/algernon/images/heatmap.png
index 356035e0a6..356035e0a6 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png
+++ b/keyboards/ergodox/keymaps/algernon/images/heatmap.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png b/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
index 104a9544d0..104a9544d0 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png b/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
index 16d29e124d..16d29e124d 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png b/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
index 698d11e5f2..698d11e5f2 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png b/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
index fe3c03c932..fe3c03c932 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
index c120872929..c120872929 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/algernon/readme.md b/keyboards/ergodox/keymaps/algernon/readme.md
index 6fe1775111..6fe1775111 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/readme.md
+++ b/keyboards/ergodox/keymaps/algernon/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-adore-layout.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json
index 544f61ce87..544f61ce87 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-adore-layout.json
+++ b/keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json
index 148bb1f23b..148bb1f23b 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json
+++ b/keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py b/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
index a13d12e81a..a13d12e81a 100755
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py
+++ b/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/max-focused b/keyboards/ergodox/keymaps/algernon/tools/max-focused
index 4d5220aa8b..4d5220aa8b 100755
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/max-focused
+++ b/keyboards/ergodox/keymaps/algernon/tools/max-focused
diff --git a/keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
index 48257d23a3..48257d23a3 100644
--- a/keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/bepo/bepo.png b/keyboards/ergodox/keymaps/bepo/bepo.png
index 3df7aa609f..3df7aa609f 100644
--- a/keyboards/ergodox_ez/keymaps/bepo/bepo.png
+++ b/keyboards/ergodox/keymaps/bepo/bepo.png
diff --git a/keyboards/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo/keymap.c
index 921a94d63a..921a94d63a 100644
--- a/keyboards/ergodox_ez/keymaps/bepo/keymap.c
+++ b/keyboards/ergodox/keymaps/bepo/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/bepo/readme.md b/keyboards/ergodox/keymaps/bepo/readme.md
index 4a18cd80ff..4a18cd80ff 100644
--- a/keyboards/ergodox_ez/keymaps/bepo/readme.md
+++ b/keyboards/ergodox/keymaps/bepo/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile b/keyboards/ergodox/keymaps/coderkun_neo2/Makefile
index 6c0a79b110..6c0a79b110 100644
--- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
index 8a2ba26d22..8a2ba26d22 100644
--- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md b/keyboards/ergodox/keymaps/coderkun_neo2/readme.md
index 2a4d3a535b..2a4d3a535b 100644
--- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/colemak/keymap.c b/keyboards/ergodox/keymaps/colemak/keymap.c
index 9601726f7b..9601726f7b 100644
--- a/keyboards/ergodox_ez/keymaps/colemak/keymap.c
+++ b/keyboards/ergodox/keymaps/colemak/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/colemak/readme.md b/keyboards/ergodox/keymaps/colemak/readme.md
index e28b2f0856..e28b2f0856 100644
--- a/keyboards/ergodox_ez/keymaps/colemak/readme.md
+++ b/keyboards/ergodox/keymaps/colemak/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png
index 57df5a1f99..57df5a1f99 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
index a909ed3a4f..a909ed3a4f 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md b/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
index 48f095cae9..48f095cae9 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png
index 6fba568fc3..6fba568fc3 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png
+++ b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png
index b0a1c513cd..b0a1c513cd 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png
+++ b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
index e9648ede7d..e9648ede7d 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c
+++ b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/readme.md b/keyboards/ergodox/keymaps/csharp_dev/readme.md
index 96af077ade..96af077ade 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/readme.md
+++ b/keyboards/ergodox/keymaps/csharp_dev/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dave/keymap.c b/keyboards/ergodox/keymaps/dave/keymap.c
index e9480af3e9..e9480af3e9 100644
--- a/keyboards/ergodox_ez/keymaps/dave/keymap.c
+++ b/keyboards/ergodox/keymaps/dave/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dave/readme.md b/keyboards/ergodox/keymaps/dave/readme.md
index aa0f9bd192..aa0f9bd192 100644
--- a/keyboards/ergodox_ez/keymaps/dave/readme.md
+++ b/keyboards/ergodox/keymaps/dave/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/default/default.png b/keyboards/ergodox/keymaps/default/default.png
index 6575f7b5e3..6575f7b5e3 100644
--- a/keyboards/ergodox_ez/keymaps/default/default.png
+++ b/keyboards/ergodox/keymaps/default/default.png
diff --git a/keyboards/ergodox_ez/keymaps/default/default_highres.png b/keyboards/ergodox/keymaps/default/default_highres.png
index 7d9f045f43..7d9f045f43 100644
--- a/keyboards/ergodox_ez/keymaps/default/default_highres.png
+++ b/keyboards/ergodox/keymaps/default/default_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c
index b48a54a43f..f1a83f4e79 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/default/readme.md b/keyboards/ergodox/keymaps/default/readme.md
index 8f6dba45e9..8f6dba45e9 100644
--- a/keyboards/ergodox_ez/keymaps/default/readme.md
+++ b/keyboards/ergodox/keymaps/default/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png b/keyboards/ergodox/keymaps/default_osx/default_osx_highres.png
index 04f46bbd54..04f46bbd54 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png
+++ b/keyboards/ergodox/keymaps/default_osx/default_osx_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox/keymaps/default_osx/keymap.c
index c57ffbb889..c57ffbb889 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/default_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/readme.md b/keyboards/ergodox/keymaps/default_osx/readme.md
index aa749aac90..aa749aac90 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/readme.md
+++ b/keyboards/ergodox/keymaps/default_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dragon788/keymap.c b/keyboards/ergodox/keymaps/dragon788/keymap.c
index 3aec8c6cf9..3aec8c6cf9 100644
--- a/keyboards/ergodox_ez/keymaps/dragon788/keymap.c
+++ b/keyboards/ergodox/keymaps/dragon788/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak/dvorak.png b/keyboards/ergodox/keymaps/dvorak/dvorak.png
index cb83163095..cb83163095 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak/dvorak.png
+++ b/keyboards/ergodox/keymaps/dvorak/dvorak.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak/keymap.c b/keyboards/ergodox/keymaps/dvorak/keymap.c
index 22947327d3..22947327d3 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png
index 6a36f9bfa1..6a36f9bfa1 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png
index c6e6d913cb..c6e6d913cb 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png
index 23f56ff4c0..23f56ff4c0 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
index 82f55b4bc0..82f55b4bc0 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md b/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
index 984106ff46..984106ff46 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
index 6eb864b447..6eb864b447 100755
--- a/keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md b/keyboards/ergodox/keymaps/dvorak_spanish/readme.md
index e075e3cd7d..e075e3cd7d 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md
+++ b/keyboards/ergodox/keymaps/dvorak_spanish/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png b/keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png
index 1d2583740c..1d2583740c 100644
--- a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
index 1d8e66a082..1d8e66a082 100644
--- a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md b/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
index 4839988d9b..4839988d9b 100644
--- a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/Makefile b/keyboards/ergodox/keymaps/erez_experimental/Makefile
index b673c5ce52..b673c5ce52 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/Makefile
+++ b/keyboards/ergodox/keymaps/erez_experimental/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/config.h b/keyboards/ergodox/keymaps/erez_experimental/config.h
index e5d7fe1885..e5d7fe1885 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/config.h
+++ b/keyboards/ergodox/keymaps/erez_experimental/config.h
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
index 04ad2a8167..04ad2a8167 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/readme.md b/keyboards/ergodox/keymaps/erez_experimental/readme.md
index 66acfa187b..66acfa187b 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/readme.md
+++ b/keyboards/ergodox/keymaps/erez_experimental/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
index b1cecf0ddd..b1cecf0ddd 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c
+++ b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png b/keyboards/ergodox/keymaps/german-kinergo/layout-code.png
index a0ef551e12..a0ef551e12 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png
+++ b/keyboards/ergodox/keymaps/german-kinergo/layout-code.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png b/keyboards/ergodox/keymaps/german-kinergo/layout-media.png
index 56aea1dca4..56aea1dca4 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png
+++ b/keyboards/ergodox/keymaps/german-kinergo/layout-media.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout.png b/keyboards/ergodox/keymaps/german-kinergo/layout.png
index 76a1aa5d7a..76a1aa5d7a 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/layout.png
+++ b/keyboards/ergodox/keymaps/german-kinergo/layout.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/readme.md b/keyboards/ergodox/keymaps/german-kinergo/readme.md
index 557d85a8a4..557d85a8a4 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/readme.md
+++ b/keyboards/ergodox/keymaps/german-kinergo/readme.md
diff --git a/keyboards/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
index 7076a6ecb2..7076a6ecb2 100644
--- a/keyboards/ergodox_ez/util/compile_keymap.py
+++ b/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
index 5fcc14d518..5fcc14d518 100644
--- a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
index 2c9e0a8376..2c9e0a8376 100644
--- a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md
+++ b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
diff --git a/keyboards/ergodox_ez/keymaps/german/keymap.c b/keyboards/ergodox/keymaps/german/keymap.c
index 3eab51f0e2..3eab51f0e2 100644
--- a/keyboards/ergodox_ez/keymaps/german/keymap.c
+++ b/keyboards/ergodox/keymaps/german/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/j3rn/keymap.c b/keyboards/ergodox/keymaps/j3rn/keymap.c
index 6e271321d5..6e271321d5 100644
--- a/keyboards/ergodox_ez/keymaps/j3rn/keymap.c
+++ b/keyboards/ergodox/keymaps/j3rn/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/j3rn/readme.md b/keyboards/ergodox/keymaps/j3rn/readme.md
index fc4b640426..fc4b640426 100644
--- a/keyboards/ergodox_ez/keymaps/j3rn/readme.md
+++ b/keyboards/ergodox/keymaps/j3rn/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/jack/keymap.c b/keyboards/ergodox/keymaps/jack/keymap.c
index 80bf9d535d..80bf9d535d 100644
--- a/keyboards/ergodox_ez/keymaps/jack/keymap.c
+++ b/keyboards/ergodox/keymaps/jack/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png b/keyboards/ergodox/keymaps/jacobono/img/colemak-default-layer.png
index 06f63c4968..06f63c4968 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png
+++ b/keyboards/ergodox/keymaps/jacobono/img/colemak-default-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png b/keyboards/ergodox/keymaps/jacobono/img/number-dpad-layer.png
index 4dd7182785..4dd7182785 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png
+++ b/keyboards/ergodox/keymaps/jacobono/img/number-dpad-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png b/keyboards/ergodox/keymaps/jacobono/img/symbol-layer.png
index ee224cf0c1..ee224cf0c1 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png
+++ b/keyboards/ergodox/keymaps/jacobono/img/symbol-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/keymap.c b/keyboards/ergodox/keymaps/jacobono/keymap.c
index 6b19800af0..6b19800af0 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/keymap.c
+++ b/keyboards/ergodox/keymaps/jacobono/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/readme.md b/keyboards/ergodox/keymaps/jacobono/readme.md
index 48de0509fc..48de0509fc 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/readme.md
+++ b/keyboards/ergodox/keymaps/jacobono/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/jgarr/keymap.c b/keyboards/ergodox/keymaps/jgarr/keymap.c
index a3ad2040f4..a3ad2040f4 100644
--- a/keyboards/ergodox_ez/keymaps/jgarr/keymap.c
+++ b/keyboards/ergodox/keymaps/jgarr/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/josh/keymap.c b/keyboards/ergodox/keymaps/josh/keymap.c
index de5664a25a..de5664a25a 100644
--- a/keyboards/ergodox_ez/keymaps/josh/keymap.c
+++ b/keyboards/ergodox/keymaps/josh/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/josh/readme.md b/keyboards/ergodox/keymaps/josh/readme.md
index cee19d47ea..cee19d47ea 100644
--- a/keyboards/ergodox_ez/keymaps/josh/readme.md
+++ b/keyboards/ergodox/keymaps/josh/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/kastyle/keymap.c b/keyboards/ergodox/keymaps/kastyle/keymap.c
index 3982e0a19f..3982e0a19f 100644
--- a/keyboards/ergodox_ez/keymaps/kastyle/keymap.c
+++ b/keyboards/ergodox/keymaps/kastyle/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/kines-ish/keymap.c b/keyboards/ergodox/keymaps/kines-ish/keymap.c
index 5063c99f28..5063c99f28 100644
--- a/keyboards/ergodox_ez/keymaps/kines-ish/keymap.c
+++ b/keyboards/ergodox/keymaps/kines-ish/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/kines-ish/readme.md b/keyboards/ergodox/keymaps/kines-ish/readme.md
index 5d39a0590d..5d39a0590d 100644
--- a/keyboards/ergodox_ez/keymaps/kines-ish/readme.md
+++ b/keyboards/ergodox/keymaps/kines-ish/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/maz/keymap.c b/keyboards/ergodox/keymaps/maz/keymap.c
index 7b8f0df74d..7b8f0df74d 100644
--- a/keyboards/ergodox_ez/keymaps/maz/keymap.c
+++ b/keyboards/ergodox/keymaps/maz/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/maz/readme.md b/keyboards/ergodox/keymaps/maz/readme.md
index 000a8d0000..000a8d0000 100644
--- a/keyboards/ergodox_ez/keymaps/maz/readme.md
+++ b/keyboards/ergodox/keymaps/maz/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
index 5bfef59955..5bfef59955 100644
--- a/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c
+++ b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/mpiechotka/readme.md b/keyboards/ergodox/keymaps/mpiechotka/readme.md
index 785400d1d2..785400d1d2 100644
--- a/keyboards/ergodox_ez/keymaps/mpiechotka/readme.md
+++ b/keyboards/ergodox/keymaps/mpiechotka/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/code_layer.png b/keyboards/ergodox/keymaps/msc/img/code_layer.png
index 7b5efaae79..7b5efaae79 100644
--- a/keyboards/ergodox_ez/keymaps/msc/img/code_layer.png
+++ b/keyboards/ergodox/keymaps/msc/img/code_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/main_layer.png b/keyboards/ergodox/keymaps/msc/img/main_layer.png
index 65f92dda1b..65f92dda1b 100644
--- a/keyboards/ergodox_ez/keymaps/msc/img/main_layer.png
+++ b/keyboards/ergodox/keymaps/msc/img/main_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/media_layer.png b/keyboards/ergodox/keymaps/msc/img/media_layer.png
index a69799b073..a69799b073 100644
--- a/keyboards/ergodox_ez/keymaps/msc/img/media_layer.png
+++ b/keyboards/ergodox/keymaps/msc/img/media_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/keymap.c b/keyboards/ergodox/keymaps/msc/keymap.c
index e567e513f9..e567e513f9 100644
--- a/keyboards/ergodox_ez/keymaps/msc/keymap.c
+++ b/keyboards/ergodox/keymaps/msc/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/msc/readme.md b/keyboards/ergodox/keymaps/msc/readme.md
index 0d14fcbd29..0d14fcbd29 100644
--- a/keyboards/ergodox_ez/keymaps/msc/readme.md
+++ b/keyboards/ergodox/keymaps/msc/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/naps62/keymap.c b/keyboards/ergodox/keymaps/naps62/keymap.c
index d8c28423cf..d8c28423cf 100644
--- a/keyboards/ergodox_ez/keymaps/naps62/keymap.c
+++ b/keyboards/ergodox/keymaps/naps62/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/naps62/readme.md b/keyboards/ergodox/keymaps/naps62/readme.md
index 14728e4cc4..14728e4cc4 100644
--- a/keyboards/ergodox_ez/keymaps/naps62/readme.md
+++ b/keyboards/ergodox/keymaps/naps62/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c
index 778cbc63cf..778cbc63cf 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/keymap.c
+++ b/keyboards/ergodox/keymaps/ordinary/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboards/ergodox/keymaps/ordinary/ordinary-base.png
index 9c561a10aa..9c561a10aa 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-base.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
index 25731ea2e6..25731ea2e6 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboards/ergodox/keymaps/ordinary/ordinary-media.png
index 99e5ed80b1..99e5ed80b1 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-media.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
index 4eccc9f350..4eccc9f350 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png b/keyboards/ergodox/keymaps/ordinary/ordinary-special.png
index 6eecf447ee..6eecf447ee 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-special.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
index a08827c6de..a08827c6de 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.png
index e4de64a96f..e4de64a96f 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
index e199f5c59f..e199f5c59f 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/readme.md b/keyboards/ergodox/keymaps/ordinary/readme.md
index 6465cd79e0..6465cd79e0 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/readme.md
+++ b/keyboards/ergodox/keymaps/ordinary/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/keymap.c b/keyboards/ergodox/keymaps/osx_de/keymap.c
index 554813d7e8..554813d7e8 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png b/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png
index d442a992c8..d442a992c8 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png
+++ b/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/readme.md b/keyboards/ergodox/keymaps/osx_de/readme.md
index 5011a9dd62..5011a9dd62 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de/readme.md
+++ b/keyboards/ergodox/keymaps/osx_de/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
index 687a5cb8b5..687a5cb8b5 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png b/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
index 193aa339e6..193aa339e6 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
+++ b/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
index 21d695894a..21d695894a 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png b/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png
index 031d874a7b..031d874a7b 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md b/keyboards/ergodox/keymaps/osx_de_experimental/readme.md
index e6a1018416..e6a1018416 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_fr/keymap.c b/keyboards/ergodox/keymaps/osx_fr/keymap.c
index de951666dd..de951666dd 100644
--- a/keyboards/ergodox_ez/keymaps/osx_fr/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_fr/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
index 1032be5491..1032be5491 100644
--- a/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/plover/keymap.c b/keyboards/ergodox/keymaps/plover/keymap.c
index 8a58a37f68..8a58a37f68 100644
--- a/keyboards/ergodox_ez/keymaps/plover/keymap.c
+++ b/keyboards/ergodox/keymaps/plover/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/plums/keymap.c b/keyboards/ergodox/keymaps/plums/keymap.c
index 46eb2e42b1..46eb2e42b1 100644
--- a/keyboards/ergodox_ez/keymaps/plums/keymap.c
+++ b/keyboards/ergodox/keymaps/plums/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/plums/plums.png b/keyboards/ergodox/keymaps/plums/plums.png
index 2f127c4cab..2f127c4cab 100644
--- a/keyboards/ergodox_ez/keymaps/plums/plums.png
+++ b/keyboards/ergodox/keymaps/plums/plums.png
diff --git a/keyboards/ergodox_ez/keymaps/plums/readme.md b/keyboards/ergodox/keymaps/plums/readme.md
index b72329eef7..b72329eef7 100644
--- a/keyboards/ergodox_ez/keymaps/plums/readme.md
+++ b/keyboards/ergodox/keymaps/plums/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
index a66971befd..a66971befd 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
index 80475ab21e..80475ab21e 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
index 4b9433be28..4b9433be28 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
index 7c9f673816..7c9f673816 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
index 16cebd0912..16cebd0912 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
index cdc535f79e..cdc535f79e 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
index 9971b834cf..9971b834cf 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
index 804c52a767..804c52a767 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
index 10b0752be5..10b0752be5 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
index dedac694e4..dedac694e4 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
index 0e78c130b3..0e78c130b3 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
index 34762ecb75..34762ecb75 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/sneako/keymap.c b/keyboards/ergodox/keymaps/sneako/keymap.c
index 0c68631029..0c68631029 100644
--- a/keyboards/ergodox_ez/keymaps/sneako/keymap.c
+++ b/keyboards/ergodox/keymaps/sneako/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/sneako/readme.md b/keyboards/ergodox/keymaps/sneako/readme.md
index 8dd110ee68..8dd110ee68 100644
--- a/keyboards/ergodox_ez/keymaps/sneako/readme.md
+++ b/keyboards/ergodox/keymaps/sneako/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboards/ergodox/keymaps/software_neo2/keymap.c
index 2eaba0d7da..2eaba0d7da 100644
--- a/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/software_neo2/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/config_user.h b/keyboards/ergodox/keymaps/supercoder/config_user.h
index 8da1383726..8da1383726 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/config_user.h
+++ b/keyboards/ergodox/keymaps/supercoder/config_user.h
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/images/layout.png b/keyboards/ergodox/keymaps/supercoder/images/layout.png
index c72958c6e7..c72958c6e7 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/images/layout.png
+++ b/keyboards/ergodox/keymaps/supercoder/images/layout.png
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg b/keyboards/ergodox/keymaps/supercoder/images/supercoder_2000.jpg
index d690eaf020..d690eaf020 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg
+++ b/keyboards/ergodox/keymaps/supercoder/images/supercoder_2000.jpg
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/keymap.c b/keyboards/ergodox/keymaps/supercoder/keymap.c
index ca21d30fd2..ca21d30fd2 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/keymap.c
+++ b/keyboards/ergodox/keymaps/supercoder/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/makefile.mk b/keyboards/ergodox/keymaps/supercoder/makefile.mk
index 41a195d9c0..41a195d9c0 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/makefile.mk
+++ b/keyboards/ergodox/keymaps/supercoder/makefile.mk
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/readme.md b/keyboards/ergodox/keymaps/supercoder/readme.md
index 97bf7f5835..97bf7f5835 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/readme.md
+++ b/keyboards/ergodox/keymaps/supercoder/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/techtomas/keymap.c b/keyboards/ergodox/keymaps/techtomas/keymap.c
index 1ff6618b98..1ff6618b98 100644
--- a/keyboards/ergodox_ez/keymaps/techtomas/keymap.c
+++ b/keyboards/ergodox/keymaps/techtomas/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/techtomas/readme.md b/keyboards/ergodox/keymaps/techtomas/readme.md
index 36e0591a8e..36e0591a8e 100644
--- a/keyboards/ergodox_ez/keymaps/techtomas/readme.md
+++ b/keyboards/ergodox/keymaps/techtomas/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/keymap.c b/keyboards/ergodox/keymaps/teckinesis/keymap.c
index ec6ceb96bc..ec6ceb96bc 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/keymap.c
+++ b/keyboards/ergodox/keymaps/teckinesis/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.png b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png
index 6eecf447ee..6eecf447ee 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.png
+++ b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.txt b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
index a08827c6de..a08827c6de 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.txt
+++ b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/readme.md b/keyboards/ergodox/keymaps/teckinesis/readme.md
index 9494a4d4c2..9494a4d4c2 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/readme.md
+++ b/keyboards/ergodox/keymaps/teckinesis/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
index 69fe28cf7c..69fe28cf7c 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.png
index 7c4584e9f3..7c4584e9f3 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
index 65fe394e8a..65fe394e8a 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.json
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.png
index cc51605f92..cc51605f92 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.png
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
index 439d0128ea..439d0128ea 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.json
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.png
index 7ca86cf47d..7ca86cf47d 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.png
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.png
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/README.md b/keyboards/ergodox/keymaps/tkuichooseyou/README.md
index ab02fac2ca..ab02fac2ca 100644
--- a/keyboards/ergodox_ez/keymaps/tkuichooseyou/README.md
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/README.md
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/compiled.hex b/keyboards/ergodox/keymaps/tkuichooseyou/compiled.hex
index a8cf4527a5..a8cf4527a5 100644
--- a/keyboards/ergodox_ez/keymaps/tkuichooseyou/compiled.hex
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/compiled.hex
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/keymap.c b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
index 87b77e42ef..87b77e42ef 100644
--- a/keyboards/ergodox_ez/keymaps/tkuichooseyou/keymap.c
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/tm2030/keymap.c b/keyboards/ergodox/keymaps/tm2030/keymap.c
index ca80752263..ca80752263 100644
--- a/keyboards/ergodox_ez/keymaps/tm2030/keymap.c
+++ b/keyboards/ergodox/keymaps/tm2030/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/tm2030/readme.md b/keyboards/ergodox/keymaps/tm2030/readme.md
index 6cd794726d..6cd794726d 100644
--- a/keyboards/ergodox_ez/keymaps/tm2030/readme.md
+++ b/keyboards/ergodox/keymaps/tm2030/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
index 87b9fb6764..87b9fb6764 100644
--- a/keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md b/keyboards/ergodox/keymaps/tonyabra_osx/readme.md
index f9d76efc23..f9d76efc23 100644
--- a/keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md
+++ b/keyboards/ergodox/keymaps/tonyabra_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/config.h b/keyboards/ergodox/keymaps/townk_osx/config.h
index 58ba690afd..58ba690afd 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/config.h
+++ b/keyboards/ergodox/keymaps/townk_osx/config.h
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboards/ergodox/keymaps/townk_osx/keymap.c
index 07e58a491b..07e58a491b 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/townk_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk b/keyboards/ergodox/keymaps/townk_osx/makefile.mk
index e757557bda..e757557bda 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk
+++ b/keyboards/ergodox/keymaps/townk_osx/makefile.mk
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/readme.md b/keyboards/ergodox/keymaps/townk_osx/readme.md
index c2853ca173..c2853ca173 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/readme.md
+++ b/keyboards/ergodox/keymaps/townk_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_base.png
index f9bc8b443a..f9bc8b443a 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png
+++ b/keyboards/ergodox/keymaps/townk_osx/townk_osx_base.png
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_fn.png
index 983b723480..983b723480 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png
+++ b/keyboards/ergodox/keymaps/townk_osx/townk_osx_fn.png
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_keypad.png
index 8f04b4327d..8f04b4327d 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png
+++ b/keyboards/ergodox/keymaps/townk_osx/townk_osx_keypad.png
diff --git a/keyboards/ergodox_ez/keymaps/twey/keymap.c b/keyboards/ergodox/keymaps/twey/keymap.c
index 019930f2a2..019930f2a2 100644
--- a/keyboards/ergodox_ez/keymaps/twey/keymap.c
+++ b/keyboards/ergodox/keymaps/twey/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/twey/readme.md b/keyboards/ergodox/keymaps/twey/readme.md
index 979e4261e5..979e4261e5 100644
--- a/keyboards/ergodox_ez/keymaps/twey/readme.md
+++ b/keyboards/ergodox/keymaps/twey/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
index 8effa53b26..8effa53b26 100644
--- a/keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c
+++ b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
index 3444152bc3..3444152bc3 100644
--- a/keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
index 7bce7c6909..7bce7c6909 100644
--- a/keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown
+++ b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown