451 files changed, 1651 insertions, 1477 deletions

diff --git a/Makefile b/Makefile
index ebad723bee..59c2fa7b4f 100644
--- a/Makefile
+++ b/Makefile
@@ -314,11 +314,21 @@ define PARSE_SUBPROJECT
     ifneq ($$(CURRENT_SP),allsp)
         # get a list of all keymaps
         KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.)))
+        LAYOUTS :=
+        $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
+        KEYBOARD_LAYOUTS := $$(LAYOUTS)
         ifneq ($$(CURRENT_SP),)
             # if the subproject is defined, then also look for keymaps inside the subproject folder
             SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.)))
             KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS))
+	        # $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/rules.mk)
+        	# KEYBOARD_LAYOUTS := $$(sort $$(KEYBOARD_LAYOUTS) $$(LAYOUTS))
         endif
+
+        LAYOUT_KEYMAPS :=
+        $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
+        
+        KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
         # if the rule after removing the start of it is empty (we haven't specified a kemap or target)
         # compile all the keymaps
         ifeq ($$(RULE),)
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 3ec389ac9f..e8e21f2ba1 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -39,6 +39,7 @@ ifneq ("$(wildcard $(KEYBOARD_C))","")
 else
     $(error "$(KEYBOARD_C)" does not exist)
 endif
+OPT_DEFS += -DKEYBOARD_$(KEYBOARD)
 
 ifneq ($(SUBPROJECT),)
     SUBPROJECT_PATH := keyboards/$(KEYBOARD)/$(SUBPROJECT)
@@ -97,11 +98,13 @@ else ifneq ("$(wildcard $(MAIN_KEYMAP_C))","")
     -include $(MAIN_KEYMAP_PATH)/Makefile
     KEYMAP_C := $(MAIN_KEYMAP_C)
     KEYMAP_PATH := $(MAIN_KEYMAP_PATH)
+else ifneq ($(LAYOUTS),)
+    include build_layout.mk
 else
-    $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist)
+    $(error Could not find keymap)
+    # this state should never be reached
 endif
 
-
 # Object files directory
 #     To put object files in current directory, use a dot (.), do NOT make
 #     this an empty or blank macro!
@@ -157,7 +160,10 @@ endif
 
 OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
-$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
+$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \
+-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD).h\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH)/config.h\" \
+-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
+-DQMK_SUBPROJECT=\"$(SUBPROJECT)\" -DQMK_SUBPROJECT_H=\"$(SUBPROJECT).h\" -DQMK_SUBPROJECT_CONFIG_H=\"$(SUBPROJECT_PATH)/config.h\"
 $(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
 $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(GFXSRC)
diff --git a/build_layout.mk b/build_layout.mk
new file mode 100644
index 0000000000..beb1cb6627
--- /dev/null
+++ b/build_layout.mk
@@ -0,0 +1,18 @@
+LAYOUTS_PATH := layouts
+LAYOUTS_REPOS := $(patsubst %/,%,$(sort $(dir $(wildcard $(LAYOUTS_PATH)/*/))))
+
+define SEARCH_LAYOUTS_REPO
+    LAYOUT_KEYMAP_PATH := $$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP)
+    LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c
+    ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
+        -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
+        KEYMAP_C := $$(LAYOUT_KEYMAP_C)
+        KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
+    endif
+endef
+
+define SEARCH_LAYOUTS
+    $$(foreach LAYOUTS_REPO,$$(LAYOUTS_REPOS),$$(eval $$(call SEARCH_LAYOUTS_REPO)))
+endef
+
+$(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
\ No newline at end of file
diff --git a/docs/_summary.md b/docs/_summary.md
index e32548f5b1..77d208fc3c 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -12,6 +12,7 @@
   * [Keymap](faq_keymap.md)
 
 * [Features](features.md)
+  * [Layouts](feature_layouts.md)
   * [Common Shortcuts](feature_common_shortcuts.md)
   * [Backlight](feature_backlight.md)
   * [Bootmagic](feature_bootmagic.md)
diff --git a/docs/feature_layouts.md b/docs/feature_layouts.md
new file mode 100644
index 0000000000..4d75270dcd
--- /dev/null
+++ b/docs/feature_layouts.md
@@ -0,0 +1,77 @@
+# Layouts: Using a keymap with multiple keyboards
+
+The `layouts/` folder contains different physical key layouts that can apply to different keyboards. 
+
+```
+layouts/
++ default/
+| + 60_ansi/
+| | + readme.md
+| | + layout.json
+| | + a_good_keymap/
+| | | + keymap.c
+| | | + readme.md
+| | | + config.h
+| | | + rules.mk
+| | + <keymap folder>/
+| | + ...
+| + <layout folder>/
++ community/
+| + <layout folder>/
+| + ...
+```
+
+The `layouts/default/` and `layouts/community/` are two examples of layout "repositories" - currently `default` will contain all of the information concerning the layout, and one default keymap named `default_<layout>`, for users to use as a reference. `community` contains all of the community keymaps, with the eventual goal of being split-off into a separate repo for users to clone into `layouts/`. QMK searches through all folders in `layouts/`, so it's possible to have multiple reposistories here. 
+
+Each layout folder is named (`[a-z0-9_]`) after the physical aspects of the layout, in the most generic way possible, and contains a `readme.md` with the layout to be defined by the keyboard:
+
+```md
+# 60_ansi
+
+   LAYOUT_60_ansi
+```
+
+New names should try to stick to the standards set by existing layouts, and can be discussed in the PR/Issue.
+
+## Supporting a layout
+
+For a keyboard to support a layout, the variable (`[a-z0-9_]`) must be defined in it's `<keyboard>.h`, and match the number of arguments/keys (and preferrably the physical layout):
+
+    #define LAYOUT_60_ansi KEYMAP_ANSI
+
+The folder name must be added to the keyboard's `rules.mk`:
+
+    LAYOUTS = 60_ansi
+
+`LAYOUTS` can be appended in the subproject's `rules.mk`:
+
+    LAYOUTS += 60_iso
+
+but the `LAYOUT_<layout>` variable must be defined in `<subproject>.h` as well.
+
+## Tips for making layouts keyboard-agnostic
+
+Instead of using `#include "planck.h"`, you can use this line to include whatever `<keyboard>.h` (`<subproject>.h` should not be included here) file that is being compiled:
+
+    #include QMK_KEYBOARD_H
+
+In your config.h, you can also use this variable to include the keyboard's `config.h`:
+
+    #include QMK_KEYBOARD_CONFIG_H
+
+If you want to keep some keyboard-specific code, you can use these variables to escape it with an `#ifdef` statement:
+
+* `KEYBOARD_<keyboard>`
+* `SUBPROJECT_<subproject>`
+
+For example:
+
+```c
+#ifdef KEYBOARD_planck
+    #ifdef SUBPROJECT_rev4
+        planck_rev4_function();
+    #endif
+#endif
+```
+
+Note that the names are lowercase and match the folder/file names for the keyboard/subproject exactly.
\ No newline at end of file
diff --git a/keyboards/alps64/alps64.h b/keyboards/alps64/alps64.h
index f265c3358e..83af132dfc 100644
--- a/keyboards/alps64/alps64.h
+++ b/keyboards/alps64/alps64.h
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 /* Alps64 keymap definition macro */
+
 #define KEYMAP( \
     K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
     K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
@@ -27,6 +28,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
     K30, K40, K50,           K60,                     K70, K00, K10, K20  \
 ) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { K70, K71, K72, K73, K74, K75, K76, K77 } \
+}
+
+#define KC_KEYMAP( \
+    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
+    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
+    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
+    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
+    K30, K40, K50,           K60,                     K70, K00, K10, K20  \
+) { \
     { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
     { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
     { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
diff --git a/keyboards/alps64/keymaps/default/keymap.c b/keyboards/alps64/keymaps/default/keymap.c
index 2c45dc7f34..49ef9b2bf3 100644
--- a/keyboards/alps64/keymaps/default/keymap.c
+++ b/keyboards/alps64/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: qwerty */
-    KEYMAP( \
+    KC_KEYMAP( \
         GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, NUHS, BSPC, \
         TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
         CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,ENT,  \
diff --git a/keyboards/amj60/amj60.h b/keyboards/amj60/amj60.h
index c508e479ca..b6aa6b7d3c 100644
--- a/keyboards/amj60/amj60.h
+++ b/keyboards/amj60/amj60.h
@@ -63,6 +63,8 @@
     {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d}  \
 }
 
+#define LAYOUT_60_ansi KEYMAP_ANSI
+
 /* AMJ60 HHKB matrix layout
    * ,------------------------------------------------------------.
    * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d| 49 |
@@ -119,6 +121,7 @@
     {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX}, \
     {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d}  \
 }
+
 /* ISO w/ split right shift key matrix layout
    * ,-----------------------------------------------------------.
    * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    |
diff --git a/keyboards/amj60/rules.mk b/keyboards/amj60/rules.mk
index a1b4f8a618..0df13d3062 100644
--- a/keyboards/amj60/rules.mk
+++ b/keyboards/amj60/rules.mk
@@ -64,3 +64,5 @@ MIDI_ENABLE      = no  # MIDI controls
 AUDIO_ENABLE     = no
 UNICODE_ENABLE   = no  # Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
+
+LAYOUTS = 60_ansi
\ No newline at end of file
diff --git a/keyboards/atomic/atomic.h b/keyboards/atomic/atomic.h
index 88e11fadff..b7ceb68d07 100644
--- a/keyboards/atomic/atomic.h
+++ b/keyboards/atomic/atomic.h
@@ -24,4 +24,20 @@
     { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E }  \
 }
 
+#define KEYMAP_GRID( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_ortho_5x15 KEYMAP_GRID
+
 #endif
\ No newline at end of file
diff --git a/keyboards/atomic/rules.mk b/keyboards/atomic/rules.mk
index 0bedc6f5c8..3bd04a00a7 100644
--- a/keyboards/atomic/rules.mk
+++ b/keyboards/atomic/rules.mk
@@ -66,4 +66,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_5x15
\ No newline at end of file
diff --git a/keyboards/atreus/rules.mk b/keyboards/atreus/rules.mk
index 12d3ca6c56..2362395569 100644
--- a/keyboards/atreus/rules.mk
+++ b/keyboards/atreus/rules.mk
@@ -78,5 +78,5 @@ UNICODE_ENABLE = YES 		# Unicode
 
 USB = /dev/cu.usbmodem1411
 
-upload: build
-	$(ATREUS_UPLOAD_COMMAND)
+# upload: build
+# 	$(ATREUS_UPLOAD_COMMAND)
diff --git a/keyboards/chibios_test/stm32_f072_onekey/rules.mk b/keyboards/chibios_test/stm32_f072_onekey/rules.mk
index eae38c4b2b..91c17c0244 100644
--- a/keyboards/chibios_test/stm32_f072_onekey/rules.mk
+++ b/keyboards/chibios_test/stm32_f072_onekey/rules.mk
@@ -35,7 +35,4 @@ ARMV = 6
 
 # Build Options
 #   comment out to disable the options.
-#
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+#
\ No newline at end of file
diff --git a/keyboards/chibios_test/stm32_f103_onekey/rules.mk b/keyboards/chibios_test/stm32_f103_onekey/rules.mk
index 307ca5b198..c75738338a 100644
--- a/keyboards/chibios_test/stm32_f103_onekey/rules.mk
+++ b/keyboards/chibios_test/stm32_f103_onekey/rules.mk
@@ -44,9 +44,4 @@ ARMV = 7
 # http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
 # This also requires a patch to chibios:
 #   <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
-#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
-
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
\ No newline at end of file
diff --git a/keyboards/chibios_test/teensy_lc_onekey/rules.mk b/keyboards/chibios_test/teensy_lc_onekey/rules.mk
index 43ea9d82d9..4deee1f579 100644
--- a/keyboards/chibios_test/teensy_lc_onekey/rules.mk
+++ b/keyboards/chibios_test/teensy_lc_onekey/rules.mk
@@ -42,8 +42,4 @@ MCU  = cortex-m0plus
 
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 # I.e. 6 for Teensy LC; 7 for Teensy 3.x
-ARMV = 6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+ARMV = 6
\ No newline at end of file
diff --git a/keyboards/clueboard/rev1/rules.mk b/keyboards/clueboard/rev1/rules.mk
index 80a942d06f..f845616741 100644
--- a/keyboards/clueboard/rev1/rules.mk
+++ b/keyboards/clueboard/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/clueboard/rev2/rules.mk b/keyboards/clueboard/rev2/rules.mk
index cea967b795..54a2685bf6 100644
--- a/keyboards/clueboard/rev2/rules.mk
+++ b/keyboards/clueboard/rev2/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/eco/rev1/rules.mk b/keyboards/eco/rev1/rules.mk
index a0825b4ef6..f845616741 100644
--- a/keyboards/eco/rev1/rules.mk
+++ b/keyboards/eco/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/eco/rev2/rules.mk b/keyboards/eco/rev2/rules.mk
index a0825b4ef6..f845616741 100644
--- a/keyboards/eco/rev2/rules.mk
+++ b/keyboards/eco/rev2/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/ergodox/ergodone/Makefile b/keyboards/ergodone/Makefile
index bd09e5885d..bd09e5885d 100644
--- a/keyboards/ergodox/ergodone/Makefile
+++ b/keyboards/ergodone/Makefile
diff --git a/keyboards/ergodox/ergodone/config.h b/keyboards/ergodone/config.h
index 52ae2d576c..d3e0f80360 100644
--- a/keyboards/ergodox/ergodone/config.h
+++ b/keyboards/ergodone/config.h
@@ -1,8 +1,6 @@
 #ifndef ERGODOX_ERGODONE_CONFIG_H
 #define ERGODOX_ERGODONE_CONFIG_H
 
-#include "../config.h"
-
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
@@ -17,6 +15,31 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
 
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3
 
diff --git a/keyboards/ergodox/ergodone/ergodone.c b/keyboards/ergodone/ergodone.c
index 6b8d8a0632..6b8d8a0632 100644
--- a/keyboards/ergodox/ergodone/ergodone.c
+++ b/keyboards/ergodone/ergodone.c
diff --git a/keyboards/ergodox/ergodone/ergodone.h b/keyboards/ergodone/ergodone.h
index cddc1fbe7a..9f6c8f841b 100644
--- a/keyboards/ergodox/ergodone/ergodone.h
+++ b/keyboards/ergodone/ergodone.h
@@ -60,4 +60,6 @@ inline void ergodox_led_all_set(uint8_t n)              {}
     { KC_NO, k51, k52, k53, k54, k55,   k56,      k57,   k58,   k59, k5A, k5B, k5C, KC_NO  } \
    }
 
+#define LAYOUT_ergodox KEYMAP
+
 #endif
diff --git a/keyboards/ergodox/ergodone/expander.c b/keyboards/ergodone/expander.c
index 0c8a2289c5..0c8a2289c5 100644
--- a/keyboards/ergodox/ergodone/expander.c
+++ b/keyboards/ergodone/expander.c
diff --git a/keyboards/ergodox/ergodone/expander.h b/keyboards/ergodone/expander.h
index 8676fed693..8676fed693 100644
--- a/keyboards/ergodox/ergodone/expander.h
+++ b/keyboards/ergodone/expander.h
diff --git a/keyboards/ergodox/ergodone/i2cmaster.h b/keyboards/ergodone/i2cmaster.h
index 3917b9e6c0..3917b9e6c0 100644
--- a/keyboards/ergodox/ergodone/i2cmaster.h
+++ b/keyboards/ergodone/i2cmaster.h
diff --git a/keyboards/ergodox/keymaps/default/keymap.c b/keyboards/ergodone/keymaps/default/keymap.c
index 4477cab310..cbc180d6a0 100644
--- a/keyboards/ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodone/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/default/readme.md b/keyboards/ergodone/keymaps/default/readme.md
index 1150a4f709..1150a4f709 100644
--- a/keyboards/ergodox/keymaps/default/readme.md
+++ b/keyboards/ergodone/keymaps/default/readme.md
diff --git a/keyboards/ergodox/ergodone/matrix.c b/keyboards/ergodone/matrix.c
index 2eb8f24ba8..2eb8f24ba8 100644
--- a/keyboards/ergodox/ergodone/matrix.c
+++ b/keyboards/ergodone/matrix.c
diff --git a/keyboards/ergodox/ergodone/readme.md b/keyboards/ergodone/readme.md
index 789819e67a..789819e67a 100644
--- a/keyboards/ergodox/ergodone/readme.md
+++ b/keyboards/ergodone/readme.md
diff --git a/keyboards/ergodox/ergodone/rules.mk b/keyboards/ergodone/rules.mk
index e7fd4e0aba..bbad0ae730 100644
--- a/keyboards/ergodox/ergodone/rules.mk
+++ b/keyboards/ergodone/rules.mk
@@ -70,6 +70,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
+CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
+UNICODE_ENABLE          = yes # Unicode
 BOOTMAGIC_ENABLE        = yes	# Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE         = yes	# Mouse keys(+4700)
 EXTRAKEY_ENABLE         = yes	# Audio control and System control(+450)
@@ -89,3 +91,5 @@ LEDMAP_IN_EEPROM_ENABLE = no  # Read LED mapping from eeprom
 ONEHAND_ENABLE          = no  # Disable Onehand
 RGBLIGHT_ENABLE         = no
 MIDI_ENABLE             = no
+
+LAYOUTS = ergodox ergodox_80
\ No newline at end of file
diff --git a/keyboards/ergodox/ergodone/twimaster.c b/keyboards/ergodone/twimaster.c
index f91c08e6e4..f91c08e6e4 100644
--- a/keyboards/ergodox/ergodone/twimaster.c
+++ b/keyboards/ergodone/twimaster.c
diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
deleted file mode 100644
index 7165350050..0000000000
--- a/keyboards/ergodox/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBPROJECT_DEFAULT = ez
-
-ifndef MAKEFILE_INCLUDED
-	include ../../Makefile
-endif
\ No newline at end of file
diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h
deleted file mode 100644
index 0e461e59dc..0000000000
--- a/keyboards/ergodox/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
-#define KEYBOARDS_ERGODOX_CONFIG_H_
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
-
-#define TAPPING_TOGGLE  1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-#define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
-
-#ifdef SUBPROJECT_ez
-    #include "ez/config.h"
-#endif
-#ifdef SUBPROJECT_infinity
-    #include "infinity/config.h"
-#endif
-#ifdef SUBPROJECT_ergodone
-    #include "ergodone/config.h"
-#endif
-
-
-#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
diff --git a/keyboards/ergodox/ergodox.c b/keyboards/ergodox/ergodox.c
deleted file mode 100644
index 648ec8ad2e..0000000000
--- a/keyboards/ergodox/ergodox.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "ergodox.h"
-#include "debug.h"
-#include "action_layer.h"
-
diff --git a/keyboards/ergodox/ergodox.h b/keyboards/ergodox/ergodox.h
deleted file mode 100644
index f060c8f996..0000000000
--- a/keyboards/ergodox/ergodox.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef KEYBOARDS_ERGODOX_ERGODOX_H_
-#define KEYBOARDS_ERGODOX_ERGODOX_H_
-#ifdef SUBPROJECT_ez
-    #include "ez.h"
-#endif
-#ifdef SUBPROJECT_infinity
-    #include "infinity.h"
-#endif
-#ifdef SUBPROJECT_ergodone
-    #include "ergodone.h"
-#endif
-
-#endif /* KEYBOARDS_ERGODOX_ERGODOX_H_ */
diff --git a/keyboards/ergodox/keymaps/belak/Makefile b/keyboards/ergodox/keymaps/belak/Makefile
deleted file mode 100644
index 8a6beea591..0000000000
--- a/keyboards/ergodox/keymaps/belak/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TAP_DANCE_ENABLE=yes
-UNICODE_ENABLE=yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/ergodox/keymaps/common-nighthawk/Makefile b/keyboards/ergodox/keymaps/common-nighthawk/Makefile
deleted file mode 100644
index fafa40c43d..0000000000
--- a/keyboards/ergodox/keymaps/common-nighthawk/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBPROJECT_DEFAULT = ez
-TAP_DANCE_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c
deleted file mode 100644
index 502e53f3d1..0000000000
--- a/keyboards/ergodox/keymaps/default/visualizer.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Fred Sundvik
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "simple_visualizer.h"
-
-// This function should be implemented by the keymap visualizer
-// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing
-// that the simple_visualizer assumes that you are updating
-// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is
-// stopped. This can be done by either double buffering it or by using constant strings
-static void get_visualizer_layer_and_color(visualizer_state_t* state) {
-    uint8_t saturation = 60;
-    if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) {
-        saturation = 255;
-    }
-    if (state->status.layer & 0x4) {
-        state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF);
-        state->layer_text = "Media & Mouse";
-    }
-    else if (state->status.layer & 0x2) {
-        state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF);
-        state->layer_text = "Symbol";
-    }
-    else {
-        state->target_lcd_color = LCD_COLOR(84, saturation, 0xFF);
-        state->layer_text = "Default";
-    }
-}
diff --git a/keyboards/ergodox/keymaps/jack/Makefile b/keyboards/ergodox/keymaps/jack/Makefile
deleted file mode 100644
index 457a3d01d4..0000000000
--- a/keyboards/ergodox/keymaps/jack/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/ergodox/keymaps/kristian/keymap.c b/keyboards/ergodox/keymaps/kristian/keymap.c
deleted file mode 100644
index e7e4243255..0000000000
--- a/keyboards/ergodox/keymaps/kristian/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "ergodox.h"
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_fr_ch.h"
-#include "keymap_french.h"
-#include "keymap_german.h"
-#include "keymap_german_ch.h"
-#include "keymap_nordic.h"
-#include "keymap_norwegian.h"
-#include "keymap_spanish.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[0] = KEYMAP(NO_LESS,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_APOS),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_AM,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSLH),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_APOS),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_APOS,KC_LALT,KC_LGUI,KC_ENTER),
-
-[1] = KEYMAP(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER),
-
-[2] = KEYMAP(KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LALT,KC_LGUI,KC_MS_BTN1,KC_MS_BTN2,KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_SPACE,KC_LGUI,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_ESCAPE,KC_MS_WH_UP,KC_MS_WH_DOWN,KC_MS_ACCEL0,KC_MS_ACCEL1),
-
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-  [1] = ACTION_LAYER_TAP_TOGGLE(1)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-void matrix_scan_user(void) {
-
-    uint8_t layer = biton32(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        case 6:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case 7:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-
-};
diff --git a/keyboards/ergodox/keymaps/sethbc/Makefile b/keyboards/ergodox/keymaps/sethbc/Makefile
deleted file mode 100644
index 457a3d01d4..0000000000
--- a/keyboards/ergodox/keymaps/sethbc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/ergodox/keymaps/yoruian/Makefile b/keyboards/ergodox/keymaps/yoruian/Makefile
deleted file mode 100644
index b43a24c611..0000000000
--- a/keyboards/ergodox/keymaps/yoruian/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
-install-xorg-configuration:
-	install -m 0664 90-$(KEYBOARD)-$(KEYMAP).conf \
-	    /etc/X11/xorg.conf.d/90-$(KEYBOARD)-$(KEYMAP).conf
-	install -m 0644 $(KEYBOARD)_$(KEYMAP) \
-	    /usr/share/X11/xkb/symbols/$(KEYBOARD)_$(KEYMAP)
-
-uninstall-xorg-configuration:
-	-rm -f /etc/X11/xorg.conf.d/90-$(KEYBOARD)-$(KEYMAP).conf
-	-rm -f /usr/share/X11/xkb/symbols/$(KEYBOARD)_$(KEYMAP)
diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md
deleted file mode 100644
index 3a87606cd0..0000000000
--- a/keyboards/ergodox/readme.md
+++ /dev/null
@@ -1,111 +0,0 @@
-ErgoDox
-==
-
-The ErgoDox is a split ergonomic keyboard originally developed by Dominic "Dox" Beauchamp.
-
-* The **ErgoDox EZ** is a Teensy-based split mechanical keyboard, sold assembled and with warranty at [ErgoDox-EZ.com](https://ergodox-ez.com).
-* The **ErgoDox Infinity** is an ARM-based split mechanical keyboard, sold from time to time in kit form at [MassDrop.com](https://www.massdrop.com/buy/infinity-ergodox)
-
-The ErgoDox EZ code is maintained by Erez Zukerman and is officially supported by the EZ -- the keyboard ships running QMK from the factory.
-
-The ErgoDox Infinity code is maintained by Fredizzimo, as a community contribution.
-
-## Standard Build Instructions
-
-To build QMK for the ErgoDox, see the official [build guide](/docs/build_guide.md).
-
-## Additional resources
-
-A graphical configurator for the ErgoDox EZ is available at [configure.ergodox-ez.com](http://configure.ergodox-ez.com). It outputs QMK-compiled binaries, as well as source code for your layout, which you can use as a jumping-off point to further customize in QMK.
-
-# Flashing Firmware
-
-## ErgoDox EZ
-
-The Ez uses the [Teensy Loader](https://www.pjrc.com/teensy/loader.html).
-
-Linux users need to modify udev rules as described on the [Teensy
-Linux page].  Some distributions provide a binary, maybe called
-`teensy-loader-cli`.
-
-[Teensy Linux page]: https://www.pjrc.com/teensy/loader_linux.html
-
-To flash the firmware:
-
-  - Build the firmware with `make keymapname`, for example `make default`
-  - This will result in a hex file called `ergodox_ez_keymapname.hex`, e.g.
-    `ergodox_ez_default.hex`
-
-  - Start the teensy loader.
-
-  - Load the .hex file into it.
-
-  - Press the Reset button by inserting a paperclip gently into the reset hole
-    in the top right corder.
-
-  - Click the button in the Teensy app to download the firmware.
-
-To flash with ´teensy-loader-cli´:
-
-  - Build the firmware with `make keymapname`, for example `make default`
-
-  - Run ´<path/to/>teensy_loader_cli -mmcu=atmega32u4 -w ergodox_ez_<keymap>.hex´
-
-  - Press the Reset button by inserting a paperclip gently into the reset hole
-    in the top right corder.
-
-## ErgoDox Infinity
-
-The Infinity is two completely independent keyboards, and needs to be flashed
-for the left and right halves seperately.  To flash them:
-
-  - Build the firmware with `make infinity-keymapname`
-
-  - Plug in the left hand keyboard only.
-
-  - Press the program button (back of keyboard, above thumb pad).
-
-  - Install the firmware with `sudo make infinity-keymapname-dfu-util`
-
-  - Build right hand firmware with `make infinity-keymapname MASTER=right`
-
-  - Plug in the right hand keyboard only.
-
-  - Press the program button (back of keyboard, above thumb pad).
-
-  - Install the firmware with `sudo make infinity-keymapname-dfu-util MASTER=right`
-
-More information on the Infinity firmware is available in the [TMK/chibios for
-Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
-
-### Infinity Master/Two Halves
-
-The Infinity is two completely independent keyboards, that can connect together.
-You have a few options in how you flash the firmware:
-
-- Flash the left half, rebuild the firmware with "MASTER=right" and then flash
-  the right half.  This allows you to plug in either half directly to the
-  computer and is what the above instructions do.
-
-- Flash the left half, then flash the same firmware on the right.  This only
-  works when the left half is plugged directly to the computer and the keymap
-  is mirrored.  It saves the small extra step of rebuilding with
-  "MASTER=right".
-
-- The same as the previous one but with "MASTER=right" when you build the
-  firmware, then flash the same firmware to both halves.  You just have to
-  directly connect the right half to the computer.
-
-- For minor changes such as changing only the keymap without having updated
-  any part of the firmware code itself, you can program only the MASTER half.
-  It is safest to program both halves though.
-
-## ErgoDone
-
-The ErgoDone uses its own HID bootloader and needs to be flashed using the [TKG Toolkit](https://github.com/kairyu/tkg-toolkit).
-
-  - Build the firmware with `make ergodone-keymapname`
-
-  - While plugging in the USB cable, hold the two right-most keys on the left half of the ErgoDone to enter FLASH mode.
-
-  - Use the utility from [TKG Toolkit](https://github.com/kairyu/tkg-toolkit) to flash the keyboard: `hid_bootloader_cli -mmcu=atmega32u4 ergodox_ergodone_keymapname.hex`
diff --git a/keyboards/ergodox/rules.mk b/keyboards/ergodox/rules.mk
deleted file mode 100644
index 5939d634c1..0000000000
--- a/keyboards/ergodox/rules.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-# 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).
-#
-#----------------------------------------------------------------------------
-# 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
-UNICODE_ENABLE   = yes # Unicode
-ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
diff --git a/keyboards/ergodox/ez/190hotfix.sh b/keyboards/ergodox_ez/190hotfix.sh
index bdc3adce22..bdc3adce22 100755..100644
--- 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 663e09b7b4..e24600d884 100644
--- a/keyboards/ergodox/ez/Makefile
+++ b/keyboards/ergodox_ez/Makefile
@@ -4,5 +4,5 @@ RGBLIGHT_ENABLE = yes
 MIDI_ENABLE = no
 
 ifndef MAKEFILE_INCLUDED
-	include ../../../Makefile
+	include ../../Makefile
 endif
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox_ez/config.h
index cc8aa3d40e..b258a5b2e6 100644
--- a/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef ERGODOX_EZ_CONFIG_H
 #define ERGODOX_EZ_CONFIG_H
 
-#include "../config.h"
-
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
@@ -35,6 +33,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 6
 
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3
 
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index d502249543..3609f6f810 100644
--- a/keyboards/ergodox/ez/ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -1,4 +1,4 @@
-#include "ez.h"
+#include QMK_KEYBOARD_H
 #include "i2cmaster.h"
 
 
diff --git a/keyboards/ergodox/ez/ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 124bf850e7..1f8d597519 100644
--- a/keyboards/ergodox/ez/ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -160,4 +160,6 @@ inline void ergodox_led_all_set(uint8_t n)
     { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
    }
 
+#define LAYOUT_ergodox KEYMAP
+
 #endif
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/keymaps/blakedietz/keymap.c b/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
index a88e6795ab..a35f86d665 100644
--- a/keyboards/ergodox/ez/keymaps/blakedietz/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox/keymaps/default/default.png.md b/keyboards/ergodox_ez/keymaps/default/default.png.md
index 744e7d172a..744e7d172a 100644
--- a/keyboards/ergodox/keymaps/default/default.png.md
+++ b/keyboards/ergodox_ez/keymaps/default/default.png.md
diff --git a/keyboards/ergodox/keymaps/default/default_highres.png.md b/keyboards/ergodox_ez/keymaps/default/default_highres.png.md
index 074e0634d2..074e0634d2 100644
--- a/keyboards/ergodox/keymaps/default/default_highres.png.md
+++ b/keyboards/ergodox_ez/keymaps/default/default_highres.png.md
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cbc180d6a0
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -0,0 +1,223 @@
+#include QMK_KEYBOARD_H
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MDIA 2 // media keys
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE, // can always be here
+  EPRM,
+  VRSN,
+  RGB_SLD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
+ * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
+        KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
+        KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
+        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
+                                              ALT_T(KC_APP),  KC_LGUI,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+             KC_RGHT,     KC_6,   KC_7,  KC_8,   KC_9,   KC_0,             KC_MINS,
+             TG(SYMB),    KC_Y,   KC_U,  KC_I,   KC_O,   KC_P,             KC_BSLS,
+                          KC_H,   KC_J,  KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
+             MEH_T(KC_NO),KC_N,   KC_M,  KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
+                                  KC_UP, KC_DOWN,KC_LBRC,KC_RBRC,          KC_FN1,
+             KC_LALT,        CTL_T(KC_ESC),
+             KC_PGUP,
+             KC_PGDN,KC_TAB, KC_ENT
+    ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,---------------------------------------------------.           ,--------------------------------------------------.
+ * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+ * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
+ * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
+ * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | EPRM  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   `-----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |Animat|      |       |Toggle|Solid |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
+ *                                 |ness- |ness+ |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// SYMBOLS
+[SYMB] = LAYOUT_ergodox(
+       // left hand
+       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
+       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
+       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
+          EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       RGB_MOD,KC_TRNS,
+                                               KC_TRNS,
+                               RGB_VAD,RGB_VAI,KC_TRNS,
+       // right hand
+       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
+                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
+       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
+                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
+       RGB_TOG, RGB_SLD,
+       KC_TRNS,
+       KC_TRNS, RGB_HUD, RGB_HUI
+),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |Brwser|
+ *                                 |      |      |------|       |------|      |Back  |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// MEDIA AND MOUSE
+[MDIA] = LAYOUT_ergodox(
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+                                           KC_TRNS, KC_TRNS,
+                                                    KC_TRNS,
+                                  KC_TRNS, KC_TRNS, KC_TRNS,
+    // right hand
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_WBAK
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+        if (record->event.pressed) {
+          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+        }
+        break;
+        case 1:
+        if (record->event.pressed) { // For resetting EEPROM
+          eeconfig_init();
+        }
+        break;
+      }
+    return MACRO_NONE;
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    // dynamically generate these.
+    case EPRM:
+      if (record->event.pressed) {
+        eeconfig_init();
+      }
+      return false;
+      break;
+    case VRSN:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      return false;
+      break;
+    case RGB_SLD:
+      if (record->event.pressed) {
+        #ifdef RGBLIGHT_ENABLE
+          rgblight_mode(1);
+        #endif
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+    uint8_t layer = biton32(layer_state);
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+      // TODO: Make this relevant to the ErgoDox EZ.
+        case 1:
+            ergodox_right_led_1_on();
+            break;
+        case 2:
+            ergodox_right_led_2_on();
+            break;
+        default:
+            // none
+            break;
+    }
+
+};
diff --git a/keyboards/ergodox_ez/keymaps/default/readme.md b/keyboards/ergodox_ez/keymaps/default/readme.md
new file mode 100644
index 0000000000..1150a4f709
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/default/readme.md
@@ -0,0 +1,15 @@
+# ErgoDox EZ Default Configuration
+
+## Changelog
+
+* Dec 2016:
+  * Added LED keys
+  * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now.
+* Sep 22, 2016:
+  * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM.
+* Feb 2, 2016 (V1.1): 
+  * Made the right-hand quote key double as Cmd/Win on hold. So you get ' when you tap it, " when you tap it with Shift, and Cmd or Win when you hold it. You can then use it as a modifier, or just press and hold it for a moment (and then let go) to send a single Cmd or Win keystroke (handy for opening the Start menu on Windows).
+
+This is what we ship with out of the factory. :) The image says it all:
+
+![Default](https://i.imgur.com/Be53jH7.png)
\ No newline at end of file
diff --git a/keyboards/ergodox/keymaps/default_osx/keymap.c b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
index e9a242e07d..947c8a007f 100644
--- a/keyboards/ergodox/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
@@ -1,7 +1,7 @@
 // Netable differences vs. the default firmware for the ErgoDox EZ:
 // 1. The Cmd key is now on the right side, making Cmd+Space easier.
 // 2. The media keys work on OSX (But not on Windows).
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/default_osx/readme.md b/keyboards/ergodox_ez/keymaps/default_osx/readme.md
index 28ca0339b6..28ca0339b6 100644
--- a/keyboards/ergodox/keymaps/default_osx/readme.md
+++ b/keyboards/ergodox_ez/keymaps/default_osx/readme.md
diff --git a/keyboards/ergodox/ez/keymaps/drashna-custom/Makefile b/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
index 21da248f0c..21da248f0c 100644
--- a/keyboards/ergodox/ez/keymaps/drashna-custom/Makefile
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
diff --git a/keyboards/ergodox/ez/keymaps/drashna-custom/config.h b/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
index fe33552e15..fe33552e15 100644
--- a/keyboards/ergodox/ez/keymaps/drashna-custom/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
diff --git a/keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
index 1825447fbd..ed7aede1f9 100644
--- a/keyboards/ergodox/ez/keymaps/drashna-custom/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
diff --git a/keyboards/ergodox/ez/keymaps/drashna/Makefile b/keyboards/ergodox_ez/keymaps/drashna/Makefile
index 9dfddf01ec..9dfddf01ec 100644
--- a/keyboards/ergodox/ez/keymaps/drashna/Makefile
+++ b/keyboards/ergodox_ez/keymaps/drashna/Makefile
diff --git a/keyboards/ergodox/ez/keymaps/drashna/config.h b/keyboards/ergodox_ez/keymaps/drashna/config.h
index 258dc391fe..258dc391fe 100644
--- a/keyboards/ergodox/ez/keymaps/drashna/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna/config.h
diff --git a/keyboards/ergodox/ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
index a6e5b3335a..cef0e9c39f 100644
--- a/keyboards/ergodox/ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
diff --git a/keyboards/ergodox/ez/keymaps/drashna/readme.md b/keyboards/ergodox_ez/keymaps/drashna/readme.md
index 90fe44861a..90fe44861a 100644
--- a/keyboards/ergodox/ez/keymaps/drashna/readme.md
+++ b/keyboards/ergodox_ez/keymaps/drashna/readme.md
diff --git a/keyboards/ergodox/ez/keymaps/profet_80/keymap.c b/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
index 505ff29722..06c4f77d6c 100644
--- a/keyboards/ergodox/ez/keymaps/profet_80/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
diff --git a/keyboards/ergodox/ez/keymaps/profet_80/readme.md b/keyboards/ergodox_ez/keymaps/profet_80/readme.md
index 7380e3465f..7380e3465f 100644
--- a/keyboards/ergodox/ez/keymaps/profet_80/readme.md
+++ b/keyboards/ergodox_ez/keymaps/profet_80/readme.md
diff --git a/keyboards/ergodox/ez/keymaps/steno/Makefile b/keyboards/ergodox_ez/keymaps/steno/Makefile
index b6fb9b1a80..b6fb9b1a80 100644
--- a/keyboards/ergodox/ez/keymaps/steno/Makefile
+++ b/keyboards/ergodox_ez/keymaps/steno/Makefile
diff --git a/keyboards/ergodox/ez/keymaps/steno/keymap.c b/keyboards/ergodox_ez/keymaps/steno/keymap.c
index 3e9830905c..86b16f1618 100644
--- a/keyboards/ergodox/ez/keymaps/steno/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/steno/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "sendchar.h"
diff --git a/keyboards/ergodox/ez/keymaps/steno/readme.md b/keyboards/ergodox_ez/keymaps/steno/readme.md
index d67cde2a3c..d67cde2a3c 100644
--- a/keyboards/ergodox/ez/keymaps/steno/readme.md
+++ b/keyboards/ergodox_ez/keymaps/steno/readme.md
diff --git a/keyboards/ergodox/ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 21b60a542e..b743cf0d6b 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 "ez.h"
+#include QMK_KEYBOARD_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
new file mode 100644
index 0000000000..f025c5991d
--- /dev/null
+++ b/keyboards/ergodox_ez/readme.md
@@ -0,0 +1,33 @@
+# ErgoDox EZ
+
+The Ez uses the [Teensy Loader](https://www.pjrc.com/teensy/loader.html).
+
+Linux users need to modify udev rules as described on the [Teensy
+Linux page].  Some distributions provide a binary, maybe called
+`teensy-loader-cli`.
+
+[Teensy Linux page]: https://www.pjrc.com/teensy/loader_linux.html
+
+To flash the firmware:
+
+  - Build the firmware with `make keymapname`, for example `make default`
+  - This will result in a hex file called `ergodox_ez_keymapname.hex`, e.g.
+    `ergodox_ez_default.hex`
+
+  - Start the teensy loader.
+
+  - Load the .hex file into it.
+
+  - Press the Reset button by inserting a paperclip gently into the reset hole
+    in the top right corder.
+
+  - Click the button in the Teensy app to download the firmware.
+
+To flash with ´teensy-loader-cli´:
+
+  - Build the firmware with `make keymapname`, for example `make default`
+
+  - Run ´<path/to/>teensy_loader_cli -mmcu=atmega32u4 -w ergodox_ez_<keymap>.hex´
+
+  - Press the Reset button by inserting a paperclip gently into the reset hole
+    in the top right corder.
diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index e9bfb13995..e0111272a5 100644
--- a/keyboards/ergodox/ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -70,7 +70,17 @@ 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
+NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+UNICODE_ENABLE   = yes # Unicode
+ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
 SLEEP_LED_ENABLE = no
 API_SYSEX_ENABLE = no
 RGBLIGHT_ENABLE = yes
+
+LAYOUTS = ergodox
\ No newline at end of file
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/util/compile_keymap.py b/keyboards/ergodox_ez/util/compile_keymap.py
index 7076a6ecb2..7076a6ecb2 100644
--- a/keyboards/ergodox/ez/util/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/ergodox/infinity/MEMO.txt b/keyboards/ergodox_infinity/MEMO.txt
index e2886aa002..e2886aa002 100644
--- a/keyboards/ergodox/infinity/MEMO.txt
+++ b/keyboards/ergodox_infinity/MEMO.txt
diff --git a/keyboards/ergodox/infinity/Makefile b/keyboards/ergodox_infinity/Makefile
index bd09e5885d..bd09e5885d 100644
--- a/keyboards/ergodox/infinity/Makefile
+++ b/keyboards/ergodox_infinity/Makefile
diff --git a/keyboards/ergodox/infinity/board_is31fl3731c.h b/keyboards/ergodox_infinity/board_is31fl3731c.h
index f248cc25ba..f248cc25ba 100644
--- a/keyboards/ergodox/infinity/board_is31fl3731c.h
+++ b/keyboards/ergodox_infinity/board_is31fl3731c.h
diff --git a/keyboards/ergodox/infinity/board_st7565.h b/keyboards/ergodox_infinity/board_st7565.h
index 9ab636c95d..9ab636c95d 100644
--- a/keyboards/ergodox/infinity/board_st7565.h
+++ b/keyboards/ergodox_infinity/board_st7565.h
diff --git a/keyboards/ergodox/infinity/bootloader_defs.h b/keyboards/ergodox_infinity/bootloader_defs.h
index c67153be60..c67153be60 100644
--- a/keyboards/ergodox/infinity/bootloader_defs.h
+++ b/keyboards/ergodox_infinity/bootloader_defs.h
diff --git a/keyboards/ergodox/infinity/chconf.h b/keyboards/ergodox_infinity/chconf.h
index d59c35eb68..d59c35eb68 100644
--- a/keyboards/ergodox/infinity/chconf.h
+++ b/keyboards/ergodox_infinity/chconf.h
diff --git a/keyboards/ergodox/infinity/config.h b/keyboards/ergodox_infinity/config.h
index c46edeb7b2..094761e0b4 100644
--- a/keyboards/ergodox/infinity/config.h
+++ b/keyboards/ergodox_infinity/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef INFINITY_ERGODOX_CONFIG_H
 #define INFINITY_ERGODOX_CONFIG_H
 
-#include "../config.h"
-
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
@@ -32,6 +30,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT "Infinity keyboard/TMK"
 #define USBSTR_PRODUCT         'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00'
 
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
 /* key matrix size */
 #define MATRIX_ROWS 18
 #define MATRIX_COLS 5
diff --git a/keyboards/ergodox/infinity/infinity.c b/keyboards/ergodox_infinity/ergodox_infinity.c
index 62259ed3f6..05b2d7ce31 100644
--- a/keyboards/ergodox/infinity/infinity.c
+++ b/keyboards/ergodox_infinity/ergodox_infinity.c
@@ -1,4 +1,4 @@
-#include "infinity.h"
+#include QMK_KEYBOARD_H
 #include "ch.h"
 #include "hal.h"
 #include "serial_link/system/serial_link.h"
diff --git a/keyboards/ergodox/infinity/infinity.h b/keyboards/ergodox_infinity/ergodox_infinity.h
index 73a0f4bf70..25249c714a 100644
--- a/keyboards/ergodox/infinity/infinity.h
+++ b/keyboards/ergodox_infinity/ergodox_infinity.h
@@ -118,4 +118,6 @@ inline void ergodox_led_all_set(uint8_t n) {
     { B80,   B81,   B82,   B83,   B84 }  \
 }
 
+#define LAYOUT_ergodox KEYMAP
+
 #endif /* KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ */
diff --git a/keyboards/ergodox/infinity/gfxconf.h b/keyboards/ergodox_infinity/gfxconf.h
index ca338399d3..ca338399d3 100644
--- a/keyboards/ergodox/infinity/gfxconf.h
+++ b/keyboards/ergodox_infinity/gfxconf.h
diff --git a/keyboards/ergodox/infinity/halconf.h b/keyboards/ergodox_infinity/halconf.h
index 55dd5e88da..55dd5e88da 100644
--- a/keyboards/ergodox/infinity/halconf.h
+++ b/keyboards/ergodox_infinity/halconf.h
diff --git a/keyboards/ergodox/infinity/led.c b/keyboards/ergodox_infinity/led.c
index 8175c1c5c5..8175c1c5c5 100644
--- a/keyboards/ergodox/infinity/led.c
+++ b/keyboards/ergodox_infinity/led.c
diff --git a/keyboards/ergodox/infinity/matrix.c b/keyboards/ergodox_infinity/matrix.c
index 3364f8c905..3364f8c905 100644
--- a/keyboards/ergodox/infinity/matrix.c
+++ b/keyboards/ergodox_infinity/matrix.c
diff --git a/keyboards/ergodox/infinity/mcuconf.h b/keyboards/ergodox_infinity/mcuconf.h
index f6730b99ca..f6730b99ca 100644
--- a/keyboards/ergodox/infinity/mcuconf.h
+++ b/keyboards/ergodox_infinity/mcuconf.h
diff --git a/keyboards/ergodox_infinity/readme.md b/keyboards/ergodox_infinity/readme.md
new file mode 100644
index 0000000000..2d037d1c90
--- /dev/null
+++ b/keyboards/ergodox_infinity/readme.md
@@ -0,0 +1,45 @@
+# ErgoDox Infinity
+
+The Infinity is two completely independent keyboards, and needs to be flashed
+for the left and right halves seperately.  To flash them:
+
+  - Build the firmware with `make infinity-keymapname`
+
+  - Plug in the left hand keyboard only.
+
+  - Press the program button (back of keyboard, above thumb pad).
+
+  - Install the firmware with `sudo make infinity-keymapname-dfu-util`
+
+  - Build right hand firmware with `make infinity-keymapname MASTER=right`
+
+  - Plug in the right hand keyboard only.
+
+  - Press the program button (back of keyboard, above thumb pad).
+
+  - Install the firmware with `sudo make infinity-keymapname-dfu-util MASTER=right`
+
+More information on the Infinity firmware is available in the [TMK/chibios for
+Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
+
+## Infinity Master/Two Halves
+
+The Infinity is two completely independent keyboards, that can connect together.
+You have a few options in how you flash the firmware:
+
+- Flash the left half, rebuild the firmware with "MASTER=right" and then flash
+  the right half.  This allows you to plug in either half directly to the
+  computer and is what the above instructions do.
+
+- Flash the left half, then flash the same firmware on the right.  This only
+  works when the left half is plugged directly to the computer and the keymap
+  is mirrored.  It saves the small extra step of rebuilding with
+  "MASTER=right".
+
+- The same as the previous one but with "MASTER=right" when you build the
+  firmware, then flash the same firmware to both halves.  You just have to
+  directly connect the right half to the computer.
+
+- For minor changes such as changing only the keymap without having updated
+  any part of the firmware code itself, you can program only the MASTER half.
+  It is safest to program both halves though.
\ No newline at end of file
diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk
index a341bbfce8..cb11152556 100644
--- a/keyboards/ergodox/infinity/rules.mk
+++ b/keyboards/ergodox_infinity/rules.mk
@@ -57,6 +57,18 @@ OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000
 # 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
+UNICODE_ENABLE   = yes # Unicode
+ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
+
 CUSTOM_MATRIX = yes # Custom matrix file
 SERIAL_LINK_ENABLE = yes
 VISUALIZER_ENABLE = yes
@@ -72,4 +84,6 @@ LCD_HEIGHT = 32
 
 LED_DRIVER = is31fl3731c
 LED_WIDTH = 7 
-LED_HEIGHT = 7
\ No newline at end of file
+LED_HEIGHT = 7
+
+LAYOUTS = ergodox ergodox_80
\ No newline at end of file
diff --git a/keyboards/ergodox/infinity/simple_visualizer.h b/keyboards/ergodox_infinity/simple_visualizer.h
index 73d0e08870..73d0e08870 100644
--- a/keyboards/ergodox/infinity/simple_visualizer.h
+++ b/keyboards/ergodox_infinity/simple_visualizer.h
diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox_infinity/visualizer.c
index 4b16021abc..4b16021abc 100644
--- a/keyboards/ergodox/infinity/visualizer.c
+++ b/keyboards/ergodox_infinity/visualizer.c
diff --git a/keyboards/gh60/gh60.h b/keyboards/gh60/gh60.h
index 99ccf17574..be823676df 100644
--- a/keyboards/gh60/gh60.h
+++ b/keyboards/gh60/gh60.h
@@ -72,4 +72,7 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
     { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    K49, K4A, K4B, K4C, K4D }  \
 }
 
+#define LAYOUT_60_ansi  KEYMAP_ANSI
+#define LAYOUT_60_iso   KEYMAP
+
 #endif
\ No newline at end of file
diff --git a/keyboards/gh60/keymaps/unxmaal/Makefile b/keyboards/gh60/keymaps/unxmaal/Makefile
deleted file mode 100644
index 2b80ea00e3..0000000000
--- a/keyboards/gh60/keymaps/unxmaal/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging, 
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-# MCU name
-#MCU = at90usb1287
-MCU = atmega32u4
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes		# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes		# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes		# Audio control and System control(+450)
-# CONSOLE_ENABLE = yes		# Console for debug(+400)
-# COMMAND_ENABLE = yes		# Commands for debug and configuration
-KEYBOARD_LOCK_ENABLE = yes	# Allow locking of keyboard via magic key
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-# 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
-# BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
-# MIDI_ENABLE = YES		# MIDI controls
-# UNICODE_ENABLE = YES		# Unicode
-# BLUETOOTH_ENABLE = yes	# Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
diff --git a/keyboards/gh60/keymaps/unxmaal/config.h b/keyboards/gh60/keymaps/unxmaal/config.h
deleted file mode 100644
index bb218d6fd4..0000000000
--- a/keyboards/gh60/keymaps/unxmaal/config.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x6060
-#define DEVICE_VER   0x0001
-#define MANUFACTURER    geekhack
-#define PRODUCT         GH60
-#define DESCRIPTION     t.m.k. keyboard firmware for GH60
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
- #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-// Rev A
-// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 }
-// Rev B/C
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
-  keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1     H
-//#define MAGIC_KEY_HELP2     SLASH
-//#define MAGIC_KEY_DEBUG     D
-//#define MAGIC_KEY_DEBUG_MATRIX  X
-//#define MAGIC_KEY_DEBUG_KBD   K
-//#define MAGIC_KEY_DEBUG_MOUSE  M
-//#define MAGIC_KEY_VERSION    V
-//#define MAGIC_KEY_STATUS     S
-//#define MAGIC_KEY_CONSOLE    C
-//#define MAGIC_KEY_LAYER0_ALT1  ESC
-//#define MAGIC_KEY_LAYER0_ALT2  GRAVE
-//#define MAGIC_KEY_LAYER0     0
-//#define MAGIC_KEY_LAYER1     1
-//#define MAGIC_KEY_LAYER2     2
-//#define MAGIC_KEY_LAYER3     3
-//#define MAGIC_KEY_LAYER4     4
-//#define MAGIC_KEY_LAYER5     5
-//#define MAGIC_KEY_LAYER6     6
-//#define MAGIC_KEY_LAYER7     7
-//#define MAGIC_KEY_LAYER8     8
-//#define MAGIC_KEY_LAYER9     9
-//#define MAGIC_KEY_BOOTLOADER   PAUSE
-//#define MAGIC_KEY_LOCK      CAPS
-//#define MAGIC_KEY_EEPROM     E
-//#define MAGIC_KEY_NKRO      N
-//#define MAGIC_KEY_SLEEP_LED   Z
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-/*
- * RGB Underglow
- * These settings are for the F4 by default:
- * 
- *
- * #define ws2812_PORTREG  PORTF
- * #define ws2812_DDRREG   DDRF
- * #define ws2812_pin PF4
- * #define RGBLED_NUM 14     // Number of LEDs
- * #define RGBLIGHT_HUE_STEP 10
- * #define RGBLIGHT_SAT_STEP 17
- * #define RGBLIGHT_VAL_STEP 17
- *
- * The firmware supports 5 different light effects, and the color (hue, saturation, brightness) can be customized in most effects. 
- * To control the underglow, you need to modify your keymap file to assign those functions to some keys/key combinations. 
- * For details, please check this keymap. keyboard/planck/keymaps/yang/keymap.c
-*/
-
-/* Deprecated code below
-#define ws2812_PORTREG  PORTF 
-#define ws2812_DDRREG   DDRF
-#define ws2812_pin PF4
-*/ 
-#define RGB_DI_PIN F4
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8         // Number of LEDs
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/gh60/keymaps/xyverz/keymap.c b/keyboards/gh60/keymaps/xyverz/keymap.c
index 6d1d8ab274..19fc37a6d0 100644
--- a/keyboards/gh60/keymaps/xyverz/keymap.c
+++ b/keyboards/gh60/keymaps/xyverz/keymap.c
@@ -1,4 +1,4 @@
-#include "gh60.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "eeconfig.h"
 
diff --git a/keyboards/gh60/rules.mk b/keyboards/gh60/rules.mk
index 00f4b660a0..2c9d91ecdf 100644
--- a/keyboards/gh60/rules.mk
+++ b/keyboards/gh60/rules.mk
@@ -64,3 +64,5 @@ NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https:
 # MIDI_ENABLE = YES			# MIDI controls
 # UNICODE_ENABLE = YES		# Unicode
 # BLUETOOTH_ENABLE = yes	# Enable Bluetooth with the Adafruit EZ-Key HID
+
+LAYOUTS = 60_ansi 60_iso
\ No newline at end of file
diff --git a/keyboards/hadron/ver0/rules.mk b/keyboards/hadron/ver0/rules.mk
index 0f9667a8ae..a3952a5d33 100644
--- a/keyboards/hadron/ver0/rules.mk
+++ b/keyboards/hadron/ver0/rules.mk
@@ -1,5 +1 @@
-#AUDIO_ENABLE ?= yes           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+#AUDIO_ENABLE ?= yes           # Audio output on port C6
\ No newline at end of file
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
index 0f9667a8ae..a3952a5d33 100644
--- a/keyboards/hadron/ver2/rules.mk
+++ b/keyboards/hadron/ver2/rules.mk
@@ -1,5 +1 @@
-#AUDIO_ENABLE ?= yes           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+#AUDIO_ENABLE ?= yes           # Audio output on port C6
\ No newline at end of file
diff --git a/keyboards/handwired/CMD60/rules.mk b/keyboards/handwired/CMD60/rules.mk
index f50987cde9..d980716eae 100644
--- a/keyboards/handwired/CMD60/rules.mk
+++ b/keyboards/handwired/CMD60/rules.mk
@@ -66,8 +66,4 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
-
 
diff --git a/keyboards/handwired/MS_sculpt_mobile/rules.mk b/keyboards/handwired/MS_sculpt_mobile/rules.mk
index 5b89020315..53769f81f4 100644
--- a/keyboards/handwired/MS_sculpt_mobile/rules.mk
+++ b/keyboards/handwired/MS_sculpt_mobile/rules.mk
@@ -44,5 +44,5 @@ USB = /dev/cu.usbmodem14141
 
  
 
-upload: build
-	$(SCULPT_UPLOAD_COMMAND)
+# upload: build
+# 	$(SCULPT_UPLOAD_COMMAND)
diff --git a/keyboards/handwired/fivethirteen/rules.mk b/keyboards/handwired/fivethirteen/rules.mk
index f50987cde9..c8dd19ef7b 100644
--- a/keyboards/handwired/fivethirteen/rules.mk
+++ b/keyboards/handwired/fivethirteen/rules.mk
@@ -66,8 +66,3 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
-
-
diff --git a/keyboards/handwired/gamenum/rules.mk b/keyboards/handwired/gamenum/rules.mk
index e8b0c6048d..d980716eae 100644
--- a/keyboards/handwired/gamenum/rules.mk
+++ b/keyboards/handwired/gamenum/rules.mk
@@ -66,8 +66,4 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 
-ifndef QUANTUM_DIR
-	include ../../Makefile
-endif
-
 
diff --git a/keyboards/handwired/magicforce61/rules.mk b/keyboards/handwired/magicforce61/rules.mk
index a3fdd3d707..91147ab4fb 100644
--- a/keyboards/handwired/magicforce61/rules.mk
+++ b/keyboards/handwired/magicforce61/rules.mk
@@ -65,7 +65,3 @@ MIDI_ENABLE ?= no            # MIDI controls
 UNICODE_ENABLE ?= no         # Unicode
 BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE ?= no           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
diff --git a/keyboards/handwired/magicforce68/rules.mk b/keyboards/handwired/magicforce68/rules.mk
index 0d21623ced..fe01b544c8 100644
--- a/keyboards/handwired/magicforce68/rules.mk
+++ b/keyboards/handwired/magicforce68/rules.mk
@@ -65,7 +65,3 @@ MIDI_ENABLE = no            # MIDI controls
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
diff --git a/keyboards/handwired/numpad20/rules.mk b/keyboards/handwired/numpad20/rules.mk
index 0d21623ced..361b2e93af 100644
--- a/keyboards/handwired/numpad20/rules.mk
+++ b/keyboards/handwired/numpad20/rules.mk
@@ -64,8 +64,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by d
 MIDI_ENABLE = no            # MIDI controls
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+AUDIO_ENABLE = no           # Audio output on port C6
\ No newline at end of file
diff --git a/keyboards/handwired/onekey/rules.mk b/keyboards/handwired/onekey/rules.mk
index e5a9533624..cfa693a73b 100644
--- a/keyboards/handwired/onekey/rules.mk
+++ b/keyboards/handwired/onekey/rules.mk
@@ -58,8 +58,4 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
\ No newline at end of file
diff --git a/keyboards/handwired/ortho5x13/rules.mk b/keyboards/handwired/ortho5x13/rules.mk
index 0d21623ced..fe01b544c8 100644
--- a/keyboards/handwired/ortho5x13/rules.mk
+++ b/keyboards/handwired/ortho5x13/rules.mk
@@ -65,7 +65,3 @@ MIDI_ENABLE = no            # MIDI controls
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
diff --git a/keyboards/handwired/reddot/rules.mk b/keyboards/handwired/reddot/rules.mk
index b00ee9e0e0..4929968410 100755
--- a/keyboards/handwired/reddot/rules.mk
+++ b/keyboards/handwired/reddot/rules.mk
@@ -79,10 +79,6 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
-
-upload: build
-	$(ATREUS_UPLOAD_COMMAND)
+# upload: build
+# 	$(ATREUS_UPLOAD_COMMAND)
 
diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk
index aaf630f103..47dace8a22 100644
--- a/keyboards/handwired/trackpoint/rules.mk
+++ b/keyboards/handwired/trackpoint/rules.mk
@@ -20,6 +20,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 PS2_MOUSE_ENABLE = yes
 PS2_USE_USART = yes
 
-ifndef QUANTUM_DIR
-	include ../../Makefile
-endif
diff --git a/keyboards/hhkb/rules.mk b/keyboards/hhkb/rules.mk
index d31e755ef9..b8bfd73d2a 100644
--- a/keyboards/hhkb/rules.mk
+++ b/keyboards/hhkb/rules.mk
@@ -72,9 +72,9 @@ CUSTOM_MATRIX = yes    # Custom matrix file for the HHKB
 # UNICODE_ENABLE = yes    # Unicode
 # BLUETOOTH_ENABLE = yes  # Enable Bluetooth with the Adafruit EZ-Key HID
 
-debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
-debug-on: all
+# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
+# debug-on: all
 
-debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
-debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
-debug-off: all
+# debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
+# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
+# debug-off: all
diff --git a/keyboards/kc60/kc60.h b/keyboards/kc60/kc60.h
index c3a0165c09..0fdd3701a9 100644
--- a/keyboards/kc60/kc60.h
+++ b/keyboards/kc60/kc60.h
@@ -35,8 +35,6 @@
   {  K40,  K41,  K42,  KC_NO,  KC_NO,  K45,  KC_NO,  KC_NO,  KC_NO,  K49,  K4A,  K4B,  K4C,  K4D  }   \
 }
 
-#endif
-
 /* Default layout
  * ,-----------------------------------------------------------------------------------------.
  * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D       |
@@ -51,6 +49,20 @@
  * `-----------------------------------------------------------------------------------------'
  */
 
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   K2C, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C, \
+    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \
+    ) { \
+  {  K00,  K01,   K02,  K03,    K04,    K05,  K06,    K07,    K08,    K09,   K0A,  K0B,  K0C,  K0D,  },  \
+  {  K10,  K11,   K12,  K13,    K14,    K15,  K16,    K17,    K18,    K19,   K1A,  K1B,  K1C,  K1D  },  \
+  {  K20,  K21,   K22,  K23,    K24,    K25,  K26,    K27,    K28,    K29,   K2A,  K2B,  K2C,  KC_NO  },  \
+  {  K30,  KC_NO, K32,  K33,    K34,    K35,  K36,    K37,    K38,    K39,   K3A,  K3B,  K3C,  KC_NO  },  \
+  {  K40,  K41,   K42,  KC_NO,  KC_NO,  K45,  KC_NO,  KC_NO,  KC_NO,  KC_NO, K4A,  K4B,  K4C,  K4D  }   \
+}
+
 /* Mini Lshift
  * ,-----------------------------------------------------------------------------------------.
  * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D       |
@@ -91,4 +103,6 @@
  * |-----------------------------------------------------------------------------------------+
  * | K40   | K41   | K42   | K45                             | K4A   | K4B   | K4C   | K4D   |
  * `-----------------------------------------------------------------------------------------'
- */
\ No newline at end of file
+ */
+
+#endif
\ No newline at end of file
diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk
index d5b94fb83d..e4f590b1b1 100644
--- a/keyboards/kc60/rules.mk
+++ b/keyboards/kc60/rules.mk
@@ -66,3 +66,5 @@ MIDI_ENABLE = no            # MIDI controls
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
+
+LAYOUTS = 60_ansi
\ No newline at end of file
diff --git a/keyboards/kinesis/alvicstep/rules.mk b/keyboards/kinesis/alvicstep/rules.mk
index fb421a34fc..76e69d0278 100644
--- a/keyboards/kinesis/alvicstep/rules.mk
+++ b/keyboards/kinesis/alvicstep/rules.mk
@@ -1,9 +1,5 @@
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
-
 # just silently stop, since we need to upload with teensy uploader
-upload: build
+# upload: build
 
 
 
diff --git a/keyboards/lets_split/keymaps/ergodoxish/Makefile b/keyboards/lets_split/keymaps/ergodoxish/Makefile
deleted file mode 100644
index 457a3d01d4..0000000000
--- a/keyboards/lets_split/keymaps/ergodoxish/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
index f7dc24a447..476e7fd2aa 100644
--- a/keyboards/lets_split/lets_split.h
+++ b/keyboards/lets_split/lets_split.h
@@ -1,12 +1,9 @@
 #ifndef LETS_SPLIT_H
 #define LETS_SPLIT_H
 
-#ifdef SUBPROJECT_rev1
-    #include "rev1.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "rev2.h"
-#endif
+#include "quantum.h"
+
+#include QMK_SUBPROJECT_H
 
 // Used to create a keymap using only KC_ prefixed keys
 #define KC_KEYMAP( \
@@ -22,6 +19,7 @@
         KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
     )
 
-#include "quantum.h"
+#define LAYOUT_ortho_4x12 KEYMAP
+#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
 
 #endif
\ No newline at end of file
diff --git a/keyboards/lets_split/rev1/rules.mk b/keyboards/lets_split/rev1/rules.mk
index a0825b4ef6..f845616741 100644
--- a/keyboards/lets_split/rev1/rules.mk
+++ b/keyboards/lets_split/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/lets_split/rev2/rules.mk b/keyboards/lets_split/rev2/rules.mk
index 80a942d06f..7b30c0beff 100644
--- a/keyboards/lets_split/rev2/rules.mk
+++ b/keyboards/lets_split/rev2/rules.mk
@@ -1,5 +1 @@
 BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index c2b7d556eb..7b7224fd4d 100644
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -74,3 +74,5 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
+
+LAYOUTS = ortho_4x12
\ No newline at end of file
diff --git a/keyboards/lets_split/serial.c b/keyboards/lets_split/serial.c
index 6faed09ce0..74bcbb6bf6 100644
--- a/keyboards/lets_split/serial.c
+++ b/keyboards/lets_split/serial.c
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include "serial.h"
 
-#ifdef USE_SERIAL
+#ifndef USE_I2C
 
 // Serial pulse period in microseconds. Its probably a bad idea to lower this
 // value.
diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk
index 04fa552f80..903edb1092 100644
--- a/keyboards/mitosis/rules.mk
+++ b/keyboards/mitosis/rules.mk
@@ -77,5 +77,5 @@ UNICODE_ENABLE = YES 		# Unicode
 
 USB = /dev/ttyACM0
 
-upload: build
-	$(MITOSIS_UPLOAD_COMMAND)
+# upload: build
+# 	$(MITOSIS_UPLOAD_COMMAND)
diff --git a/keyboards/nyquist/config.h b/keyboards/nyquist/config.h
index 55500df79b..5e3dc91888 100644
--- a/keyboards/nyquist/config.h
+++ b/keyboards/nyquist/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
+#include QMK_SUBPROJECT_CONFIG_H
 
 #endif  // CONFIG_H
diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h
index e8cccecf5f..dcc2a4ffd4 100644
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/nyquist/nyquist.h
@@ -1,9 +1,9 @@
 #ifndef NYQUIST_H
 #define NYQUIST_H
 
-#ifdef SUBPROJECT_rev1
-    #include "rev1.h"
-#endif
+#include QMK_SUBPROJECT_H
+
+#include "quantum.h"
 
 // Used to create a keymap using only KC_ prefixed keys
 #define KC_KEYMAP( \
@@ -21,6 +21,6 @@
         KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
     )
 
-#include "quantum.h"
+#define LAYOUT_ortho_5x12 KEYMAP
 
 #endif
\ No newline at end of file
diff --git a/keyboards/nyquist/rev1/config.h b/keyboards/nyquist/rev1/config.h
index af4f7dbb1c..3615768871 100644
--- a/keyboards/nyquist/rev1/config.h
+++ b/keyboards/nyquist/rev1/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef REV1_CONFIG_H
 #define REV1_CONFIG_H
 
-#include "../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xCEEB
diff --git a/keyboards/nyquist/rev1/rev1.c b/keyboards/nyquist/rev1/rev1.c
index 80780831f3..7b3228fa65 100644
--- a/keyboards/nyquist/rev1/rev1.c
+++ b/keyboards/nyquist/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "nyquist.h"
+#include QMK_SUBPROJECT_H
 
 #ifdef AUDIO_ENABLE
     float tone_startup[][2] = SONG(STARTUP_SOUND);
diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h
index f2d0ece790..cf9bf80203 100644
--- a/keyboards/nyquist/rev1/rev1.h
+++ b/keyboards/nyquist/rev1/rev1.h
@@ -1,7 +1,7 @@
 #ifndef REV1_H
 #define REV1_H
 
-#include "../nyquist.h"
+#include QMK_KEYBOARD_H
 
 //void promicro_bootloader_jmp(bool program);
 #include "quantum.h"
diff --git a/keyboards/nyquist/rev1/rules.mk b/keyboards/nyquist/rev1/rules.mk
index 80a942d06f..7b30c0beff 100644
--- a/keyboards/nyquist/rev1/rules.mk
+++ b/keyboards/nyquist/rev1/rules.mk
@@ -1,5 +1 @@
 BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk
index 3f40ff2f82..07cdba4bf6 100644
--- a/keyboards/nyquist/rules.mk
+++ b/keyboards/nyquist/rules.mk
@@ -73,3 +73,5 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
+
+LAYOUTS = ortho_5x12
\ No newline at end of file
diff --git a/keyboards/nyquist/serial.c b/keyboards/nyquist/serial.c
index 6faed09ce0..74bcbb6bf6 100644
--- a/keyboards/nyquist/serial.c
+++ b/keyboards/nyquist/serial.c
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include "serial.h"
 
-#ifdef USE_SERIAL
+#ifndef USE_I2C
 
 // Serial pulse period in microseconds. Its probably a bad idea to lower this
 // value.
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index c86f8491ee..ebaf3fb641 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -81,11 +81,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
-#ifdef SUBPROJECT_rev3
-    #include "rev3/config.h"
-#endif
-#ifdef SUBPROJECT_rev4
-    #include "rev4/config.h"
-#endif
+#include QMK_SUBPROJECT_CONFIG_H
 
 #endif
diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c
index 3980b02f50..caef2fe5fa 100644
--- a/keyboards/planck/planck.c
+++ b/keyboards/planck/planck.c
@@ -1,4 +1,4 @@
-#include "planck.h"
+#include QMK_KEYBOARD_H
 
 #ifdef ONEHAND_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h
index 10f17b4a46..c055d73cb6 100644
--- a/keyboards/planck/planck.h
+++ b/keyboards/planck/planck.h
@@ -1,12 +1,7 @@
 #ifndef PLANCK_H
 #define PLANCK_H
 
-#ifdef SUBPROJECT_rev3
-    #include "rev3.h"
-#endif
-#ifdef SUBPROJECT_rev4
-    #include "rev4.h"
-#endif
+#include QMK_SUBPROJECT_H
 
 #include "quantum.h"
 
@@ -37,5 +32,6 @@
 }
 
 #define KEYMAP PLANCK_GRID
+#define LAYOUT_ortho_4x12 PLANCK_GRID
 
 #endif
diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h
index cc37874e83..ade11ffe13 100644
--- a/keyboards/planck/rev3/config.h
+++ b/keyboards/planck/rev3/config.h
@@ -1,7 +1,7 @@
 #ifndef REV3_CONFIG_H
 #define REV3_CONFIG_H
 
-#include "../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #define DEVICE_VER 0x0003
 
diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h
index 628951d97d..e5e05236c4 100644
--- a/keyboards/planck/rev3/rev3.h
+++ b/keyboards/planck/rev3/rev3.h
@@ -1,6 +1,6 @@
 #ifndef REV3_H
 #define REV3_H
 
-#include "../planck.h"
+#include QMK_KEYBOARD_H
 
 #endif
\ No newline at end of file
diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk
index 5594096823..1148571007 100644
--- a/keyboards/planck/rev3/rules.mk
+++ b/keyboards/planck/rev3/rules.mk
@@ -1,5 +1 @@
-AUDIO_ENABLE = no           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+AUDIO_ENABLE = no           # Audio output on port C6
\ No newline at end of file
diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h
index 98189fba71..dcc76c11c9 100644
--- a/keyboards/planck/rev4/config.h
+++ b/keyboards/planck/rev4/config.h
@@ -1,7 +1,7 @@
 #ifndef REV4_CONFIG_H
 #define REV4_CONFIG_H
 
-#include "../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #define DEVICE_VER 0x0004
 
diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h
index e4cf1800b8..2d35df19d8 100644
--- a/keyboards/planck/rev4/rev4.h
+++ b/keyboards/planck/rev4/rev4.h
@@ -1,6 +1,6 @@
 #ifndef REV4_H
 #define REV4_H
 
-#include "../planck.h"
+#include QMK_KEYBOARD_H
 
 #endif
\ No newline at end of file
diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk
index 01d848e98c..3b22e0a01b 100644
--- a/keyboards/planck/rev4/rules.mk
+++ b/keyboards/planck/rev4/rules.mk
@@ -1,5 +1 @@
-AUDIO_ENABLE = yes           # Audio output on port C6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+AUDIO_ENABLE = yes           # Audio output on port C6
\ No newline at end of file
diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk
index 5580bb387b..8f8477c18a 100644
--- a/keyboards/planck/rules.mk
+++ b/keyboards/planck/rules.mk
@@ -66,3 +66,5 @@ API_SYSEX_ENABLE = no
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_4x12
\ No newline at end of file
diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c
index d9c119b8da..cd765fe4af 100644
--- a/keyboards/preonic/preonic.c
+++ b/keyboards/preonic/preonic.c
@@ -1,4 +1,4 @@
-#include "preonic.h"
+#include QMK_KEYBOARD_H
 
 #ifdef ONEHAND_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/preonic/preonic.h b/keyboards/preonic/preonic.h
index 0e0b101e45..02845a549c 100644
--- a/keyboards/preonic/preonic.h
+++ b/keyboards/preonic/preonic.h
@@ -33,4 +33,6 @@
 	{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
 }
 
+#define LAYOUT_ortho_5x12 PREONIC_GRID
+
 #endif
diff --git a/keyboards/preonic/rules.mk b/keyboards/preonic/rules.mk
index b46c20193b..51104e68ba 100644
--- a/keyboards/preonic/rules.mk
+++ b/keyboards/preonic/rules.mk
@@ -67,4 +67,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 API_SYSEX_ENABLE = no
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_5x12
\ No newline at end of file
diff --git a/keyboards/roadkit/roadkit.h b/keyboards/roadkit/roadkit.h
index b10e5740f3..a82a62e1ed 100644
--- a/keyboards/roadkit/roadkit.h
+++ b/keyboards/roadkit/roadkit.h
@@ -30,4 +30,6 @@
     { K30,   K31,   K32,   K33 }  \
 }
 
+#define LAYOUT_ortho_4x4 SINGLES_KEYMAP
+
 #endif
diff --git a/keyboards/roadkit/rules.mk b/keyboards/roadkit/rules.mk
index 786c9dc3e7..523d1ddf03 100644
--- a/keyboards/roadkit/rules.mk
+++ b/keyboards/roadkit/rules.mk
@@ -67,3 +67,5 @@ MIDI_ENABLE = no            # MIDI controls
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
+
+LAYOUTS = ortho_4x4
\ No newline at end of file
diff --git a/keyboards/s60_x/default/rules.mk b/keyboards/s60_x/default/rules.mk
index 4a9475a920..ce4064d1c6 100644
--- a/keyboards/s60_x/default/rules.mk
+++ b/keyboards/s60_x/default/rules.mk
@@ -3,7 +3,3 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no          # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no     # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
diff --git a/keyboards/s60_x/rgb/rules.mk b/keyboards/s60_x/rgb/rules.mk
index a979632a92..42d45c332b 100644
--- a/keyboards/s60_x/rgb/rules.mk
+++ b/keyboards/s60_x/rgb/rules.mk
@@ -2,8 +2,4 @@ CONSOLE_ENABLE = no        # Console for debug(+400)
 COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = yes          # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable RGB light
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
\ No newline at end of file
+RGBLIGHT_ENABLE = yes      # Enable RGB light
\ No newline at end of file
diff --git a/keyboards/satan/rules.mk b/keyboards/satan/rules.mk
index 87a4a05954..12a0663ae2 100644
--- a/keyboards/satan/rules.mk
+++ b/keyboards/satan/rules.mk
@@ -64,3 +64,5 @@ MIDI_ENABLE = no 		# MIDI controls
 AUDIO_ENABLE = no
 UNICODE_ENABLE = no 		# Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+
+LAYOUTS = 60_ansi 60_iso
\ No newline at end of file
diff --git a/keyboards/satan/satan.h b/keyboards/satan/satan.h
index 42fa5dbe0a..3617f5328c 100644
--- a/keyboards/satan/satan.h
+++ b/keyboards/satan/satan.h
@@ -125,4 +125,7 @@
 void matrix_init_user(void);
 void matrix_scan_user(void);
 
+#define LAYOUT_60_ansi KEYMAP_ANSI
+#define LAYOUT_60_iso KEYMAP
+
 #endif
diff --git a/keyboards/xd75/keymaps/default/Makefile b/keyboards/xd75/keymaps/default/Makefile
index 6e8941fdfd..d4e08cfb26 100644
--- a/keyboards/xd75/keymaps/default/Makefile
+++ b/keyboards/xd75/keymaps/default/Makefile
@@ -13,25 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes       # 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
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
diff --git a/keyboards/xd75/keymaps/fabian/config.h b/keyboards/xd75/keymaps/fabian/config.h
index f52a97bbc8..59de3fa55f 100644
--- a/keyboards/xd75/keymaps/fabian/config.h
+++ b/keyboards/xd75/keymaps/fabian/config.h
@@ -17,7 +17,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 // place overrides here
 
diff --git a/keyboards/xd75/keymaps/fabian/keymap.c b/keyboards/xd75/keymaps/fabian/keymap.c
index 9b497c1900..884602fde4 100644
--- a/keyboards/xd75/keymaps/fabian/keymap.c
+++ b/keyboards/xd75/keymaps/fabian/keymap.c
@@ -1,4 +1,4 @@
-#include "xd75.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "eeconfig.h"
 
diff --git a/keyboards/xd75/rules.mk b/keyboards/xd75/rules.mk
index f6d8978301..7aa70212ed 100644
--- a/keyboards/xd75/rules.mk
+++ b/keyboards/xd75/rules.mk
@@ -47,22 +47,22 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   USBaspLoader     2048
 OPT_DEFS += -DBOOTLOADER_SIZE=4996
 
-
-# Build Options
-#   change yes to no to disable
+# QMK Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE ?= yes      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes        # Console for debug(+400)
-COMMAND_ENABLE ?= yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE ?= no            # USB Nkey Rollover
-BACKLIGHT_ENABLE ?= yes       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE ?= no         # Unicode
-BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no           # Audio output on port C6
-FAUXCLICKY_ENABLE ?= no      # Use buzzer to emulate clicky switches
+BOOTMAGIC_ENABLE = yes       # 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
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_5x15
\ No newline at end of file
diff --git a/keyboards/xd75/xd75.h b/keyboards/xd75/xd75.h
index 22bc2ecc0c..08592b6650 100644
--- a/keyboards/xd75/xd75.h
+++ b/keyboards/xd75/xd75.h
@@ -29,6 +29,20 @@
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
     K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
 ) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define KC_KEYMAP( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
+) { \
     { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \
     { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E }, \
     { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E }, \
@@ -36,4 +50,6 @@
     { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E }  \
 }
 
+#define LAYOUT_ortho_5x15 KEYMAP
+
 #endif
diff --git a/layouts/community/60_ansi/layout.json b/layouts/community/60_ansi/layout.json
new file mode 100644
index 0000000000..b7e1d0fed2
--- /dev/null
+++ b/layouts/community/60_ansi/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:2.75},""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},""]
diff --git a/layouts/community/60_ansi/readme.md b/layouts/community/60_ansi/readme.md
new file mode 100644
index 0000000000..15f51d3fa1
--- /dev/null
+++ b/layouts/community/60_ansi/readme.md
@@ -0,0 +1,3 @@
+# 60_ansi
+
+    LAYOUT_60_ansi
\ No newline at end of file
diff --git a/layouts/community/60_iso/layout.json b/layouts/community/60_iso/layout.json
new file mode 100644
index 0000000000..2b8493fca7
--- /dev/null
+++ b/layouts/community/60_iso/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:2.75},""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},""]
diff --git a/layouts/community/60_iso/readme.md b/layouts/community/60_iso/readme.md
new file mode 100644
index 0000000000..42ff805fb6
--- /dev/null
+++ b/layouts/community/60_iso/readme.md
@@ -0,0 +1,3 @@
+# 60_iso
+
+    LAYOUT_60_iso
\ No newline at end of file
diff --git a/keyboards/gh60/keymaps/unxmaal/README.md b/layouts/community/60_iso/unxmaal/README.md
index 6c08bbb100..6c08bbb100 100644
--- a/keyboards/gh60/keymaps/unxmaal/README.md
+++ b/layouts/community/60_iso/unxmaal/README.md
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
new file mode 100644
index 0000000000..7a500b1bb5
--- /dev/null
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef KEYMAP_CONFIG_H
+#define KEYMAP_CONFIG_H
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#ifndef RGB_DI_PIN
+    #define RGB_DI_PIN F4
+    #define RGBLIGHT_ANIMATIONS
+    #define RGBLED_NUM 8         // Number of LEDs
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+#endif
+
+#endif
diff --git a/keyboards/gh60/keymaps/unxmaal/keymap.c b/layouts/community/60_iso/unxmaal/keymap.c
index 7c9bd6a6d7..e9b38788e4 100644
--- a/keyboards/gh60/keymaps/unxmaal/keymap.c
+++ b/layouts/community/60_iso/unxmaal/keymap.c
@@ -1,4 +1,4 @@
-#include "gh60.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 
 #define _BL 0
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Fn|Alt |Gui | Space(tapped), Fn(held) |Gui |Alt  |Menu(tapped, Fn2(held)|Ctrl|
    * `-----------------------------------------------------------------------------'
    */
-	[_BL] = KEYMAP(
+	[_BL] = LAYOUT_60_iso(
         KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC, \
 	      KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS, \
         KC_LCTL,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_NO,KC_ENT,  \
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                        |    |    |    |    |
    * `-----------------------------------------------------------'
    */
-	[_AL] = KEYMAP(
+	[_AL] = LAYOUT_60_iso(
         KC_GRV,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_DELETE, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UP,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                          |    |    |    |    |
    * `-------------------------------------------------------------'
    */
-	[_FL] = KEYMAP(
+	[_FL] = LAYOUT_60_iso(
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MPRV,KC_MPLY,KC_MNXT,KC_MUTE,KC_VOLD,KC_VOLU,RESET, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_TRNS,KC_HOME,KC_PGDN,KC_END,KC_TRNS,KC_TRNS,KC_TRNS, \
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                        |    |    |    |    |
    * `-----------------------------------------------------------'
    */
-	[_UL] = KEYMAP(
+	[_UL] = LAYOUT_60_iso(
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,F(4),F(5),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
@@ -143,6 +143,7 @@ void matrix_scan_user(void) {
 
 // Layer LED indicators
 // ESC led on when in function layer, WASD cluster leds enabled when on arrow cluster
+  #ifdef KEYBOARD_gh60
     uint32_t layer = layer_state;
     if (layer & (1<<1)) {
         gh60_wasd_leds_on();
@@ -155,6 +156,7 @@ void matrix_scan_user(void) {
     } else {
         gh60_esc_led_off();
     }
+  #endif
 };
 
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
new file mode 100644
index 0000000000..26fc6dc669
--- /dev/null
+++ b/layouts/community/60_iso/unxmaal/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
diff --git a/keyboards/ergodox/keymaps/333fred/README.md b/layouts/community/ergodox/333fred/README.md
index f7b4ca42f4..f7b4ca42f4 100644
--- a/keyboards/ergodox/keymaps/333fred/README.md
+++ b/layouts/community/ergodox/333fred/README.md
diff --git a/keyboards/ergodox/keymaps/333fred/config.h b/layouts/community/ergodox/333fred/config.h
index f19a52bca1..6a03446e03 100644
--- a/keyboards/ergodox/keymaps/333fred/config.h
+++ b/layouts/community/ergodox/333fred/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 150
diff --git a/keyboards/ergodox/keymaps/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c
index c1722c1226..3fac44e398 100644
--- a/keyboards/ergodox/keymaps/333fred/keymap.c
+++ b/layouts/community/ergodox/333fred/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,        KC_1,         KC_2,   KC_3,   KC_4,          KC_5,   KC_EQL,
         KC_TAB,        KC_Q,         KC_W,   KC_E,   KC_R,          KC_T,   TG(SYMB),
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[CODE] = KEYMAP(  // layer 1 : code
+[CODE] = LAYOUT_ergodox(  // layer 1 : code
         // left hand
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10,
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LPRN,KC_RPRN,KC_PIPE,KC_TRNS,
@@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -235,7 +235,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MOVE] = KEYMAP(
+[MOVE] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, M(DLEFT),       M(DRIGHT),      KC_LCTL, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/333fred/Makefile b/layouts/community/ergodox/333fred/rules.mk
index 2992054341..d8e081eaa0 100644
--- a/keyboards/ergodox/keymaps/333fred/Makefile
+++ b/layouts/community/ergodox/333fred/rules.mk
@@ -1,11 +1,8 @@
-SUBPROJECT_DEFAULT = infinity
 LCD_BACKLIGHT_ENABLE = yes
 LCD_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 NKRO_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
 
diff --git a/keyboards/ergodox/keymaps/333fred/visualizer.c b/layouts/community/ergodox/333fred/visualizer.c
index 2a30562ae7..2a30562ae7 100644
--- a/keyboards/ergodox/keymaps/333fred/visualizer.c
+++ b/layouts/community/ergodox/333fred/visualizer.c
diff --git a/keyboards/ergodox/keymaps/ab/keyboard-layout.json b/layouts/community/ergodox/ab/keyboard-layout.json
index e2badad4de..e2badad4de 100644
--- a/keyboards/ergodox/keymaps/ab/keyboard-layout.json
+++ b/layouts/community/ergodox/ab/keyboard-layout.json
diff --git a/keyboards/ergodox/keymaps/ab/keymap.c b/layouts/community/ergodox/ab/keymap.c
index 7938c9da3b..7bda0cd223 100644
--- a/keyboards/ergodox/keymaps/ab/keymap.c
+++ b/layouts/community/ergodox/ab/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-    [BASE] = KEYMAP(  // layer 0 : default
+    [BASE] = LAYOUT_ergodox(  // layer 0 : default
 	// Left hand
 	KC_GRV,   KC_1,    KC_2,    KC_3,     KC_4,     KC_5,    KC_6,
 	KC_TAB,   KC_Q,    KC_W,    KC_E,     KC_R,     KC_T,    KC_WBAK,
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // FN1 Layer
-    [FN1] = KEYMAP(
+    [FN1] = LAYOUT_ergodox(
 	// Left hand
 	KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/ab/readme.md b/layouts/community/ergodox/ab/readme.md
index fde1c1726a..fde1c1726a 100644
--- a/keyboards/ergodox/keymaps/ab/readme.md
+++ b/layouts/community/ergodox/ab/readme.md
diff --git a/keyboards/ergodox/keymaps/ab/Makefile b/layouts/community/ergodox/ab/rules.mk
index b673c5ce52..839dd82e1e 100644
--- a/keyboards/ergodox/keymaps/ab/Makefile
+++ b/layouts/community/ergodox/ab/rules.mk
@@ -4,6 +4,4 @@
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 COMMAND_ENABLE   = no  # Commands for debug and configuration
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/absenth/keymap.c b/layouts/community/ergodox/absenth/keymap.c
index ded668e13b..b9dddfb420 100644
--- a/keyboards/ergodox/keymaps/absenth/keymap.c
+++ b/layouts/community/ergodox/absenth/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/absenth/readme.md b/layouts/community/ergodox/absenth/readme.md
index 744c67afea..744c67afea 100644
--- a/keyboards/ergodox/keymaps/absenth/readme.md
+++ b/layouts/community/ergodox/absenth/readme.md
diff --git a/keyboards/ergodox/keymaps/adam/config.h b/layouts/community/ergodox/adam/config.h
index b3910bc452..21af8c6b8d 100644
--- a/keyboards/ergodox/keymaps/adam/config.h
+++ b/layouts/community/ergodox/adam/config.h
@@ -1,4 +1,4 @@
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 300 //At 500 some bad logic takes hold
diff --git a/keyboards/ergodox/keymaps/adam/keymap.c b/layouts/community/ergodox/adam/keymap.c
index 432f0fb26f..e99e5d4535 100644
--- a/keyboards/ergodox/keymaps/adam/keymap.c
+++ b/layouts/community/ergodox/adam/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-        [BASE] = KEYMAP(
+        [BASE] = LAYOUT_ergodox(
                 // left hand
                 GUI_T(KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS,
                 _______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TAB,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 _______,
                 _______,_______, KC_ENT
         ),
-        [FLOCK] = KEYMAP(
+        [FLOCK] = LAYOUT_ergodox(
                 // left hand
                 XXXXXXX,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
                 XXXXXXX,KC_LBRC,XXXXXXX,  XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 XXXXXXX,
                 XXXXXXX, XXXXXXX, XXXXXXX
         ),
-        [JLOCK] = KEYMAP(
+        [JLOCK] = LAYOUT_ergodox(
                 // left hand
                 XXXXXXX,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
                 XXXXXXX,KC_LBRC,KC_GRV,  KC_TILD,XXXXXXX,XXXXXXX,XXXXXXX,
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 XXXXXXX,
                 XXXXXXX, XXXXXXX, XXXXXXX
         ),
-        [CAPLOCK] = KEYMAP(
+        [CAPLOCK] = LAYOUT_ergodox(
                 // left hand
                 TO(BASE), _______, _______, _______, _______, _______, _______,
                 _______, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), _______,
diff --git a/keyboards/ergodox/keymaps/adam/readme.md b/layouts/community/ergodox/adam/readme.md
index 9d03df5d57..9d03df5d57 100644
--- a/keyboards/ergodox/keymaps/adam/readme.md
+++ b/layouts/community/ergodox/adam/readme.md
diff --git a/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c b/layouts/community/ergodox/adnw_k_o_y/keymap.c
index 31ae4262b2..4ff4495905 100644
--- a/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
+++ b/layouts/community/ergodox/adnw_k_o_y/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        DE_K,         DE_DOT, DE_O,   DE_COMM,DE_Y,   TG(SYMB),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md b/layouts/community/ergodox/adnw_k_o_y/readme.md
index f0dd3815c1..f0dd3815c1 100644
--- a/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
+++ b/layouts/community/ergodox/adnw_k_o_y/readme.md
diff --git a/keyboards/ergodox/keymaps/albert/config.h b/layouts/community/ergodox/albert/config.h
index e6d3631172..0c6231fbbf 100644
--- a/keyboards/ergodox/keymaps/albert/config.h
+++ b/layouts/community/ergodox/albert/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 /* using UK layout for space-cadet-shift */
 #define LSPO_KEY KC_9
diff --git a/keyboards/ergodox/keymaps/albert/keymap.c b/layouts/community/ergodox/albert/keymap.c
index dfbb311bda..c1b47312fe 100644
--- a/keyboards/ergodox/keymaps/albert/keymap.c
+++ b/layouts/community/ergodox/albert/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 | Ctrl | Alt  |End/L5|       |PDn/L5|  Alt | Ctrl |
  *                                 `--------------------'       `--------------------'
  */
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,            KC_1,            KC_2,       KC_3,      KC_4,           KC_5,           LSFT(KC_LEFT),
         KC_TAB,            KC_Q,            KC_W,       KC_E,      KC_R,           KC_T,           MO(SYMB),
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |  ##  |       |  ##  |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
         // left hand
         KC_TRNS,   KC_F1,       KC_F2,       KC_F3,       KC_F4,          KC_F5,       KC_TRNS,
         KC_TRNS,   KC_EXLM,     LSFT(KC_2),  LSFT(KC_3),  LSFT(KC_4),     LSFT(KC_5),  KC_TRNS,
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |  ##  |       |  ##  |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUMB] = KEYMAP(
+[NUMB] = LAYOUT_ergodox(
         // left hand
         KC_TRNS,   KC_A,        KC_B,        KC_C,        KC_D,           KC_E,        KC_F,
         KC_TRNS,   KC_ASTR,     KC_7,        KC_8,        KC_9,           KC_ASTR,     UM_0x,
@@ -203,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[CRSR] = KEYMAP(
+[CRSR] = LAYOUT_ergodox(
         // left hand
         KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
         KC_NO,     KC_HOME,   KC_NO,     KC_UP,     KC_NO,     KC_PGUP,   KC_NO,
@@ -244,7 +244,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[MOUS] = KEYMAP(
+[MOUS] = LAYOUT_ergodox(
         // left hand
         KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
         KC_NO,     KC_NO,     KC_BTN1,   KC_MS_U,   KC_BTN2,   KC_NO,     KC_NO,
@@ -285,7 +285,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |  ##  |       |  ##  |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[KEYW] = KEYMAP(
+[KEYW] = LAYOUT_ergodox(
         // left hand
         KC_NO,     KC_NO,     KC_NO,     UM_SCARF,  UM_SADF,   UM_SMILY,   KC_NO,
         KC_NO,     UM_CONST,  UM_VOLAT,  UM_OPER,   UM_RET,    UM_TMPL,    KC_NO,
@@ -326,7 +326,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[EMAC] = KEYMAP(
+[EMAC] = LAYOUT_ergodox(
         // left hand
         KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     UM_EMPB,
         KC_NO,     UM_EMTR,   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
diff --git a/keyboards/ergodox/keymaps/albert/readme.md b/layouts/community/ergodox/albert/readme.md
index e20e047ac6..e20e047ac6 100644
--- a/keyboards/ergodox/keymaps/albert/readme.md
+++ b/layouts/community/ergodox/albert/readme.md
diff --git a/keyboards/ergodox/keymaps/albert/Makefile b/layouts/community/ergodox/albert/rules.mk
index eb8544afef..fcd019e838 100644
--- a/keyboards/ergodox/keymaps/albert/Makefile
+++ b/layouts/community/ergodox/albert/rules.mk
@@ -1,5 +1,3 @@
 COMMAND_ENABLE = no        # Commands for debug and configuration
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/alexjj/keymap.c b/layouts/community/ergodox/alexjj/keymap.c
index ac954ba5bc..5127b93f46 100644
--- a/keyboards/ergodox/keymaps/alexjj/keymap.c
+++ b/layouts/community/ergodox/alexjj/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[UNIC] = KEYMAP(  // layer 3 : Unicode Entry
+[UNIC] = LAYOUT_ergodox(  // layer 3 : Unicode Entry
         // left hand
        KC_LALT,       KC_P1,      KC_P2,      KC_P3,  KC_P4,     KC_P5,   KC_P6,
       KC_LALT,       KC_TRNS,    KC_TRNS,    KC_E,   KC_TRNS,   KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/alexjj/readme.md b/layouts/community/ergodox/alexjj/readme.md
index 4845cbbd91..4845cbbd91 100644
--- a/keyboards/ergodox/keymaps/alexjj/readme.md
+++ b/layouts/community/ergodox/alexjj/readme.md
diff --git a/keyboards/ergodox/keymaps/algernon/COPYING b/layouts/community/ergodox/algernon/COPYING
index 94a9ed024d..94a9ed024d 100644
--- a/keyboards/ergodox/keymaps/algernon/COPYING
+++ b/layouts/community/ergodox/algernon/COPYING
diff --git a/keyboards/ergodox/keymaps/algernon/NEWS.md b/layouts/community/ergodox/algernon/NEWS.md
index ee9d606708..ee9d606708 100644
--- a/keyboards/ergodox/keymaps/algernon/NEWS.md
+++ b/layouts/community/ergodox/algernon/NEWS.md
diff --git a/keyboards/ergodox/keymaps/algernon/config.h b/layouts/community/ergodox/algernon/config.h
index 9bb1025be5..8c115e21a0 100644
--- a/keyboards/ergodox/keymaps/algernon/config.h
+++ b/layouts/community/ergodox/algernon/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_ALGERNON_H
 #define CONFIG_ALGERNON_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #undef MOUSEKEY_TIME_TO_MAX
 #undef MOUSEKEY_MAX_SPEED
diff --git a/keyboards/ergodox/keymaps/algernon/keymap.c b/layouts/community/ergodox/algernon/keymap.c
index b615f3f5fd..8be54986f8 100644
--- a/keyboards/ergodox/keymaps/algernon/keymap.c
+++ b/layouts/community/ergodox/algernon/keymap.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdarg.h>
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "led.h"
 #include "debug.h"
 #include "action_layer.h"
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | ESC  |           | HUN  |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
 // left hand
  M(A_MPN)           ,M(A_9)      ,M(A_7)      ,M(A_5)  ,M(A_3)  ,M(A_1)  ,KC_F11
 ,KC_GRV             ,KC_QUOT     ,KC_COMM     ,KC_DOT  ,KC_P    ,KC_Y    ,TD(CT_LBP)
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | ESC  |           | LEAD |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[ADORE] = KEYMAP(
+[ADORE] = LAYOUT_ergodox(
 // left hand
  KC_MPLY            ,M(A_9)      ,M(A_7)      ,M(A_5)  ,M(A_3)  ,M(A_1) ,KC_F11
 ,KC_BSLS            ,KC_X        ,KC_W        ,KC_C    ,KC_H    ,KC_F   ,TD(CT_LBP)
@@ -225,7 +225,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  `--------------------'           `--------------------'
  */
 
-[ARRW] = KEYMAP(
+[ARRW] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
 ,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
@@ -271,7 +271,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  `--------------------'           `--------------------'
  */
 
-[APPSEL] = KEYMAP(
+[APPSEL] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,M(APP_MSIC),M(APP_SLK),M(APP_EMCS),M(APP_TERM),M(APP_CHRM),KC_TRNS
 ,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
@@ -318,7 +318,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  `--------------------'           `--------------------'
  */
 
-[HUN] = KEYMAP(
+[HUN] = LAYOUT_ergodox(
 // left hand
  KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO
 ,KC_NO   ,KC_NO   ,M(HU_OEE),KC_NO   ,M(HU_UEE),KC_NO   ,KC_NO
@@ -363,7 +363,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      |      |           |      |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[NMDIA] = KEYMAP(
+[NMDIA] = LAYOUT_ergodox(
 // left hand
  KC_NO      ,KC_F9       ,KC_F7      ,KC_F5   ,KC_F3   ,KC_F1   ,LGUI(KC_L)
 ,KC_NO      ,KC_NO       ,KC_NO      ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO
@@ -408,7 +408,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 
-[PLVR] = KEYMAP(
+[PLVR] = LAYOUT_ergodox(
 // left hand
 KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,   KC_NO,
 KC_NO,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM, PV_NUM,  PV_NUM,
@@ -958,7 +958,7 @@ void matrix_scan_user(void) {
     }
 
     SEQ_ONE_KEY (KC_V) {
-      SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ (" QMK_VERSION "/" KEYMAP_VERSION ")");
+      SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ (" QMK_VERSION "/" LAYOUT_ergodox_VERSION ")");
     }
 
     SEQ_ONE_KEY (KC_L) {
diff --git a/keyboards/ergodox/keymaps/algernon/readme.md b/layouts/community/ergodox/algernon/readme.md
index 4c1fb15ff7..4c1fb15ff7 100644
--- a/keyboards/ergodox/keymaps/algernon/readme.md
+++ b/layouts/community/ergodox/algernon/readme.md
diff --git a/keyboards/ergodox/keymaps/algernon/Makefile b/layouts/community/ergodox/algernon/rules.mk
index 23d3bb7239..4487dd812d 100644
--- a/keyboards/ergodox/keymaps/algernon/Makefile
+++ b/layouts/community/ergodox/algernon/rules.mk
@@ -27,19 +27,17 @@ endif
 
 OPT_DEFS += -DUSER_PRINT
 
-KEYMAP_VERSION = $(shell \
- if [ -d "${KEYMAP_PATH}/.git" ]; then \
-  cd "${KEYMAP_PATH}" && git describe --abbrev=6 --dirty --always --tags --match 'v*' 2>/dev/null; \
+LAYOUT_ergodox_VERSION = $(shell \
+ if [ -d "${LAYOUT_ergodox_PATH}/.git" ]; then \
+  cd "${LAYOUT_ergodox_PATH}" && git describe --abbrev=6 --dirty --always --tags --match 'v*' 2>/dev/null; \
  else echo QMK; fi)
 
-KEYMAP_BRANCH = $(shell \
- if [ -d "${KEYMAP_PATH}/.git" ]; then \
-  cd "${KEYMAP_PATH}"; \
+LAYOUT_ergodox_BRANCH = $(shell \
+ if [ -d "${LAYOUT_ergodox_PATH}/.git" ]; then \
+  cd "${LAYOUT_ergodox_PATH}"; \
  fi; \
  git rev-parse --abbrev-ref HEAD 2>/dev/null)
 
-OPT_DEFS += -DKEYMAP_VERSION=\"$(KEYMAP_VERSION)\\\#$(KEYMAP_BRANCH)\"
+OPT_DEFS += -DLAYOUT_ergodox_VERSION=\"$(LAYOUT_ergodox_VERSION)\\\#$(LAYOUT_ergodox_BRANCH)\"
+
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.ADORE.json b/layouts/community/ergodox/algernon/tools/heatmap-layout.ADORE.json
index e09efecc46..e09efecc46 100644
--- a/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.ADORE.json
+++ b/layouts/community/ergodox/algernon/tools/heatmap-layout.ADORE.json
diff --git a/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.Dvorak.json b/layouts/community/ergodox/algernon/tools/heatmap-layout.Dvorak.json
index 1e53281c56..1e53281c56 100644
--- a/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.Dvorak.json
+++ b/layouts/community/ergodox/algernon/tools/heatmap-layout.Dvorak.json
diff --git a/keyboards/ergodox/keymaps/algernon/tools/hid-commands b/layouts/community/ergodox/algernon/tools/hid-commands
index 54ca7556ab..54ca7556ab 100755..100644
--- a/keyboards/ergodox/keymaps/algernon/tools/hid-commands
+++ b/layouts/community/ergodox/algernon/tools/hid-commands
diff --git a/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py b/layouts/community/ergodox/algernon/tools/log-to-heatmap.py
index e927e0e39d..e927e0e39d 100755..100644
--- a/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
+++ b/layouts/community/ergodox/algernon/tools/log-to-heatmap.py
diff --git a/keyboards/ergodox/keymaps/algernon/tools/text-to-log.py b/layouts/community/ergodox/algernon/tools/text-to-log.py
index f080c32cd0..f080c32cd0 100755..100644
--- a/keyboards/ergodox/keymaps/algernon/tools/text-to-log.py
+++ b/layouts/community/ergodox/algernon/tools/text-to-log.py
diff --git a/keyboards/ergodox/keymaps/alphadox/config.h b/layouts/community/ergodox/alphadox/config.h
index deb218dc0d..6fc64f5082 100644
--- a/keyboards/ergodox/keymaps/alphadox/config.h
+++ b/layouts/community/ergodox/alphadox/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #define FORCE_NKRO
 #define PREVENT_STUCK_MODIFIERS
diff --git a/keyboards/ergodox/keymaps/alphadox/keymap.c b/layouts/community/ergodox/alphadox/keymap.c
index 731e62c0cd..8acd86b7ae 100644
--- a/keyboards/ergodox/keymaps/alphadox/keymap.c
+++ b/layouts/community/ergodox/alphadox/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -12,7 +12,7 @@ enum macro_id {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
     KC_NO,          KC_NO,         KC_NO,   KC_NO,    KC_NO,          KC_NO,  KC_NO,
     KC_TAB,         KC_Q,          KC_W,    KC_D,     KC_F,           KC_K,   KC_PGUP,
     CTL_T(KC_ESC),  LT(ETC,KC_A),  KC_S,    KC_E,     KC_T,           KC_G,
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,  SFT_T(KC_ENT),  LT(SYMB,KC_SPC)
 ),
 
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
     KC_TRNS,  KC_EXLM,  KC_AT,    KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_TRNS,
     KC_TRNS,  KC_HASH,  KC_DLR,   KC_LPRN,  KC_RPRN,  KC_BSLS,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,  KC_TRNS,  KC_TRNS
 ),
 
-[ETC] = KEYMAP(
+[ETC] = LAYOUT_ergodox(
     RESET,    KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_NO,
     KC_TRNS,  KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_PGUP,  KC_TRNS,
     KC_TRNS,  LT(ETC,KC_A),  KC_NO,  KC_NO,    KC_NO,    KC_PGDN,
diff --git a/keyboards/ergodox/keymaps/alphadox/Makefile b/layouts/community/ergodox/alphadox/rules.mk
index 633499d00b..f93ff3bb68 100644
--- a/keyboards/ergodox/keymaps/alphadox/Makefile
+++ b/layouts/community/ergodox/alphadox/rules.mk
@@ -12,6 +12,4 @@ BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/andrew_osx/keymap.c b/layouts/community/ergodox/andrew_osx/keymap.c
index 750155d986..ef37fc0329 100644
--- a/keyboards/ergodox/keymaps/andrew_osx/keymap.c
+++ b/layouts/community/ergodox/andrew_osx/keymap.c
@@ -1,7 +1,7 @@
 // Netable differences vs. the default firmware for the ErgoDox EZ:
 // 1. The Cmd key is now on the right side, making Cmd+Space easier.
 // 2. The media keys work on OSX (But not on Windows).
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_QUOT,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_FN1,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/belak/LICENSE b/layouts/community/ergodox/belak/LICENSE
index b462ba30e5..b462ba30e5 100644
--- a/keyboards/ergodox/keymaps/belak/LICENSE
+++ b/layouts/community/ergodox/belak/LICENSE
diff --git a/keyboards/ergodox/keymaps/belak/README.md b/layouts/community/ergodox/belak/README.md
index 30484e6e20..30484e6e20 100644
--- a/keyboards/ergodox/keymaps/belak/README.md
+++ b/layouts/community/ergodox/belak/README.md
diff --git a/keyboards/ergodox/keymaps/belak/keymap.c b/layouts/community/ergodox/belak/keymap.c
index 45f63539bb..016cf30b4b 100644
--- a/keyboards/ergodox/keymaps/belak/keymap.c
+++ b/layouts/community/ergodox/belak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "eeconfig.h"
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                |       |      | End  |       | PgDn |       |       |
  *                                `---------------------'       `----------------------'
  */
-    [BASE] = KEYMAP(  // layer 0 : default
+    [BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(SYMB),
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-    [SYMB] = KEYMAP(
+    [SYMB] = LAYOUT_ergodox(
         // left hand
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   E_TFLIP,
         _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, E_TSET,
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-    [NUMP] = KEYMAP(
+    [NUMP] = LAYOUT_ergodox(
         // left hand
         _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,
@@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______
     ),
 /* Keymap 3: Swap control and gui on the thumb */
-    [SWPH] = KEYMAP(
+    [SWPH] = LAYOUT_ergodox(
         // left hand
         _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,
diff --git a/layouts/community/ergodox/belak/rules.mk b/layouts/community/ergodox/belak/rules.mk
new file mode 100644
index 0000000000..cd8fdec641
--- /dev/null
+++ b/layouts/community/ergodox/belak/rules.mk
@@ -0,0 +1,4 @@
+TAP_DANCE_ENABLE=yes
+UNICODE_ENABLE=yes
+
+
diff --git a/keyboards/ergodox/keymaps/belak/visualizer.c b/layouts/community/ergodox/belak/visualizer.c
index b92890a668..b92890a668 100644
--- a/keyboards/ergodox/keymaps/belak/visualizer.c
+++ b/layouts/community/ergodox/belak/visualizer.c
diff --git a/keyboards/ergodox/keymaps/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c
index 05250ee6a7..c33c3c2550 100644
--- a/keyboards/ergodox/keymaps/bepo/keymap.c
+++ b/layouts/community/ergodox/bepo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "keymap_bepo.h"
 #include "keymap_french.h"
 
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[BEPO] = KEYMAP(
+[BEPO] = LAYOUT_ergodox(
 // Left hand
 BP_DOLLAR,	BP_DQOT,	BP_LGIL,	BP_RGIL,	BP_LPRN,	BP_RPRN,	KC_DEL,
 BP_PERCENT,	BP_B,		BP_E_ACUTE,	BP_P,		BP_O,		BP_E_GRAVE,	KC_BSPC,
@@ -72,7 +72,7 @@ MO(FNAV),	KC_RSHIFT,	KC_ENTER),
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[QW_B] = KEYMAP(
+[QW_B] = LAYOUT_ergodox(
 // Left hand
 KC_DOLLAR,	S(KC_QUOT),	S(KC_COMM),	S(KC_DOT),	KC_LPRN,	KC_RPRN,	KC_DEL,
 KC_PERCENT,	KC_B,		KC_E,		KC_P,		KC_O,		KC_E,		KC_BSPC,
@@ -109,7 +109,7 @@ KC_TRNS,	MO(QW_S),	KC_ENTER),
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[QW_A] = KEYMAP(
+[QW_A] = LAYOUT_ergodox(
 // Left hand
 KC_DOLLAR,	S(KC_QUOT),	S(KC_COMM),	S(KC_DOT),	KC_LBRC,	KC_RBRC,	KC_DEL,
 KC_PERCENT,	KC_PIPE,	KC_E,		KC_AMPR,	KC_O,		KC_E,		KC_BSPC,
@@ -146,7 +146,7 @@ KC_TRNS,	MO(QW_S),	KC_ENTER),
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[QW_S] = KEYMAP(
+[QW_S] = LAYOUT_ergodox(
 // Left hand
 KC_HASH,	KC_1,		KC_2,		KC_3,		KC_4,		KC_5,		KC_TRNS,
 KC_GRV,		S(KC_B),	S(KC_E),	S(KC_P),	S(KC_O),	S(KC_E),	KC_TRNS,
@@ -183,7 +183,7 @@ KC_TRNS,	KC_TRNS,	KC_TRNS),
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[AZ_B] = KEYMAP(
+[AZ_B] = LAYOUT_ergodox(
 // Left hand
 FR_DLR,		FR_QUOT,	FR_LESS,	FR_GRTR,	FR_LPRN,	FR_RPRN,	KC_DEL,
 FR_PERC,	KC_B,		FR_EACU,	KC_P,		KC_O,		FR_EGRV,	KC_BSPC,
@@ -220,7 +220,7 @@ KC_TRNS,	MO(AZ_S),	KC_ENTER),
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[AZ_A] = KEYMAP(
+[AZ_A] = LAYOUT_ergodox(
 // Left hand
 FR_DLR,		FR_QUOT,	FR_LESS,	FR_GRTR,	FR_LBRC,	FR_RBRC,	KC_DEL,
 FR_PERC,	FR_PIPE,	FR_EACU,	FR_AMP,		KC_O,		FR_EGRV,	KC_BSPC,
@@ -257,7 +257,7 @@ KC_TRNS,	MO(AZ_S),	KC_ENTER),
  *                                             |      |      |L_FNav|      |L_FNav|      |      |
  *                                             `--------------------'      `--------------------'
  */
-[AZ_S] = KEYMAP(
+[AZ_S] = LAYOUT_ergodox(
 // Left hand
 FR_HASH,	FR_1,		FR_2,		FR_3,		FR_4,		FR_5,		KC_TRNS,
 FR_GRV,		S(KC_B),	S(KC_E),	S(KC_P),	S(KC_O),	S(KC_E),	KC_TRNS,
@@ -294,7 +294,7 @@ KC_TRNS,	KC_TRNS,	KC_TRNS),
  *                                             |      |      |      |      |      |      |      |
  *                                             `--------------------'      `--------------------'
  */
-[FNAV] = KEYMAP(
+[FNAV] = LAYOUT_ergodox(
 // Left hand
 KC_NO,		KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_MUTE,
 KC_NO,		KC_MS_BTN5,	KC_MS_BTN1,	KC_MS_UP,	KC_MS_BTN2,	KC_MS_WH_UP,	KC_VOLU,
@@ -331,7 +331,7 @@ KC_TRNS,	KC_TRNS,	KC_NO),
  *                                             |      |      |      |      |      |      |      |
  *                                             `--------------------'      `--------------------'
  */
-[NUMK] = KEYMAP(
+[NUMK] = LAYOUT_ergodox(
 // Left hand
 KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
 KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
diff --git a/keyboards/ergodox/keymaps/bepo/readme.md b/layouts/community/ergodox/bepo/readme.md
index 14a1d22196..14a1d22196 100644
--- a/keyboards/ergodox/keymaps/bepo/readme.md
+++ b/layouts/community/ergodox/bepo/readme.md
diff --git a/keyboards/ergodox/keymaps/bepo/Makefile b/layouts/community/ergodox/bepo/rules.mk
index b673c5ce52..839dd82e1e 100644
--- a/keyboards/ergodox/keymaps/bepo/Makefile
+++ b/layouts/community/ergodox/bepo/rules.mk
@@ -4,6 +4,4 @@
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 COMMAND_ENABLE   = no  # Commands for debug and configuration
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c
index 495242adb3..9526ea3f77 100644
--- a/keyboards/ergodox/keymaps/bepo_csa/keymap.c
+++ b/layouts/community/ergodox/bepo_csa/keymap.c
@@ -1,5 +1,5 @@
 /* TypeMatrix-2030-like keymap  */
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "action_util.h"
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[LR_BASE] = KEYMAP(  // layer 0 : default
+[LR_BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         BP_DLR,     KC_1,      KC_2,    KC_3,      KC_4,     KC_5,    KC_DELT,
         KC_TAB,     BP_B,      BP_ECUT, BP_P,      BP_O,     BP_EGRV, KC_BSPC,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /**
  * Same as default but for use with Canadian Multilingual on OS side
  */
-[LR_CSA] = KEYMAP(
+[LR_CSA] = LAYOUT_ergodox(
         // left hand
         KC_DLR,      CSA_DQOT,   CSA_LGIL,  CSA_RGIL,  KC_LPRN,  KC_RPRN,   KC_TRNS,
         KC_TRNS,     KC_B,       CSA_ECUT,  KC_P,      KC_O,     CSA_EGRV,  KC_TRNS,
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[LR_CSA_SFT] = KEYMAP(
+[LR_CSA_SFT] = LAYOUT_ergodox(
         // left hand
         KC_HASH,  M(M_1),   M(M_2),   M(M_3),  M(M_4),   M(M_5),   KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
@@ -203,7 +203,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[LR_CSA_AGR] = KEYMAP(
+[LR_CSA_AGR] = LAYOUT_ergodox(
         // left hand
         MUC(NDSH),    MUC(MDSH),  CSA_LESS,  CSA_GRTR,  CSA_LBRC,   CSA_RBRC,  KC_TRNS,
         KC_TRNS,      CSA_PIPE,   CSA_DACT,  KC_AMPR,   CSA_OE,     CSA_DGRV,  KC_TRNS,
@@ -248,7 +248,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[LR_CSA_AGR_SFT] = KEYMAP(
+[LR_CSA_AGR_SFT] = LAYOUT_ergodox(
         // left hand
         CSA_PARG,      KC_NO,     CSA_LDQT,    CSA_RDQT,  KC_NO,     KC_NO,     KC_TRNS,
         KC_TRNS,       CSA_BPIP,  CSA_DDCT,    CSA_SECT,  S(CSA_OE), M(M_GRV),  KC_TRNS,
@@ -293,7 +293,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[LR_NUMR] = KEYMAP(
+[LR_NUMR] = LAYOUT_ergodox(
        // left hand
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
        KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
@@ -338,7 +338,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[LR_FN] = KEYMAP(
+[LR_FN] = LAYOUT_ergodox(
        TG(LR_CSA), KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_INS,
        KC_TRNS,    KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_VOLU,
        RESET,      KC_TRNS, KC_TRNS,      KC_CALC,     KC_MAIL,      KC_WHOM,
diff --git a/keyboards/ergodox/keymaps/bepo_csa/readme.md b/layouts/community/ergodox/bepo_csa/readme.md
index d4975b2265..d4975b2265 100644
--- a/keyboards/ergodox/keymaps/bepo_csa/readme.md
+++ b/layouts/community/ergodox/bepo_csa/readme.md
diff --git a/keyboards/ergodox/keymaps/bryan/keymap.c b/layouts/community/ergodox/bryan/keymap.c
index 572cea8cda..220ae2e803 100644
--- a/keyboards/ergodox/keymaps/bryan/keymap.c
+++ b/layouts/community/ergodox/bryan/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,                KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   M(2),
         KC_DELT,               KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c b/layouts/community/ergodox/coderkun_neo2/keymap.c
index 2d6f76856a..5b1887ec53 100644
--- a/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
+++ b/layouts/community/ergodox/coderkun_neo2/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "led.h"
 #include "keymap_extras/keymap_neo2.h"
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                             │     │     │ HYP │ │ MEH │     │     │
  *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   NEO_GRV,
         NEO_Y,      NEO_X,  NEO_V,  NEO_L,  NEO_C,  NEO_W,  KC_HOME,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                             │     │     │ HYP │ │ MEH │     │     │
  *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
  */
-[PMQ] = KEYMAP(
+[PMQ] = LAYOUT_ergodox(
         // left hand
         KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,
         DE_C,       DE_P,   DE_T,   DE_F,   DE_K,   DE_L,   KC_HOME,
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                             │     │     │ HYP │ │ MEH │     │     │
  *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
  */
-[PMN] = KEYMAP(
+[PMN] = LAYOUT_ergodox(
         KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,
         DE_Y,       DE_X,   DE_V,   DE_L,   DE_C,   DE_W,   KC_HOME,
         KC_NO,      DE_U,   DE_I,   DE_A,   DE_E,   DE_O,
@@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                             │     │     │     │ │     │     │     │
  *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
  */
-[FMU] = KEYMAP(
+[FMU] = LAYOUT_ergodox(
         // left hand
         KC_TRNS,    KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,
         KC_TRNS,    UC(0x250C),UC(0x252C),UC(0x2510),UC(0x2500),UC(0x2502),KC_TRNS,
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                             │     │     │     │ │     │     │     │
  *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
  */
-[NHL] = KEYMAP(
+[NHL] = LAYOUT_ergodox(
         // left hand
         KC_NO,      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
         KC_NO,      KC_PGUP,KC_BSPC,KC_UP,  KC_DELT,KC_PGDN,KC_NO,
diff --git a/keyboards/ergodox/keymaps/coderkun_neo2/readme.md b/layouts/community/ergodox/coderkun_neo2/readme.md
index 0c9290bf08..0c9290bf08 100644
--- a/keyboards/ergodox/keymaps/coderkun_neo2/readme.md
+++ b/layouts/community/ergodox/coderkun_neo2/readme.md
diff --git a/keyboards/ergodox/keymaps/coderkun_neo2/Makefile b/layouts/community/ergodox/coderkun_neo2/rules.mk
index b0fe90ab1d..b0fe90ab1d 100644
--- a/keyboards/ergodox/keymaps/coderkun_neo2/Makefile
+++ b/layouts/community/ergodox/coderkun_neo2/rules.mk
diff --git a/keyboards/ergodox/keymaps/colemak/keymap.c b/layouts/community/ergodox/colemak/keymap.c
index 7ef81ab4b9..e9e27bcc4d 100644
--- a/keyboards/ergodox/keymaps/colemak/keymap.c
+++ b/layouts/community/ergodox/colemak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   TG(SYMB),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/colemak/readme.md b/layouts/community/ergodox/colemak/readme.md
index e28b2f0856..e28b2f0856 100644
--- a/keyboards/ergodox/keymaps/colemak/readme.md
+++ b/layouts/community/ergodox/colemak/readme.md
diff --git a/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c b/layouts/community/ergodox/colemak_osx_pc_no/keymap.c
index eb0156c45b..1196770373 100644
--- a/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
+++ b/layouts/community/ergodox/colemak_osx_pc_no/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_norwegian.h"
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |-/Alt |       | Bspc |        |     |
  *                                 `--------------------'       `---------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         NO_BSLS,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, NO_ASTR,  TG(1),
         NO_QUES,         KC_Q,         KC_W,    KC_F,   KC_P,   KC_G,   NO_QUO2,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[BASE_MAC] = KEYMAP(
+[BASE_MAC] = LAYOUT_ergodox(
        NO_BSLS_MAC, KC_TRNS,KC_TRNS, NO_LCBR_MAC,NO_RCBR_MAC, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUMB_SYMB] = KEYMAP(
+[NUMB_SYMB] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_PERC, KC_TRNS , KC_TRNS,
        KC_TRNS, KC_3   , KC_2   , KC_1   , KC_0   , KC_TRNS,
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUMB_SYMB_MAC] = KEYMAP(
+[NUMB_SYMB_MAC] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_PERC, KC_TRNS , KC_TRNS,
        KC_TRNS, KC_3   , KC_2   , KC_1   , KC_0   , KC_TRNS,
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[FUNCTION] = KEYMAP(
+[FUNCTION] = LAYOUT_ergodox(
        KC_5, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,
        KC_TRNS, KC_F3   , KC_F2   , KC_F1 , KC_TRNS   , KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md b/layouts/community/ergodox/colemak_osx_pc_no/readme.md
index b28483f391..b28483f391 100644
--- a/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
+++ b/layouts/community/ergodox/colemak_osx_pc_no/readme.md
diff --git a/keyboards/ergodox/keymaps/colemak_programmer/keymap.c b/layouts/community/ergodox/colemak_programmer/keymap.c
index 1caccc5c29..46cd28dc8c 100644
--- a/keyboards/ergodox/keymaps/colemak_programmer/keymap.c
+++ b/layouts/community/ergodox/colemak_programmer/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |symbol|N-Lock| End   |       | PgDn |       |      |
  *                                 `---------------------'       `---------------------'
  */
-[0] = KEYMAP(  // layer 0 : default 
+[0] = LAYOUT_ergodox(  // layer 0 : default 
         // left hand
         KC_GRV,     KC_1,       KC_2,       KC_3,       KC_4,        KC_5,        KC_6,
         KC_TAB,     KC_Q,       KC_W,       KC_F,       KC_P,        KC_G,        TG(3),
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[1] = KEYMAP(  // layer 1: QWERTY layer (games) 
+[1] = LAYOUT_ergodox(  // layer 1: QWERTY layer (games) 
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_TRNS,
        KC_TRNS,        KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'       `--------------------'
 */
 // SYMBOLS
-[2] = KEYMAP(
+[2] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,        KC_F1,        KC_F2,       KC_F3,      KC_F4,       KC_F5,      KC_F6,
        KC_TRNS,        KC_PIPE,      KC_PLUS,     KC_LT,      KC_PERC,     KC_HASH,    DF(1),
@@ -158,7 +158,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // F-keys
-[3] = KEYMAP(
+[3] = LAYOUT_ergodox(
        KC_TRNS,        KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
@@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[4] = KEYMAP(
+[4] = LAYOUT_ergodox(
        RESET,          KC_LSFT,    KC_LSFT,    KC_SYSREQ,  KC_PSCR,    KC_SLCK,    KC_PAUSE,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/colemak_programmer/readme.md b/layouts/community/ergodox/colemak_programmer/readme.md
index a1544dcc56..a1544dcc56 100644
--- a/keyboards/ergodox/keymaps/colemak_programmer/readme.md
+++ b/layouts/community/ergodox/colemak_programmer/readme.md
diff --git a/keyboards/ergodox/keymaps/colemak_programmer/Makefile b/layouts/community/ergodox/colemak_programmer/rules.mk
index 91b77c77ab..91b77c77ab 100644
--- a/keyboards/ergodox/keymaps/colemak_programmer/Makefile
+++ b/layouts/community/ergodox/colemak_programmer/rules.mk
diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/layouts/community/ergodox/common_nighthawk/keymap.c
index debf384f3d..e113e85d1f 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/layouts/community/ergodox/common_nighthawk/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | Mute |       | Prev |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_UNDS,         KC_1,          KC_1,          KC_UNDS,         KC_ESC,   ALL_T(KC_NO),      KC_HOME,
         CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_TRNS,
        KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LBRC,  KC_LPRN,  KC_LCBR,  KC_TRNS,
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_TRNS,
diff --git a/layouts/community/ergodox/common_nighthawk/rules.mk b/layouts/community/ergodox/common_nighthawk/rules.mk
new file mode 100644
index 0000000000..180880c165
--- /dev/null
+++ b/layouts/community/ergodox/common_nighthawk/rules.mk
@@ -0,0 +1,4 @@
+SUBPROJECT_DEFAULT = ez
+TAP_DANCE_ENABLE = yes
+
+
diff --git a/keyboards/ergodox/keymaps/csharp_dev/keymap.c b/layouts/community/ergodox/csharp_dev/keymap.c
index e0c66f4872..7996c92e08 100644
--- a/keyboards/ergodox/keymaps/csharp_dev/keymap.c
+++ b/layouts/community/ergodox/csharp_dev/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_LPRN,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_QUOTE),
         KC_RPRN,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_BSPACE,
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // FKEYS + MACROS
-[FKEYS] = KEYMAP(
+[FKEYS] = LAYOUT_ergodox(
        // left hand
        KC_ESCAPE,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_GRAVE,
        KC_TAB,M(MACRO_PUBLIC),M(MACRO_STATIC),  M(MACRO_STRING),M(MACRO_INT),M(MACRO_RETURN),KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/csharp_dev/readme.md b/layouts/community/ergodox/csharp_dev/readme.md
index 980480d626..980480d626 100644
--- a/keyboards/ergodox/keymaps/csharp_dev/readme.md
+++ b/layouts/community/ergodox/csharp_dev/readme.md
diff --git a/keyboards/ergodox/keymaps/dave/keymap.c b/layouts/community/ergodox/dave/keymap.c
index 23c4e04906..f50be71fab 100644
--- a/keyboards/ergodox/keymaps/dave/keymap.c
+++ b/layouts/community/ergodox/dave/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,   KC_6,
         KC_TAB,   KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // PROGRAMMING
-[PROG] = KEYMAP(
+[PROG] = LAYOUT_ergodox(
        // left hand
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // NAVIGATION
-[NAVI] = KEYMAP(
+[NAVI] = LAYOUT_ergodox(
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
        KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_INS,  KC_PGUP, KC_TRNS,
        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DELT, KC_PGDN,
diff --git a/keyboards/ergodox/keymaps/dave/readme.md b/layouts/community/ergodox/dave/readme.md
index aa0f9bd192..aa0f9bd192 100644
--- a/keyboards/ergodox/keymaps/dave/readme.md
+++ b/layouts/community/ergodox/dave/readme.md
diff --git a/keyboards/ergodox/keymaps/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c
index 243ce94e98..0ae1ef7fb2 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/keymap.c
+++ b/layouts/community/ergodox/deadcyclo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
 	LT(UNI,KC_ESC),         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
         LT(SYMB,KC_TAB),        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA , MOUSE and NAVIGATION
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
 		KC_TRNS, F(I3_GO_GROUP_1), F(I3_GO_GROUP_2), F(I3_GO_GROUP_3), F(I3_GO_GROUP_4), F(I3_GO_GROUP_5), F(I3_GO_GROUP_6),
 KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -239,7 +239,7 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,
  *                                 `--------------------'       `--------------------'
  */
 // Unicode
-[UNI] = KEYMAP(
+[UNI] = LAYOUT_ergodox(
 		KC_TRNS, UC(0x250c), UC(0x2510), UC(0x2514), UC(0x2518), UC(0x2502), UC(0x2500),
 		KC_TRNS, F(EMOJI_SHRUG), F(EMOJI_YAY), F(EMOJI_HUG), F(EMOJI_SMILE), F(EMOJI_SMILE2), KC_TRNS,
 		KC_TRNS, F(EMOJI_HMM1), F(EMOJI_HMM2), F(EMOJI_BEAR1), F(EMOJI_BEAR2), F(EMOJI_FUU),
@@ -281,7 +281,7 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,
  *                                 `--------------------'       `--------------------'
  */
 // Unicode 2   
-[UNI2] = KEYMAP(
+[UNI2] = LAYOUT_ergodox(
 		KC_TRNS, UC(0x00b9), UC(0x00b2), UC(0x00b3), UC(0x2074), UC(0x2075), UC(0x2076),
 		KC_TRNS, UC(0x2081), UC(0x2082), UC(0x2083), UC(0x2084), UC(0x2085), UC(0x2086),
 		KC_TRNS, UC(0x215e), UC(0x215d), UC(0x215c), UC(0x215b), UC(0x215a),
diff --git a/keyboards/ergodox/keymaps/deadcyclo/readme.md b/layouts/community/ergodox/deadcyclo/readme.md
index 6ae5299d87..6ae5299d87 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/readme.md
+++ b/layouts/community/ergodox/deadcyclo/readme.md
diff --git a/keyboards/ergodox/keymaps/deadcyclo/Makefile b/layouts/community/ergodox/deadcyclo/rules.mk
index 039f07c8e3..039f07c8e3 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/Makefile
+++ b/layouts/community/ergodox/deadcyclo/rules.mk
diff --git a/keyboards/ergodox/keymaps/dragon788/keymap.c b/layouts/community/ergodox/dragon788/keymap.c
index d33bc6a259..ea3fe3ee5e 100644
--- a/keyboards/ergodox/keymaps/dragon788/keymap.c
+++ b/layouts/community/ergodox/dragon788/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LGUI,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(1),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
          RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R,
@@ -157,7 +157,7 @@ KEYMAP(
  *                                 `--------------------'       `--------------------'
  */
 
-[PLVR] = KEYMAP(  // layout: layer 4: Steno for Plover
+[PLVR] = LAYOUT_ergodox(  // layout: layer 4: Steno for Plover
         // left hand
         KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
         KC_NO,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NO,
diff --git a/keyboards/ergodox/keymaps/dvorak/dvorak.png.md b/layouts/community/ergodox/dvorak/dvorak.png.md
index 0022150013..0022150013 100644
--- a/keyboards/ergodox/keymaps/dvorak/dvorak.png.md
+++ b/layouts/community/ergodox/dvorak/dvorak.png.md
diff --git a/keyboards/ergodox/keymaps/dvorak/keymap.c b/layouts/community/ergodox/dvorak/keymap.c
index d3609c673e..ade89db965 100644
--- a/keyboards/ergodox/keymaps/dvorak/keymap.c
+++ b/layouts/community/ergodox/dvorak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(1),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c
index d33c6e5271..fc83a1d66c 100755..100644
--- a/keyboards/ergodox/keymaps/dvorak_emacs/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `----------------------'
  *
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_NO,          KC_1,     KC_2,   KC_3,   KC_4,          KC_5,           KC_ESC,
         KC_TILD,        KC_QUOTE, KC_COMM,KC_DOT, KC_P,          KC_Y,           KC_LBRACKET,
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | TRANS|       | TRANS|      |      |
  *                                 `--------------------'       `--------------------'
  */
-[AUX] = KEYMAP(
+[AUX] = LAYOUT_ergodox(
        // left hand
        KC_VOLU, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_SLEP,
        KC_VOLD, KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_NO,   KC_NO,
diff --git a/keyboards/ergodox/keymaps/dvorak_emacs/readme.md b/layouts/community/ergodox/dvorak_emacs/readme.md
index a3fc34afeb..a3fc34afeb 100644
--- a/keyboards/ergodox/keymaps/dvorak_emacs/readme.md
+++ b/layouts/community/ergodox/dvorak_emacs/readme.md
diff --git a/keyboards/ergodox/keymaps/dvorak_emacs_software/keymap.c b/layouts/community/ergodox/dvorak_emacs_software/keymap.c
index a2bc15c991..1f5681f66a 100755..100644
--- a/keyboards/ergodox/keymaps/dvorak_emacs_software/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs_software/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "keymap_dvorak.h"
 #include "debug.h"
 #include "action_layer.h"
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `----------------------'
  *
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_NO,          KC_1,     KC_2,   KC_3,   KC_4,          KC_5,           KC_ESC,
         KC_TILD,        DV_QUOT,  DV_COMM,DV_DOT, DV_P,          DV_Y,           DV_LBRC,
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | TRANS|       | TRANS|      |      |
  *                                 `--------------------'       `--------------------'
  */
-[AUX] = KEYMAP(
+[AUX] = LAYOUT_ergodox(
        // left hand
        KC_VOLU, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_SLEP,
        KC_VOLD, KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_NO,   KC_NO,
diff --git a/keyboards/ergodox/keymaps/dvorak_emacs_software/readme.md b/layouts/community/ergodox/dvorak_emacs_software/readme.md
index 0e1e94ffe1..0e1e94ffe1 100644
--- a/keyboards/ergodox/keymaps/dvorak_emacs_software/readme.md
+++ b/layouts/community/ergodox/dvorak_emacs_software/readme.md
diff --git a/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
index 89eae52080..e1ed56f849 100644
--- a/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
+++ b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   KC_WBAK,
         KC_ESC,         KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   KC_DELT,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(  // layer 0 : default
+LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,        KC_Q,         KC_W,      KC_E,   KC_R,   KC_T,   KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md b/layouts/community/ergodox/dvorak_intl_squisher/readme.md
index 7a48bf5247..7a48bf5247 100644
--- a/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
+++ b/layouts/community/ergodox/dvorak_intl_squisher/readme.md
diff --git a/keyboards/ergodox/keymaps/dvorak_plover/README.md b/layouts/community/ergodox/dvorak_plover/README.md
index c8287b0195..c8287b0195 100644
--- a/keyboards/ergodox/keymaps/dvorak_plover/README.md
+++ b/layouts/community/ergodox/dvorak_plover/README.md
diff --git a/keyboards/ergodox/keymaps/dvorak_plover/keymap.c b/layouts/community/ergodox/dvorak_plover/keymap.c
index d0505609d7..4d11224731 100644
--- a/keyboards/ergodox/keymaps/dvorak_plover/keymap.c
+++ b/layouts/community/ergodox/dvorak_plover/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   KC_ESC,
         KC_TAB,         KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   MO(SYMB),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 
-[PLVR] = KEYMAP(  // layout: layer 2: Steno for Plover
+[PLVR] = LAYOUT_ergodox(  // layout: layer 2: Steno for Plover
         // left hand
         KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
         KC_NO,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |   ace|      | End  |       | PgDn |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[QWRT] = KEYMAP(  // layer 3: qwerty for gaming
+[QWRT] = LAYOUT_ergodox(  // layer 3: qwerty for gaming
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer/README.md b/layouts/community/ergodox/dvorak_programmer/README.md
index 36722469fe..36722469fe 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer/README.md
+++ b/layouts/community/ergodox/dvorak_programmer/README.md
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer/keymap.c b/layouts/community/ergodox/dvorak_programmer/keymap.c
index d299d02c34..33115d21f3 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer/keymap.c
+++ b/layouts/community/ergodox/dvorak_programmer/keymap.c
@@ -1,5 +1,5 @@
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "led.h"
 #include "debug.h"
 #include "action_layer.h"
@@ -39,7 +39,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // base layer
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,                    KC_F1,          KC_F2,       KC_F3,        KC_F4,       KC_F5,       KC_F6,
         KC_TAB,                    KC_QUOT,        KC_COMM,     KC_DOT,       KC_P,        KC_Y,        MO(KEY_SEL),
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 
 	 
 // shell navigation layer
-[SHELL_NAV] = KEYMAP(
+[SHELL_NAV] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     
 // key navigation layer
-[KEY_NAV] = KEYMAP(
+[KEY_NAV] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 // key selection layer
-[KEY_SEL] = KEYMAP(
+[KEY_SEL] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 // number layer
-[NUMBER] = KEYMAP(
+[NUMBER] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 
-[SYMBOL] = KEYMAP(
+[SYMBOL] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
 
-[BRACKETS] = KEYMAP(
+[BRACKETS] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,             KC_TRNS,            KC_TRNS,               KC_TRNS,KC_TRNS,
        KC_TRNS,KC_TRNS,M(OPEN_CLOSE_CURLY), M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_BRACKET), KC_TRNS,KC_TRNS,
@@ -214,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
 
-[SHORTCUTS] = KEYMAP(
+[SHORTCUTS] = LAYOUT_ergodox(
        // left hand
        KC_NO,  MEH(KC_F1), MEH(KC_F2), MEH(KC_F3),  MEH(KC_F4), MEH(KC_F5), MEH(KC_F6),
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -236,7 +236,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 
-[MOUSE] = KEYMAP(
+[MOUSE] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer/Makefile b/layouts/community/ergodox/dvorak_programmer/rules.mk
index 44d702209c..44d702209c 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer/Makefile
+++ b/layouts/community/ergodox/dvorak_programmer/rules.mk
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer_swe/keymap.c b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
index 8d65f7c7a5..9c66baceb2 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer_swe/keymap.c
+++ b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         MO(DEVL),       KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        NO_MINS,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(SYMB),
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),      KC_F1,   KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_TRNS,
        KC_TRNS,   NO_AT,   ALGR(KC_7),  ALGR(KC_0),  NO_LBRC,   NO_RBRC,  KC_TRNS,
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[DEVL] = KEYMAP(
+[DEVL] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, M(MACRO_SAVE), M(MACRO_BUILD), M(MACRO_DEBUG), KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer_swe/readme.md b/layouts/community/ergodox/dvorak_programmer_swe/readme.md
index 552fa0e3ab..552fa0e3ab 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer_swe/readme.md
+++ b/layouts/community/ergodox/dvorak_programmer_swe/readme.md
diff --git a/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c b/layouts/community/ergodox/dvorak_spanish/keymap.c
index 6d7adf9073..19dfb27f57 100755..100644
--- a/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
+++ b/layouts/community/ergodox/dvorak_spanish/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *   SA = SHIFT-ALT
  *
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NONUS_BSLASH,
         LT(AUX, KC_F1), KC_DOT, KC_COMM,KC_SCLN,KC_P,   KC_Y,   MEH_T(KC_DEL),
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |  L2  |       | VolDn|      |      |
  *                                 `--------------------'       `--------------------'
  */
-[AUX] = KEYMAP(
+[AUX] = LAYOUT_ergodox(
        // left hand
        KC_NO  , KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_SLEP,
        KC_TRNS, KC_NONUS_BSLASH, LSFT(KC_NONUS_BSLASH), KC_MS_U, KC_NO, KC_NO, KC_NO,
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *   SA = SHIFT-ALT
  *
  */
-[QWERTY] = KEYMAP(
+[QWERTY] = LAYOUT_ergodox(
         // left hand
         KC_GRAVE,       KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_NONUS_BSLASH,
         KC_TRNS,        KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   MEH_T(KC_DEL),
diff --git a/keyboards/ergodox/keymaps/dvorak_spanish/readme.md b/layouts/community/ergodox/dvorak_spanish/readme.md
index e075e3cd7d..e075e3cd7d 100644
--- a/keyboards/ergodox/keymaps/dvorak_spanish/readme.md
+++ b/layouts/community/ergodox/dvorak_spanish/readme.md
diff --git a/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c b/layouts/community/ergodox/emacs_osx_dk/keymap.c
index e80f08d736..3fa14a5644 100644
--- a/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
+++ b/layouts/community/ergodox/emacs_osx_dk/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(SYMB),
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md b/layouts/community/ergodox/emacs_osx_dk/readme.md
index bd12c7d9ae..bd12c7d9ae 100644
--- a/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
+++ b/layouts/community/ergodox/emacs_osx_dk/readme.md
diff --git a/keyboards/ergodox/keymaps/erez_experimental/config.h b/layouts/community/ergodox/erez_experimental/config.h
index 4da18c65aa..4b9c29c94e 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/config.h
+++ b/layouts/community/ergodox/erez_experimental/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #define ONESHOT_TAP_TOGGLE 2
 #define ONESHOT_TIMEOUT 300
diff --git a/keyboards/ergodox/keymaps/erez_experimental/keymap.c b/layouts/community/ergodox/erez_experimental/keymap.c
index 13b8240ce8..481f984d5d 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/keymap.c
+++ b/layouts/community/ergodox/erez_experimental/keymap.c
@@ -1,5 +1,5 @@
 #include <keymap_extras/keymap_colemak.h>
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,     KC_5,   LCTL(KC_MINS),
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,     KC_T,   TG(SYMB),
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        RGB_FF00BB, KC_F1,  KC_F2,  KC_F3,      KC_F4,        KC_F5,   KC_TRNS,
        KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS,
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_PGUP, KC_HOME, KC_END,  KC_PGDN, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/erez_experimental/readme.md b/layouts/community/ergodox/erez_experimental/readme.md
index f0738d9a70..f0738d9a70 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/readme.md
+++ b/layouts/community/ergodox/erez_experimental/readme.md
diff --git a/keyboards/ergodox/keymaps/erez_experimental/Makefile b/layouts/community/ergodox/erez_experimental/rules.mk
index b673c5ce52..839dd82e1e 100644
--- a/keyboards/ergodox/keymaps/erez_experimental/Makefile
+++ b/layouts/community/ergodox/erez_experimental/rules.mk
@@ -4,6 +4,4 @@
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 COMMAND_ENABLE   = no  # Commands for debug and configuration
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/familiar/README.md b/layouts/community/ergodox/familiar/README.md
index 536179337f..536179337f 100644
--- a/keyboards/ergodox/keymaps/familiar/README.md
+++ b/layouts/community/ergodox/familiar/README.md
diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/layouts/community/ergodox/familiar/keymap.c
index c0334615b2..bc513c0cc4 100644
--- a/keyboards/ergodox/keymaps/familiar/keymap.c
+++ b/layouts/community/ergodox/familiar/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | TO(1)|       |TO(3) |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_GRV,     KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,
         KC_TAB,     KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_HOME,
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
         // left hand
         _______,    UC(0x00A1), UC(0x00B2), UC(0x00B3), UC(0x00A4), UC(0x20AC), UC(0x00BC),
         _______,    UC(0x00E4), UC(0x00E5), UC(0x00E9), UC(0x00AE), UC(0x00FE), _______,
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[CSYM] = KEYMAP(
+[CSYM] = LAYOUT_ergodox(
         // left hand
         _______,    UC(0x00B9), _______,    _______,    UC(0x00A3), _______,    _______,
         _______,    UC(0x00C4), UC(0x00C5), UC(0x00C9), S(KC_R),    UC(0x00DE), _______,
@@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUMP] = KEYMAP(
+[NUMP] = LAYOUT_ergodox(
         // left hand
         _______,    _______,    _______,    _______,    _______,    _______,    _______,
         _______,    _______,    _______,    _______,    _______,    _______,    _______,
@@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[ARRW] = KEYMAP(
+[ARRW] = LAYOUT_ergodox(
         // left hand
         KC_ESC,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,
         _______,    _______,    _______,    KC_UP,      _______,    _______,    _______,
diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/layouts/community/ergodox/familiar/rules.mk
index 31e0fcf293..31e0fcf293 100644
--- a/keyboards/ergodox/keymaps/familiar/Makefile
+++ b/layouts/community/ergodox/familiar/rules.mk
diff --git a/keyboards/ergodox/keymaps/french_hacker/keymap.c b/layouts/community/ergodox/french_hacker/keymap.c
index 33b84c2d8d..30bf56608d 100644
--- a/keyboards/ergodox/keymaps/french_hacker/keymap.c
+++ b/layouts/community/ergodox/french_hacker/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,
         KC_TRNS,        FR_Q,         FR_W,   KC_F,   KC_P,   KC_B,   TO(BASE),
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,FR_SECT,FR_LESS,  FR_LCBR,FR_BSLS,FR_TILD,KC_TRNS,
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // ACCENTED CHARACTERS
-[ACC] = KEYMAP(
+[ACC] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS, KC_TRNS,
 
        KC_TRNS, KC_TRNS, FR_AGRV, M(M_ACIRC),  M(M_AUMLT), KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/french_hacker/readme.md b/layouts/community/ergodox/french_hacker/readme.md
index 6b0575af13..6b0575af13 100644
--- a/keyboards/ergodox/keymaps/french_hacker/readme.md
+++ b/layouts/community/ergodox/french_hacker/readme.md
diff --git a/keyboards/ergodox/keymaps/galson/keymap.c b/layouts/community/ergodox/galson/keymap.c
index 0d3e7560dd..e345005518 100644
--- a/keyboards/ergodox/keymaps/galson/keymap.c
+++ b/layouts/community/ergodox/galson/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_PLUS,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_BTN2,
         KC_EQL,          KC_Q,         KC_W,   KC_E,   KC_R,   GUI_T(KC_T),   KC_LSPO,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/galson/readme.md b/layouts/community/ergodox/galson/readme.md
index ebc916725b..ebc916725b 100644
--- a/keyboards/ergodox/keymaps/galson/readme.md
+++ b/layouts/community/ergodox/galson/readme.md
diff --git a/keyboards/ergodox/keymaps/galson/Makefile b/layouts/community/ergodox/galson/rules.mk
index f008f50793..f008f50793 100644
--- a/keyboards/ergodox/keymaps/galson/Makefile
+++ b/layouts/community/ergodox/galson/rules.mk
diff --git a/keyboards/ergodox/keymaps/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c
index 971318d87b..d8da953e0e 100644
--- a/keyboards/ergodox/keymaps/german-kinergo/keymap.c
+++ b/layouts/community/ergodox/german-kinergo/keymap.c
@@ -1,7 +1,7 @@
 // German keymap derived from "german", but more closely resembling the German layout of the Kinesis Ergo Elan.
 //
 // chschmitz, 2016-01-27
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,           KC_2,     KC_3,     KC_4,     KC_5,   DE_ACUT,
         KC_TAB,         KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   MO(1),
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PGUP,
         KC_PGDN, KC_ENT, KC_SPC
     ),
-// [BASE] = KEYMAP(  // layer 0 : default
+// [BASE] = LAYOUT_ergodox(  // layer 0 : default
 //         // left hand
 //         KC_CIRC,         KC_1,           KC_2,     KC_3,     KC_4,     KC_5,   KC_MPLY,
 //         KC_DELT,         KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   TG(1),
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,DE_EXLM,DE_AT,  DE_LCBR,DE_RCBR,DE_PIPE,KC_TRNS,
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
diff --git a/keyboards/ergodox/keymaps/german-kinergo/readme.md b/layouts/community/ergodox/german-kinergo/readme.md
index addead0c1f..addead0c1f 100644
--- a/keyboards/ergodox/keymaps/german-kinergo/readme.md
+++ b/layouts/community/ergodox/german-kinergo/readme.md
diff --git a/keyboards/ergodox/keymaps/german-lukas/README.md b/layouts/community/ergodox/german-lukas/README.md
index 3566b4ee64..3566b4ee64 100644
--- a/keyboards/ergodox/keymaps/german-lukas/README.md
+++ b/layouts/community/ergodox/german-lukas/README.md
diff --git a/keyboards/ergodox/keymaps/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c
index c6e9f2f900..2ad909b6c8 100644
--- a/keyboards/ergodox/keymaps/german-lukas/keymap.c
+++ b/layouts/community/ergodox/german-lukas/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_CAPS,         KC_1,           KC_2,     KC_3,     KC_4,     KC_5,   DE_ACUT,
         KC_TAB,          KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   TG(SYMB),
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,DE_EXLM,DE_AT,  DE_LCBR,DE_RCBR,DE_PIPE,KC_TRNS,
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
     // left hand
        KC_TRNS, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // Shortcuts
-[SHRT] = KEYMAP(
+[SHRT] = LAYOUT_ergodox(
     // left hand
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, LCA(KC_F1), LCA(KC_F2), LCA(KC_F3), LCA(KC_F4), LCA(KC_F5), KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py b/layouts/community/ergodox/german-manuneo/compile_keymap.py
index 7076a6ecb2..44f31b1c6e 100644
--- a/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
+++ b/layouts/community/ergodox/german-manuneo/compile_keymap.py
@@ -30,7 +30,7 @@ if PY2:
 
 KEYBOARD_LAYOUTS = {
     # These map positions in the parsed layout to
-    # positions in the KEYMAP MATRIX
+    # positions in the LAYOUT_ergodox MATRIX
     'ergodox_ez': [
         [ 0,  1,  2,  3,  4,  5,  6],  [38, 39, 40, 41, 42, 43, 44],
         [ 7,  8,  9, 10, 11, 12, 13],  [45, 46, 47, 48, 49, 50, 51],
@@ -664,7 +664,7 @@ def iter_keymap_parts(config, keymaps):
         keymap = keymaps[layer_name]
         row_indents = ROW_INDENTS.get(config['layout'])
         keymap_lines = "".join(iter_keymap_lines(keymap, row_indents))
-        yield "[L{0}] = KEYMAP({1}\n),\n".format(i, keymap_lines)
+        yield "[L{0}] = LAYOUT_ergodox({1}\n),\n".format(i, keymap_lines)
 
     yield "};\n\n"
 
diff --git a/keyboards/ergodox/keymaps/german-manuneo/keymap.c b/layouts/community/ergodox/german-manuneo/keymap.c
index 16e92bc23b..71988b7dda 100644
--- a/keyboards/ergodox/keymaps/german-manuneo/keymap.c
+++ b/layouts/community/ergodox/german-manuneo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "keymap.h"
 #include "keymap_german.h"
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |BSPC |LSFT | ESC | ! PGDN|ENTER|SPACE|
  *                   '-----------------' '-----------------'
  */
-[L0] = KEYMAP(
+[L0] = LAYOUT_ergodox(
  MO(5),   DE_1,     DE_2,     DE_3,    DE_4,    DE_5,    DE_ACUT,
  MO(4),   DE_X,     DE_P,     DE_F,    DE_W,    DE_G,    KC_HOME,
  MO(1),   DE_U,     DE_I,     DE_A,    DE_E,    DE_O,
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L1] = KEYMAP(
+[L1] = LAYOUT_ergodox(
  KC_TRNS, DE_EXLM, DE_DQOT, DE_PARA, KC_TRNS,               KC_TRNS,               KC_TRNS,
  KC_TRNS, DE_ASTR, DE_PIPE, DE_SLSH, DE_LCBR,               DE_RCBR,               KC_TRNS,
  KC_TRNS, DE_UNDS, DE_MINS, DE_AMPR, DE_LBRC,               DE_RBRC,
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L2] = KEYMAP(
+[L2] = LAYOUT_ergodox(
  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -242,7 +242,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L3] = KEYMAP(
+[L3] = LAYOUT_ergodox(
  KC_TRNS, M(UC_SUPERSCRIPT_ONE),           M(UC_SUPERSCRIPT_TWO),                  M(UC_SUPERSCRIPT_THREE),          M(UC_SUPERSCRIPT_FOUR),               M(UC_SUPERSCRIPT_FIVE),          M(UC_FOR_ALL),
  KC_TRNS, M(UC_MULTIPLICATION_SIGN),       M(UC_VULGAR_FRACTION_ONE_HALF),         M(UC_DIVISION_SIGN),              M(UC_VULGAR_FRACTION_ONE_QUARTER),    M(UC_VULGAR_FRACTION_ONE_FIFTH), KC_TRNS,
  KC_TRNS, KC_TRNS,                         M(UC_PLUS_MINUS_SIGN),                  DE_AT,                            DE_EURO,                              M(UC_EMPTY_SET),
@@ -280,7 +280,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L4] = KEYMAP(
+[L4] = LAYOUT_ergodox(
  KC_TRNS, M(UC_SUBSCRIPT_ONE),              M(UC_SUBSCRIPT_TWO),            M(UC_SUBSCRIPT_THREE),          M(UC_SUBSCRIPT_FOUR),             M(UC_SUBSCRIPT_FIVE),             KC_TRNS,
  KC_TRNS, M(UC_GREEK_SMALL_LETTER_CHI),     M(UC_GREEK_SMALL_LETTER_PI),    M(UC_GREEK_SMALL_LETTER_PHI),   M(UC_GREEK_SMALL_LETTER_OMEGA),   M(UC_GREEK_SMALL_LETTER_GAMMA),   KC_TRNS,
  KC_TRNS, M(UC_GREEK_SMALL_LETTER_UPSILON), M(UC_GREEK_SMALL_LETTER_IOTA),  M(UC_GREEK_SMALL_LETTER_ALPHA), M(UC_GREEK_SMALL_LETTER_EPSILON), M(UC_GREEK_SMALL_LETTER_OMICRON),
@@ -318,7 +318,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L5] = KEYMAP(
+[L5] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS,                            KC_TRNS,                          KC_TRNS,                          KC_TRNS,                            KC_TRNS,                            KC_TRNS,
  KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_CHI),     M(UC_GREEK_CAPITAL_LETTER_PI),    M(UC_GREEK_CAPITAL_LETTER_PHI),   M(UC_GREEK_CAPITAL_LETTER_OMEGA),   M(UC_GREEK_CAPITAL_LETTER_GAMMA),   KC_TRNS,
  KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_UPSILON), M(UC_GREEK_CAPITAL_LETTER_IOTA),  M(UC_GREEK_CAPITAL_LETTER_ALPHA), M(UC_GREEK_CAPITAL_LETTER_EPSILON), M(UC_GREEK_CAPITAL_LETTER_OMICRON),
@@ -356,7 +356,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L6] = KEYMAP(
+[L6] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/german-manuneo/keymap.md b/layouts/community/ergodox/german-manuneo/keymap.md
index 837b254462..c59f16a00c 100644
--- a/keyboards/ergodox/keymaps/german-manuneo/keymap.md
+++ b/layouts/community/ergodox/german-manuneo/keymap.md
@@ -12,7 +12,7 @@ Tested with python 2.7 and python 3.4
     {
         "layout": "ergodox_ez",
         "keymaps_includes": [
-            "ergodox.h",
+            QMK_KEYBOARD_H,
             "action_layer.h",
             "keymap_common.h",
             "keymap_extras/keymap_german.h",
diff --git a/keyboards/ergodox/keymaps/german/keymap.c b/layouts/community/ergodox/german/keymap.c
index 9b2f6ffa2d..67d01fd337 100644
--- a/keyboards/ergodox/keymaps/german/keymap.c
+++ b/layouts/community/ergodox/german/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_CIRC,         KC_1,           KC_2,     KC_3,     KC_4,     KC_5,   KC_MPLY,
         KC_DELT,         KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   TG(1),
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,DE_EXLM,DE_AT,  DE_LCBR,DE_RCBR,DE_PIPE,KC_TRNS,
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
diff --git a/keyboards/ergodox/keymaps/guni/keymap.c b/layouts/community/ergodox/guni/keymap.c
index 9d9191f627..9a00f0a979 100644
--- a/keyboards/ergodox/keymaps/guni/keymap.c
+++ b/layouts/community/ergodox/guni/keymap.c
@@ -1,10 +1,10 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "bootloader.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    KEYMAP(  // layer 0 : default
+    LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL  ,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,
 	KC_FN25 ,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_HOME,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_FN29,KC_ENT ,KC_SPC 
     ),
 
-    KEYMAP(  // layer 1 : function and symbol keys
+    LAYOUT_ergodox(  // layer 1 : function and symbol keys
         // left hand
         KC_TRNS,KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
         KC_TRNS,KC_AT,KC_UNDS ,KC_LBRC,KC_RBRC,KC_CIRC ,KC_TRNS,
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,KC_TRNS,KC_TRNS
     ),
 
-    KEYMAP(  // layer 2: navigation 
+    LAYOUT_ergodox(  // layer 2: navigation 
         // left hand
         KC_NO,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_PGUP,KC_HOME,KC_UP ,KC_END,KC_NO ,KC_TRNS,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS
     ),
-    KEYMAP(  // layer 3 : teensy bootloader functions
+    LAYOUT_ergodox(  // layer 3 : teensy bootloader functions
         // left hand
         KC_FN0, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 
-    KEYMAP(  // layer 4: numpad
+    LAYOUT_ergodox(  // layer 4: numpad
         // left hand
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/guni/readme.txt b/layouts/community/ergodox/guni/readme.txt
index 93ae5f0567..679a08e31d 100644
--- a/keyboards/ergodox/keymaps/guni/readme.txt
+++ b/layouts/community/ergodox/guni/readme.txt
@@ -23,7 +23,7 @@ xkbcomp $DISPLAY $HOME/.xkbmap
 * automatic startup each time you startup x
 echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
 
-    KEYMAP(  // layer 0 : default
+    LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL  ,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,
 	KC_FN25 ,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_HOME,
@@ -44,7 +44,7 @@ echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
         KC_FN29,KC_ENT ,KC_SPC 
     ),
 
-    KEYMAP(  // layer 1 : function and symbol keys
+    LAYOUT_ergodox(  // layer 1 : function and symbol keys
         // left hand
         KC_TRNS,KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
         KC_TRNS,KC_AT,KC_UNDS ,KC_LBRC,KC_RBRC,KC_CIRC ,KC_TRNS,
@@ -65,7 +65,7 @@ echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
         KC_TRNS,KC_TRNS,KC_TRNS
     ),
 
-    KEYMAP(  // layer 2: navigation 
+    LAYOUT_ergodox(  // layer 2: navigation 
         // left hand
         KC_NO,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_PGUP,KC_HOME,KC_UP ,KC_END,KC_NO ,KC_TRNS,
@@ -85,7 +85,7 @@ echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
         KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS
     ),
-    KEYMAP(  // layer 3 : teensy bootloader functions
+    LAYOUT_ergodox(  // layer 3 : teensy bootloader functions
         // left hand
         KC_FN0, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -107,7 +107,7 @@ echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
     ),
 
 
-    KEYMAP(  // layer 4: numpad
+    LAYOUT_ergodox(  // layer 4: numpad
         // left hand
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
index c219ce8840..43bc74a0e1 100644
--- a/keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
+++ b/layouts/community/ergodox/ishigoya-jp/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_jp.h"
@@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         M(TOJPLOUT),   KC_NO,   KC_EQL, LSFT(KC_5), KC_NO,   KC_NO,   LCTL(KC_A),
         KC_TAB,        KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   M(CUTCOPY),
@@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 
  * 
  */
-[JP] = KEYMAP(
+[JP] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, M(JPNU), M(JPKO), M(JPSA), M(JPHE), M(JPKE), KC_TRNS,
        KC_TRNS, M(JPTO), M(JPSHI), M(JPKA), M(JPKI), M(JPSU),
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 
  * 
  */
-[JPXON] = KEYMAP(
+[JPXON] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
 	   KC_NO, KC_NO,    M(JPXE),        KC_NO,    M(JPXKE),   KC_NO, KC_NO,
        KC_NO, KC_NO,    KC_NO,          M(JPXKA),      KC_NO, KC_NO, 
@@ -265,7 +265,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 
  * 
  */
-[JPKAZARI] = KEYMAP(
+[JPKAZARI] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
 	   KC_NO, KC_NO,    M(JPGO),        M(JPZA),    M(JPBE), M(JPGE), KC_NO,
        KC_NO, M(JPDO),    M(JPJI),        M(JPGA),    M(JPGI), M(JPZU), 
@@ -308,7 +308,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 
  * 
  */
-[JPTOPROW] = KEYMAP(
+[JPTOPROW] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO,   KC_NO, KC_NO,
 	   KC_NO, KC_NO,    KC_E,       KC_MINS,  M(JPRE), KC_NO, KC_NO,
        KC_NO, M(JPRA),  M(JPRI),       M(JPNA),  M(JPNO), M(JPMI), 
@@ -352,7 +352,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 
  * 
  */
-[JPTRKZ] = KEYMAP(
+[JPTRKZ] = LAYOUT_ergodox(
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, KC_NO,
 	   KC_NO, KC_NO,    KC_NO,        KC_NO,    M(JPPE),KC_NO,  KC_NO,
        KC_NO, KC_NO,    KC_NO,        KC_NO,    KC_NO, KC_NO, 
@@ -393,7 +393,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // Numbers
-[NUM] = KEYMAP(
+[NUM] = LAYOUT_ergodox(
        // left hand
 	   KC_NO, KC_F1,      KC_F2,          KC_F3,      KC_F4,   KC_F5,   KC_NO,
 	   KC_NO, KC_NO,    KC_NO,        JP_DQT,    KC_RBRACKET,   KC_BSPC, KC_SCLN,
diff --git a/keyboards/ergodox/keymaps/ishigoya-jp/readme.md b/layouts/community/ergodox/ishigoya-jp/readme.md
index 839fe978d1..839fe978d1 100644
--- a/keyboards/ergodox/keymaps/ishigoya-jp/readme.md
+++ b/layouts/community/ergodox/ishigoya-jp/readme.md
diff --git a/keyboards/ergodox/keymaps/italian/keymap.c b/layouts/community/ergodox/italian/keymap.c
index e4c7a569cb..366f4c9b98 100644
--- a/keyboards/ergodox/keymaps/italian/keymap.c
+++ b/layouts/community/ergodox/italian/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,                      KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
         KC_TAB,                      KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TT(SYMB),
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS, KC_EXLM,                RALT(KC_SCLN), RALT(KC_LCBR), RALT(KC_RCBR), KC_TILD,  KC_TRNS,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/italian/readme.md b/layouts/community/ergodox/italian/readme.md
index 215c24a5af..215c24a5af 100644
--- a/keyboards/ergodox/keymaps/italian/readme.md
+++ b/layouts/community/ergodox/italian/readme.md
diff --git a/keyboards/ergodox/keymaps/j3rn/keymap.c b/layouts/community/ergodox/j3rn/keymap.c
index 2069f26ae5..443d839496 100644
--- a/keyboards/ergodox/keymaps/j3rn/keymap.c
+++ b/layouts/community/ergodox/j3rn/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_MINS,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/j3rn/readme.md b/layouts/community/ergodox/j3rn/readme.md
index 178aba7730..178aba7730 100644
--- a/keyboards/ergodox/keymaps/j3rn/readme.md
+++ b/layouts/community/ergodox/j3rn/readme.md
diff --git a/keyboards/ergodox/keymaps/jack/config.h b/layouts/community/ergodox/jack/config.h
index 5c11652264..04bbed611a 100644
--- a/keyboards/ergodox/keymaps/jack/config.h
+++ b/layouts/community/ergodox/jack/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D7
diff --git a/keyboards/ergodox/keymaps/jack/keymap.c b/layouts/community/ergodox/jack/keymap.c
index 9cb80c59d1..6a00ffa293 100644
--- a/keyboards/ergodox/keymaps/jack/keymap.c
+++ b/layouts/community/ergodox/jack/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -8,7 +8,7 @@
 #define MDIA 2 // media keys
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_NO,          KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_NO,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_NO,
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              RGB_MOD,
              M(2), KC_SPC,KC_SPC
     ),
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_TRNS,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS,
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  
diff --git a/keyboards/ergodox/keymaps/jacobono/keymap.c b/layouts/community/ergodox/jacobono/keymap.c
index dc7382bfe8..c0a1c0cdb8 100644
--- a/keyboards/ergodox/keymaps/jacobono/keymap.c
+++ b/layouts/community/ergodox/jacobono/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	// If it accepts an argument (i.e, is a function), it doesn't need KC_.
 	// Otherwise, it needs KC_*
-	[COLEMAK] = KEYMAP(  // layer 0 : Colemak layout default layer
+	[COLEMAK] = LAYOUT_ergodox(  // layer 0 : Colemak layout default layer
 	    // left hand
             KC_TRNS,        KC_1,         KC_2,   KC_3,   KC_4,    KC_5,   KC_LEFT,
             KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,    KC_G,   KC_TRNS,
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 	// If it accepts an argument (i.e, is a function), it doesn't need KC_.
 	// Otherwise, it needs KC_*
-	[QWERTY] = KEYMAP(  // layer 1
+	[QWERTY] = LAYOUT_ergodox(  // layer 1
 	    // left hand
 	    KC_BSPC,           KC_1,         KC_2,   KC_3,   KC_4,    KC_5,   KC_LEFT,
 	    KC_TAB,            KC_Q,         KC_W,   KC_E,   KC_R,    KC_T,   KC_TRNS,
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 *                                 `--------------------'       `--------------------'
 	 */
 	// SYMBOL
-	[SYMB] = KEYMAP(
+	[SYMB] = LAYOUT_ergodox(
 	    // left hand
 	    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
 	    KC_TRNS, KC_TRNS, KC_AT,   KC_ASTR, KC_EQL,  KC_UNDS, KC_TRNS,
@@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 *                                 `--------------------'       `--------------------'
 	 */
 	// Numpad
-	[NUMPAD] = KEYMAP(
+	[NUMPAD] = LAYOUT_ergodox(
 	    // left hand
 	    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 	    KC_TRNS,KC_TRNS,KC_TRNS,KC_UP,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -204,7 +204,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	 *                                 `--------------------'       `--------------------'
 	 */
 	// MEDIA AND MOUSE
-	KEYMAP(
+	LAYOUT_ergodox(
 	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/jacobono/readme.md b/layouts/community/ergodox/jacobono/readme.md
index f977054ef1..f977054ef1 100644
--- a/keyboards/ergodox/keymaps/jacobono/readme.md
+++ b/layouts/community/ergodox/jacobono/readme.md
diff --git a/keyboards/ergodox/keymaps/jafo/jafo-Notes b/layouts/community/ergodox/jafo/jafo-Notes
index 9376125e90..33a67d40d1 100644
--- a/keyboards/ergodox/keymaps/jafo/jafo-Notes
+++ b/layouts/community/ergodox/jafo/jafo-Notes
@@ -2,7 +2,7 @@ These are notes on how to build and deploy the firmware to Ez, but they are
 from before the qmk restructuring.
 
 cd qmk_firmware/keyboard/ergodox_ez
-make KEYMAP=jafo
+make LAYOUT_ergodox=jafo
 cp ergodox_ez.hex keymaps/jafo/
 /tmp/teensy.64bit
 Open hex keymap file
diff --git a/keyboards/ergodox/keymaps/jafo/jafo-layout.pdf b/layouts/community/ergodox/jafo/jafo-layout.pdf
index 760a0eccf6..760a0eccf6 100644
--- a/keyboards/ergodox/keymaps/jafo/jafo-layout.pdf
+++ b/layouts/community/ergodox/jafo/jafo-layout.pdf
diff --git a/keyboards/ergodox/keymaps/jafo/keymap.c b/layouts/community/ergodox/jafo/keymap.c
index 4f1428f2ba..081f18894f 100644
--- a/keyboards/ergodox/keymaps/jafo/keymap.c
+++ b/layouts/community/ergodox/jafo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_EQL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/jafo/readme.md b/layouts/community/ergodox/jafo/readme.md
index 219cb06222..219cb06222 100644
--- a/keyboards/ergodox/keymaps/jafo/readme.md
+++ b/layouts/community/ergodox/jafo/readme.md
diff --git a/keyboards/ergodox/keymaps/jgarr/keymap.c b/layouts/community/ergodox/jgarr/keymap.c
index 42d58421de..359b2e1acf 100644
--- a/keyboards/ergodox/keymaps/jgarr/keymap.c
+++ b/layouts/community/ergodox/jgarr/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   KC_DELT,
         KC_TAB,         KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(1),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/josh/keymap.c b/layouts/community/ergodox/josh/keymap.c
index da887fc64f..5121fabdb0 100644
--- a/keyboards/ergodox/keymaps/josh/keymap.c
+++ b/layouts/community/ergodox/josh/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         LT(MDIA, KC_EQL),KC_1,        KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
         ALT_T(KC_TAB),  KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   ALL_T(KC_NO),
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F11,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/josh/readme.md b/layouts/community/ergodox/josh/readme.md
index cee19d47ea..cee19d47ea 100644
--- a/keyboards/ergodox/keymaps/josh/readme.md
+++ b/layouts/community/ergodox/josh/readme.md
diff --git a/keyboards/ergodox/keymaps/kastyle/keymap.c b/layouts/community/ergodox/kastyle/keymap.c
index 4679966869..923715477b 100644
--- a/keyboards/ergodox/keymaps/kastyle/keymap.c
+++ b/layouts/community/ergodox/kastyle/keymap.c
@@ -1,7 +1,7 @@
 /* Setup to approximate a Kinesis Advantage with an eye to use in a
  * Mac/OSX environment 
  * This version adds a hand swap feature to flip the keyboard */
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
     // left hand
     KC_EQL,          KC_1,         KC_2,          KC_3,    KC_4,    KC_5,   KC_LGUI,
     KC_TAB,          KC_Q,         KC_W,          KC_E,    KC_R,    KC_T,   TG(1),
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_PSCR, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
        KC_SLCK, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
@@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/kastyle/readme.md b/layouts/community/ergodox/kastyle/readme.md
index 944286a818..944286a818 100644
--- a/keyboards/ergodox/keymaps/kastyle/readme.md
+++ b/layouts/community/ergodox/kastyle/readme.md
diff --git a/keyboards/ergodox/keymaps/kines-ish/keymap.c b/layouts/community/ergodox/kines-ish/keymap.c
index 83f5b0e2b4..da39b5278b 100644
--- a/keyboards/ergodox/keymaps/kines-ish/keymap.c
+++ b/layouts/community/ergodox/kines-ish/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,   KC_1,    KC_2,    KC_3,     KC_4,     KC_5,  KC_LEFT,
         KC_TAB,   KC_Q,    KC_W,    KC_E,     KC_R,     KC_T,  TG(SYMB),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_PSCR,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_SLCK,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/kines-ish/readme.md b/layouts/community/ergodox/kines-ish/readme.md
index 5d39a0590d..5d39a0590d 100644
--- a/keyboards/ergodox/keymaps/kines-ish/readme.md
+++ b/layouts/community/ergodox/kines-ish/readme.md
diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c
new file mode 100644
index 0000000000..aeb3112de8
--- /dev/null
+++ b/layouts/community/ergodox/kristian/keymap.c
@@ -0,0 +1,79 @@
+#include QMK_KEYBOARD_H
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+#include "keymap_fr_ch.h"
+#include "keymap_french.h"
+#include "keymap_german.h"
+#include "keymap_german_ch.h"
+#include "keymap_nordic.h"
+#include "keymap_norwegian.h"
+#include "keymap_spanish.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+[0] = LAYOUT_ergodox(NO_LESS,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_APOS),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_AM,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSLH),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_APOS),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_APOS,KC_LALT,KC_LGUI,KC_ENTER),
+
+[1] = LAYOUT_ergodox(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER),
+
+[2] = LAYOUT_ergodox(KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LALT,KC_LGUI,KC_MS_BTN1,KC_MS_BTN2,KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_SPACE,KC_LGUI,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_ESCAPE,KC_MS_WH_UP,KC_MS_WH_DOWN,KC_MS_ACCEL0,KC_MS_ACCEL1),
+
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+  [1] = ACTION_LAYER_TAP_TOGGLE(1)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+      switch(id) {
+        case 0:
+        if (record->event.pressed) {
+          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+        }
+        break;
+      }
+    return MACRO_NONE;
+};
+
+void matrix_scan_user(void) {
+
+    uint8_t layer = biton32(layer_state);
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+        case 1:
+            ergodox_right_led_1_on();
+            break;
+        case 2:
+            ergodox_right_led_2_on();
+            break;
+        case 3:
+            ergodox_right_led_3_on();
+            break;
+        case 4:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            break;
+        case 5:
+            ergodox_right_led_1_on();
+            ergodox_right_led_3_on();
+            break;
+        case 6:
+            ergodox_right_led_2_on();
+            ergodox_right_led_3_on();
+            break;
+        case 7:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            ergodox_right_led_3_on();
+            break;
+        default:
+            break;
+    }
+
+};
diff --git a/layouts/community/ergodox/layout.json b/layouts/community/ergodox/layout.json
new file mode 100644
index 0000000000..5348e91a68
--- /dev/null
+++ b/layouts/community/ergodox/layout.json
@@ -0,0 +1,26 @@
+[{x:3.5,a:7},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"","",{x:4.5},"",""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"",{h:1.5},"",{x:4.5,h:1.5},"",""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"",{x:6.5},""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""],
+[{y:-0.75,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"",{x:6.5},""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.75,x:0.5},"","",{x:14.5},"",""],
+[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""],
+[{h:2},"",{h:2},"",""],
+[{x:2},""],
+[{r:-30,rx:13,y:-1,x:-3},"",""],
+[{x:-3},"",{h:2},"",{h:2},""],
+[{x:-3},""]
diff --git a/keyboards/ergodox/keymaps/maz/keymap.c b/layouts/community/ergodox/maz/keymap.c
index 6378f874be..ad425a726c 100644
--- a/keyboards/ergodox/keymaps/maz/keymap.c
+++ b/layouts/community/ergodox/maz/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // not sure if gui is meta key or super... it says meta on the basic keycodes page, and i think that's consitent with other shit, but you should really figure out how to program the keyboard to have meta and super separately instead of hacking your init.el to recognize alt as meta... because shit will get fucked up beteween awesome and emacs and other shit i'm guessing
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,                 KC_1,             KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,
         KC_TAB,                 KC_Q,             KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[ARRW] = KEYMAP(
+[ARRW] = LAYOUT_ergodox(
        // left hand
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/maz/readme.md b/layouts/community/ergodox/maz/readme.md
index 000a8d0000..000a8d0000 100644
--- a/keyboards/ergodox/keymaps/maz/readme.md
+++ b/layouts/community/ergodox/maz/readme.md
diff --git a/keyboards/ergodox/keymaps/mclennon_osx/README.md b/layouts/community/ergodox/mclennon_osx/README.md
index 28cdb7c108..28cdb7c108 100644
--- a/keyboards/ergodox/keymaps/mclennon_osx/README.md
+++ b/layouts/community/ergodox/mclennon_osx/README.md
diff --git a/keyboards/ergodox/keymaps/mclennon_osx/keymap.c b/layouts/community/ergodox/mclennon_osx/keymap.c
index 627ff01e4a..dd37c5eef7 100644
--- a/keyboards/ergodox/keymaps/mclennon_osx/keymap.c
+++ b/layouts/community/ergodox/mclennon_osx/keymap.c
@@ -1,5 +1,5 @@
 // Media keys work on OSX, but not on Windows.
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
         KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   MO(1),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // AUXILIARY
-[AUXI] = KEYMAP(
+[AUXI] = LAYOUT_ergodox(
        // left hand
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/mpiechotka/keymap.c b/layouts/community/ergodox/mpiechotka/keymap.c
index 67aca4479c..cfd5b195e2 100644
--- a/keyboards/ergodox/keymaps/mpiechotka/keymap.c
+++ b/layouts/community/ergodox/mpiechotka/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_colemak.h"
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 1) End/L1
  * 2) PgDown/L2
  */
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,     KC_2,   KC_3,   KC_4,          KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,     KC_W,   KC_F,   KC_P,          KC_G,   TG(SYMB),
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * 1) End/L1
  * 2) PgDown/L2
  */
-[BASE_CM] = KEYMAP(  // layer 0 : default
+[BASE_CM] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,     KC_2,   KC_3,   KC_4,          KC_5,   KC_LEFT,
         KC_DELT,        CM_Q,     CM_W,   CM_F,   CM_P,          CM_G,   TG(SYMB),
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -173,7 +173,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MACROS
-[MACR] = KEYMAP(
+[MACR] = LAYOUT_ergodox(
        KC_NO,   KC_NO,     KC_NO,        KC_NO,   KC_NO,   KC_NO,   KC_NO,
        KC_NO,   F(DL_BASE),F(DL_BASE_CM),KC_NO,   KC_NO,   KC_NO,   KC_NO,
        KC_NO,   F(PC1),    F(PC2),       F(PC3),  F(PC4),  KC_NO,
diff --git a/keyboards/ergodox/keymaps/mpiechotka/readme.md b/layouts/community/ergodox/mpiechotka/readme.md
index 785400d1d2..785400d1d2 100644
--- a/keyboards/ergodox/keymaps/mpiechotka/readme.md
+++ b/layouts/community/ergodox/mpiechotka/readme.md
diff --git a/keyboards/ergodox/keymaps/msc/keymap.c b/layouts/community/ergodox/msc/keymap.c
index c43aecf6b8..5296263419 100644
--- a/keyboards/ergodox/keymaps/msc/keymap.c
+++ b/layouts/community/ergodox/msc/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/msc/readme.md b/layouts/community/ergodox/msc/readme.md
index ff24d2b685..ff24d2b685 100644
--- a/keyboards/ergodox/keymaps/msc/readme.md
+++ b/layouts/community/ergodox/msc/readme.md
diff --git a/keyboards/ergodox/keymaps/naps62/keymap.c b/layouts/community/ergodox/naps62/keymap.c
index 9064053fc1..481b0dd765 100644
--- a/keyboards/ergodox/keymaps/naps62/keymap.c
+++ b/layouts/community/ergodox/naps62/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
   // left hand
   KC_ESC,     KC_1,    KC_2,     KC_3,     KC_4,               KC_5,  LGUI(KC_SPC),
   KC_TAB,     KC_Q,    KC_W,     KC_E,     KC_R,               KC_T,  MO(2),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
          RESET, KC_TRNS,        KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS,    KC_TRNS,
        KC_TRNS, KC_TRNS,        LGUI(KC_W),  LGUI(KC_E),     KC_BTN1, LGUI(KC_T), KC_TRNS,
        KC_TRNS, LGUI(KC_A),     LGUI(KC_S),  LGUI(KC_D),     KC_MS_D, KC_MS_R,
diff --git a/keyboards/ergodox/keymaps/naps62/readme.md b/layouts/community/ergodox/naps62/readme.md
index 14728e4cc4..14728e4cc4 100644
--- a/keyboards/ergodox/keymaps/naps62/readme.md
+++ b/layouts/community/ergodox/naps62/readme.md
diff --git a/keyboards/ergodox/keymaps/neo2_on_qwertz_hardware/keymap.c b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c
index ab2464c424..3991350337 100644
--- a/keyboards/ergodox/keymaps/neo2_on_qwertz_hardware/keymap.c
+++ b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "keymap_extras/keymap_german.h"
 
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       |ENTER|MO(1)| TAB | !ESC  |MO(1)|SPACE|
                       '-----------------' '-----------------'
  */
-[L0] = KEYMAP(
+[L0] = LAYOUT_ergodox(
  KC_ESC,  DE_1,    DE_2,     DE_3,    DE_4,     DE_5,    DE_ACUT,
  KC_TAB,  DE_X,    DE_V,     DE_L,    DE_C,     DE_W,    KC_PSCR,
  MO(1),   DE_U,    DE_I,     DE_A,    DE_E,     DE_O,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       |     |     |     | !     |     |     |
                       '-----------------' '-----------------'
  */
-[L1] = KEYMAP(
+[L1] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, DE_EURO, DE_UNDS, DE_LBRC, DE_RBRC, KC_TRNS, KC_TRNS,
  KC_TRNS, DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR,
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |  0  |
  *                   '-----------------' '-----------------'
  */
-[L2] = KEYMAP(
+[L2] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PGDN, KC_TRNS,
  KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,
@@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L3] = KEYMAP(
+[L3] = LAYOUT_ergodox(
  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
  KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS,
@@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L4] = KEYMAP(
+[L4] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -224,7 +224,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L5] = KEYMAP(
+[L5] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -262,7 +262,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   |     |     |     | !     |     |     |
  *                   '-----------------' '-----------------'
  */
-[L6] = KEYMAP(
+[L6] = LAYOUT_ergodox(
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/neo2_on_qwertz_hardware/keymap.md b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.md
index d9fcda9661..d9fcda9661 100644
--- a/keyboards/ergodox/keymaps/neo2_on_qwertz_hardware/keymap.md
+++ b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.md
diff --git a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/keymap.c b/layouts/community/ergodox/norwegian_programmer_osx_pc/keymap.c
index 1d505f8e38..afadf13ff6 100644
--- a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/keymap.c
+++ b/layouts/community/ergodox/norwegian_programmer_osx_pc/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_norwegian.h"
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |GUI/, |       | Bspc |       |      |
  *                                 `--------------------'       `---------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_PAST,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, KC_FN2,  TG(1),
         KC_PPLS,         KC_Q,         KC_W,    KC_E,   KC_R,   KC_T,   NO_QUO2,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |crtl/,|       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[BASE_MAC] = KEYMAP(
+[BASE_MAC] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS,KC_TRNS, NO_LCBR_MAC,NO_RCBR_MAC, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUMB_FUNC] = KEYMAP(
+[NUMB_FUNC] = LAYOUT_ergodox(
        NO_ASTR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        NO_PLUS, KC_8, KC_7,KC_6,KC_5, KC_9 , KC_TRNS,
        NO_SLSH , KC_4   , KC_3   , KC_2   , KC_1   , KC_0,
diff --git a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/readme.md b/layouts/community/ergodox/norwegian_programmer_osx_pc/readme.md
index 444f2e9207..444f2e9207 100644
--- a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/readme.md
+++ b/layouts/community/ergodox/norwegian_programmer_osx_pc/readme.md
diff --git a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/keymap.c b/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/keymap.c
index acf74a47d2..10b7df642b 100644
--- a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/keymap.c
+++ b/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_norwegian.h"
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |GUI/, |       | Bspc |       |      |
  *                                 `--------------------'       `---------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
         // left hand
         KC_PAST,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, KC_FN2,  TG(1),
         KC_PPLS,         KC_Q,         KC_W,    KC_F,   KC_P,   KC_G,   NO_QUO2,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |crtl/,|       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[BASE_MAC] = KEYMAP(
+[BASE_MAC] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS,KC_TRNS, NO_LCBR_MAC,NO_RCBR_MAC, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[NUMB_FUNC] = KEYMAP(
+[NUMB_FUNC] = LAYOUT_ergodox(
        NO_ASTR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        NO_PLUS, KC_8, KC_7,KC_6,KC_5, KC_9 , KC_TRNS,
        NO_SLSH , KC_4   , KC_3   , KC_2   , KC_1   , KC_0,
diff --git a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/readme.md b/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/readme.md
index ad568ecd41..ad568ecd41 100644
--- a/keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/readme.md
+++ b/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/readme.md
diff --git a/keyboards/ergodox/keymaps/ordinary/keymap.c b/layouts/community/ergodox/ordinary/keymap.c
index ac84df5701..86ab864910 100644
--- a/keyboards/ergodox/keymaps/ordinary/keymap.c
+++ b/layouts/community/ergodox/ordinary/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "led.h"
 #include "mousekey.h"
 #include "debug.h"
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                   |      |      | PgDn |       | Down |      |      |
  *                                   `--------------------'       `--------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
 // left hand
  F(LSpec)  ,KC_1           ,KC_2   ,KC_3   ,KC_4  ,KC_5  ,KC_ESC
 ,F(LMdia)  ,KC_Q           ,KC_W   ,KC_E   ,KC_R  ,KC_T  ,KC_LBRC
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |  +   |   =  |  !=  |       |  ->  |  _   |  -   |
  *                                  `--------------------'       `--------------------'
  */
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_F1       ,KC_F2        ,KC_F3   ,KC_F4   ,KC_F5   ,KC_ESC
 ,KC_TRNS ,KC_EXLM     ,KC_AT        ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM)
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                            |      |      | Home |    |VolDn |      | Pause|
  *                                            `--------------------'    `--------------------'
  */
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_F11   ,KC_F12  ,KC_F13   ,KC_F14  ,KC_F15  ,KC_ESC
 ,KC_TRNS ,KC_POWER ,M(MUL)  ,KC_MS_U  ,M(MUR)  ,KC_VOLU ,KC_WH_U
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      |      |     |      |      |      |
  *                                  `--------------------'     `--------------------'
  */
-[SPEC] = KEYMAP(
+[SPEC] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
@@ -235,7 +235,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | Down |       | PgDn |      |      |
  *                                  `--------------------'       `--------------------'
  */
-[RBASE] = KEYMAP(
+[RBASE] = LAYOUT_ergodox(
 // left hand
  KC_EQL    ,KC_0        ,KC_9   ,KC_8   ,KC_7  ,KC_6  ,KC_MINS
 ,KC_BSLS   ,KC_P        ,KC_O   ,KC_I   ,KC_U  ,KC_Y  ,KC_RBRC
diff --git a/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt b/layouts/community/ergodox/ordinary/ordinary-base.txt
index 4fc11faf94..4fc11faf94 100644
--- a/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
+++ b/layouts/community/ergodox/ordinary/ordinary-base.txt
diff --git a/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt b/layouts/community/ergodox/ordinary/ordinary-media.txt
index 67b7840b52..67b7840b52 100644
--- a/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
+++ b/layouts/community/ergodox/ordinary/ordinary-media.txt
diff --git a/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt b/layouts/community/ergodox/ordinary/ordinary-special.txt
index 97f40f9dbc..97f40f9dbc 100644
--- a/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
+++ b/layouts/community/ergodox/ordinary/ordinary-special.txt
diff --git a/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt b/layouts/community/ergodox/ordinary/ordinary-symbol.txt
index 65eca9d6a5..65eca9d6a5 100644
--- a/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
+++ b/layouts/community/ergodox/ordinary/ordinary-symbol.txt
diff --git a/keyboards/ergodox/keymaps/ordinary/readme.md b/layouts/community/ergodox/ordinary/readme.md
index 2e8d86960f..2e8d86960f 100644
--- a/keyboards/ergodox/keymaps/ordinary/readme.md
+++ b/layouts/community/ergodox/ordinary/readme.md
diff --git a/keyboards/ergodox/keymaps/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c
index e3b9e11f47..a9a27a8d43 100644
--- a/keyboards/ergodox/keymaps/osx_de/keymap.c
+++ b/layouts/community/ergodox/osx_de/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german_osx.h"
@@ -29,7 +29,7 @@
 
 //Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE]=KEYMAP(
+[BASE]=LAYOUT_ergodox(
 //left half
     KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(M_CTL_SFT_HASH), 
     KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI, 
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     TG(NUMB), ALL_T(DE_OSX_ACUT), 
     KC_PGUP, 
     KC_PGDN, KC_ENT, KC_SPC),
-[SYMB]=KEYMAP(
+[SYMB]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 
     KC_TRNS, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, DE_OSX_QST, KC_TRNS, KC_TRNS, 
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F13, KC_F12, 
     KC_F14, 
     KC_F15, KC_TRNS, KC_TRNS),
-[MDIA]=KEYMAP(
+[MDIA]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, 
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, 
     KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_WBAK),
-[SMLY]=KEYMAP(
+[SMLY]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, 
     KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS),
-[NUMB]=KEYMAP(
+[NUMB]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, 
     KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS),
-[EGOS]=KEYMAP(
+[EGOS]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png.md b/layouts/community/ergodox/osx_de/osx_de_highres.png.md
index ee3dc53505..ee3dc53505 100644
--- a/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png.md
+++ b/layouts/community/ergodox/osx_de/osx_de_highres.png.md
diff --git a/keyboards/ergodox/keymaps/osx_de/readme.md b/layouts/community/ergodox/osx_de/readme.md
index 5011a9dd62..5011a9dd62 100644
--- a/keyboards/ergodox/keymaps/osx_de/readme.md
+++ b/layouts/community/ergodox/osx_de/readme.md
diff --git a/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
index 6c4312a32e..9d2e117bc1 100644
--- a/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
+++ b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -25,7 +25,7 @@
 
 //Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE]=KEYMAP(
+[BASE]=LAYOUT_ergodox(
 //left half
     KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL, 
     KC_TAB, KC_K, KC_DOT, KC_O, KC_COMM, KC_Z, KC_LGUI, 
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ALL_T(DE_ACUT), TG(NUMB), 
     KC_PGUP, 
     KC_PGDN, KC_ENT, KC_SPC),
-[SYMB]=KEYMAP(
+[SYMB]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 
     KC_TRNS, KC_GRV, LSFT(KC_GRV), DE_EXLM, DE_QST, KC_TRNS, KC_TRNS, 
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, 
     KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS),
-[MDIA]=KEYMAP(
+[MDIA]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, 
     KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_WBAK),
-[QWERTZ]=KEYMAP(
+[QWERTZ]=LAYOUT_ergodox(
 //left half
     KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LGUI(KC_V), 
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI, 
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ALL_T(DE_ACUT), KC_TRNS, 
     KC_PGUP, 
     KC_PGDN, KC_ENT, KC_SPC),
-[NUMB]=KEYMAP(
+[NUMB]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png.md b/layouts/community/ergodox/osx_de_adnw_koy/osx_de_adnw_koy_highres.png.md
index 4d4b777e08..4d4b777e08 100644
--- a/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png.md
+++ b/layouts/community/ergodox/osx_de_adnw_koy/osx_de_adnw_koy_highres.png.md
diff --git a/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c
index 61b6a4fdb3..15c700a783 100644
--- a/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
+++ b/layouts/community/ergodox/osx_de_experimental/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_neo2.h"
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                                                                                                                                                                                                                                                                                                                                      
 * 
 **/
-[BASE]=KEYMAP(
+[BASE]=LAYOUT_ergodox(
 //left half
     KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(TGH_NUM), 
     KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI, 
@@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                                                                                                                                                                                                      
 * 
 **/
-[SYMB]=KEYMAP(
+[SYMB]=LAYOUT_ergodox(
 //left half
     KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, 
     KC_TRNS, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, DE_OSX_QST, KC_TRNS, KC_TRNS, 
@@ -201,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                                                                                                      
 * 
 **/
-[MDIA]=KEYMAP(
+[MDIA]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, 
@@ -253,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                                                                                                                                                      
 * 
 **/
-[SMLY]=KEYMAP(
+[SMLY]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -305,7 +305,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                                                                                      
 * 
 **/
-[NUMB]=KEYMAP(
+[NUMB]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, 
@@ -357,7 +357,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                                                                                                                                                      
 * 
 **/
-[EGOS]=KEYMAP(
+[EGOS]=LAYOUT_ergodox(
 //left half
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
diff --git a/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png.md b/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
index 1fca8a5bb5..1fca8a5bb5 100644
--- a/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png.md
+++ b/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
diff --git a/keyboards/ergodox/keymaps/osx_de_experimental/readme.md b/layouts/community/ergodox/osx_de_experimental/readme.md
index e6a1018416..e6a1018416 100644
--- a/keyboards/ergodox/keymaps/osx_de_experimental/readme.md
+++ b/layouts/community/ergodox/osx_de_experimental/readme.md
diff --git a/keyboards/ergodox/keymaps/osx_fr/keymap.c b/layouts/community/ergodox/osx_fr/keymap.c
index 7dee284fae..f899b8b0f1 100644
--- a/keyboards/ergodox/keymaps/osx_fr/keymap.c
+++ b/layouts/community/ergodox/osx_fr/keymap.c
@@ -1,5 +1,5 @@
 // French AZERTY version of the default_osx file
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_french_osx.h"
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         FR_MINS,          FR_AMP,      FR_EACU,       FR_QUOT, FR_APOS, FR_LPRN, KC_LEFT,
         KC_DELT,          FR_A,        FR_Z,          KC_E,    KC_R,    KC_T,    TG(1),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,FR_EXLM,FR_AT,  FR_LCBR,FR_RCBR,FR_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
index 11281df8ab..59ffe4f3ff 100644
--- a/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
+++ b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
@@ -5,7 +5,7 @@
 // Only default layer was remapped all others layers are standard Ergodox EZ
 // Very personal mapping of-course, but who knows a starting point for others.
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_CAPSLOCK,    KC_1,           KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_TAB,         KC_Q,           KC_W,   KC_E,   KC_R,   KC_T,   TG(1),
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/osx_whiskey_tango_foxtrot_capslock/keymap.c b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
index 98d2836ab2..dcf2dc1d85 100644
--- a/keyboards/ergodox/keymaps/osx_whiskey_tango_foxtrot_capslock/keymap.c
+++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
@@ -3,7 +3,7 @@
  * Fake it till you make it!
  */
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "timer.h"
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `----------------------'
  */
 
-    [BASE] = KEYMAP(  // layer 0 : default
+    [BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,     KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,
         KC_TAB,     M(KC_Q),  M(KC_W), M(KC_E), M(KC_R), M(KC_T), KC_LBRC,
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-    [SYMB] = KEYMAP(
+    [SYMB] = LAYOUT_ergodox(
        // left hand
        KC_GRV ,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
     // MEDIA AND TENKEY
-    [MDIA] = KEYMAP(
+    [MDIA] = LAYOUT_ergodox(
        KC_NO,   KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_F14,  KC_F15,
        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
diff --git a/keyboards/ergodox/keymaps/osx_whiskey_tango_foxtrot_capslock/readme.md b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/readme.md
index 42cb195760..42cb195760 100644
--- a/keyboards/ergodox/keymaps/osx_whiskey_tango_foxtrot_capslock/readme.md
+++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/readme.md
diff --git a/keyboards/ergodox/keymaps/phoenix/keymap.c b/layouts/community/ergodox/phoenix/keymap.c
index 624817d474..7ebdeaeb83 100644
--- a/keyboards/ergodox/keymaps/phoenix/keymap.c
+++ b/layouts/community/ergodox/phoenix/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_MINS),
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_F11, KC_F12, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/phoenix/readme.md b/layouts/community/ergodox/phoenix/readme.md
index b1053bfb78..b1053bfb78 100644
--- a/keyboards/ergodox/keymaps/phoenix/readme.md
+++ b/layouts/community/ergodox/phoenix/readme.md
diff --git a/keyboards/ergodox/keymaps/plover/keymap.c b/layouts/community/ergodox/plover/keymap.c
index 12b3aa212f..d3e3547299 100644
--- a/keyboards/ergodox/keymaps/plover/keymap.c
+++ b/layouts/community/ergodox/plover/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LGUI,
         KC_TAB,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(1),
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -157,7 +157,7 @@ KEYMAP(
  *                                 `--------------------'       `--------------------'
  */
 
-[PLVR] = KEYMAP(  // layout: layer 4: Steno for Plover
+[PLVR] = LAYOUT_ergodox(  // layout: layer 4: Steno for Plover
         // left hand
         KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
         KC_NO,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/plums/keymap.c b/layouts/community/ergodox/plums/keymap.c
index 2853455e3d..c75ce0f977 100644
--- a/keyboards/ergodox/keymaps/plums/keymap.c
+++ b/layouts/community/ergodox/plums/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,           KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_F5,
         KC_TAB,           KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/plums/readme.md b/layouts/community/ergodox/plums/readme.md
index 32930e0d60..32930e0d60 100644
--- a/keyboards/ergodox/keymaps/plums/readme.md
+++ b/layouts/community/ergodox/plums/readme.md
diff --git a/keyboards/ergodox/keymaps/pvinis/Changelog.md b/layouts/community/ergodox/pvinis/Changelog.md
index e5816200b8..e5816200b8 100644
--- a/keyboards/ergodox/keymaps/pvinis/Changelog.md
+++ b/layouts/community/ergodox/pvinis/Changelog.md
diff --git a/keyboards/ergodox/keymaps/pvinis/Readme.md b/layouts/community/ergodox/pvinis/Readme.md
index af27210541..af27210541 100644
--- a/keyboards/ergodox/keymaps/pvinis/Readme.md
+++ b/layouts/community/ergodox/pvinis/Readme.md
diff --git a/keyboards/ergodox/keymaps/pvinis/keymap.c b/layouts/community/ergodox/pvinis/keymap.c
index 3c49118842..1bca0398dc 100644
--- a/keyboards/ergodox/keymaps/pvinis/keymap.c
+++ b/layouts/community/ergodox/pvinis/keymap.c
@@ -1,6 +1,6 @@
 // pvinis' ergodox keymap
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "mousekey.h"
 
 // easier name for left ctrl-alt-gui
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |SYSCTL|       |Msngr |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
  TD(TD_FLSH)    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO          ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO          ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[BEGIN] = KEYMAP(
+[BEGIN] = LAYOUT_ergodox(
  KC_TRNS          ,KC_1    ,KC_2     ,KC_3     ,KC_4      ,KC_5    ,KC_LALT
 ,KC_TAB           ,KC_Q    ,KC_W     ,KC_E     ,KC_R      ,KC_T    ,KC_LBRC
 ,CTL_T(KC_ESC)    ,KC_A    ,KC_S     ,KC_D     ,KC_F      ,KC_G
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[QWERTY] = KEYMAP(
+[QWERTY] = LAYOUT_ergodox(
  KC_TRNS    ,KC_1     ,KC_2     ,KC_3     ,KC_4     ,KC_5    ,KC_TRNS
 ,KC_TRNS    ,KC_Q     ,KC_W     ,KC_E     ,KC_R     ,KC_T    ,KC_TRNS
 ,KC_TRNS    ,KC_A     ,KC_S     ,KC_D     ,KC_F     ,KC_G
@@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[CARPALX] = KEYMAP(
+[CARPALX] = LAYOUT_ergodox(
  KC_TRNS    ,KC_1     ,KC_2     ,KC_3     ,KC_4     ,KC_5    ,KC_TRNS
 ,KC_TRNS    ,KC_Q     ,KC_G     ,KC_M     ,KC_L     ,KC_W    ,KC_TRNS
 ,KC_TRNS    ,KC_D     ,KC_S     ,KC_T     ,KC_N     ,KC_R
@@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |  ^   |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[SYSCTL] = KEYMAP(
+[SYSCTL] = LAYOUT_ergodox(
  KC_TRNS    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO
@@ -275,7 +275,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |  ^   |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[MOUSE] = KEYMAP(
+[MOUSE] = LAYOUT_ergodox(
  KC_TRNS    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO
@@ -320,7 +320,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `----------------------'
  */
 /*
-[TEMPLATE] = KEYMAP(
+[TEMPLATE] = LAYOUT_ergodox(
  KC_TRNS    ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ,KC_TRNS    ,KC_TRNS
 ,KC_TRNS    ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ,KC_TRNS    ,KC_TRNS
 ,KC_TRNS    ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ,KC_TRNS
@@ -341,7 +341,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       ,KC_TRNS
       ,KC_TRNS  ,KC_TRNS  ,KC_TRNS
 ),
-[TEMPLATE] = KEYMAP(
+[TEMPLATE] = LAYOUT_ergodox(
  KC_NO    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO
 ,KC_NO    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO
diff --git a/keyboards/ergodox/keymaps/pvinis/Makefile b/layouts/community/ergodox/pvinis/rules.mk
index 7ceb51ce4c..87cbd93c2b 100644
--- a/keyboards/ergodox/keymaps/pvinis/Makefile
+++ b/layouts/community/ergodox/pvinis/rules.mk
@@ -4,6 +4,4 @@ SLEEP_LED_ENABLE = no  # no led blinking while sleeping
 NKRO_ENABLE = yes      # disable for windows
 TAP_DANCE_ENABLE = yes # tap-tap-tap
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/layouts/community/ergodox/readme.md b/layouts/community/ergodox/readme.md
new file mode 100644
index 0000000000..ddbe1933c2
--- /dev/null
+++ b/layouts/community/ergodox/readme.md
@@ -0,0 +1,3 @@
+# ergodox
+
+    LAYOUT_ergodox
\ No newline at end of file
diff --git a/keyboards/ergodox/keymaps/replicaJunction/config.h b/layouts/community/ergodox/replicaJunction/config.h
index df349a72dc..c69ce8cea9 100644
--- a/keyboards/ergodox/keymaps/replicaJunction/config.h
+++ b/layouts/community/ergodox/replicaJunction/config.h
@@ -18,6 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KEYBOARDS_ERGODOX_CONFIG_H_
 #define KEYBOARDS_ERGODOX_CONFIG_H_
 
+#include QMK_KEYBOARD_CONFIG_H
+
+
+#undef MOUSEKEY_DELAY          
+#undef MOUSEKEY_INTERVAL       
+#undef MOUSEKEY_MAX_SPEED      
+#undef MOUSEKEY_TIME_TO_MAX    
+
 #define MOUSEKEY_DELAY          100
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_MAX_SPEED      3
@@ -52,15 +60,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
 
-#ifdef SUBPROJECT_ez
-    #include "ez/config.h"
-#endif
-#ifdef SUBPROJECT_infinity
-    #include "infinity/config.h"
-#endif
-#ifdef SUBPROJECT_ergodone
-    #include "ergodone/config.h"
-#endif
-
 
 #endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
diff --git a/keyboards/ergodox/keymaps/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index c9213553c1..fc80059276 100644
--- a/keyboards/ergodox/keymaps/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -16,7 +16,7 @@
  * here: https://colemakmods.github.io/mod-dh/
  */
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 |      |      | _NU  |       | Down |      |      |
      *                                 `--------------------'       `--------------------'
      */
-[_CO] = KEYMAP(
+[_CO] = LAYOUT_ergodox(
         // left hand
         KC_GRV, KC_1,   KC_2,      KC_3,            KC_4,   KC_5,   KC_ESC,
         KC_LCTL,KC_Q,   KC_W,      KC_F,            KC_P,   KC_B,   KC_HOME,
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 |      |      | _NU  |       | Down |      |      |
      *                                 `--------------------'       `--------------------'
      */
-[_QW] = KEYMAP(  // Layer1: QWERTY
+[_QW] = LAYOUT_ergodox(  // Layer1: QWERTY
         // left hand
         KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
         KC_LCTL,KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_HOME,
@@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 |      |      |      |       |      |      |      |
      *                                 `--------------------'       `--------------------'
      */
-[_NU] = KEYMAP(
+[_NU] = LAYOUT_ergodox(
         // left hand
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,
         _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR, _______,
@@ -209,7 +209,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * Ctrl+` is a keyboard shortcut for the program ConEmu, which provides a Quake-style drop-down command prompt.
      *
      */
-[_EX] = KEYMAP(
+[_EX] = LAYOUT_ergodox(
         // left hand
         _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_MUTE,
         _______, _______, _______, _______, _______, KCX_CGR, KC_VOLU,
@@ -256,7 +256,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *                                 |      |      |      |       |      |      |      |
      *                                 `--------------------'       `--------------------'
      */
-[_GA] = KEYMAP(
+[_GA] = LAYOUT_ergodox(
         // left hand
         _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ergodox/keymaps/replicaJunction/readme.md b/layouts/community/ergodox/replicaJunction/readme.md
index 8c4c03353a..8c4c03353a 100644
--- a/keyboards/ergodox/keymaps/replicaJunction/readme.md
+++ b/layouts/community/ergodox/replicaJunction/readme.md
diff --git a/keyboards/ergodox/keymaps/reset_eeprom/keymap.c b/layouts/community/ergodox/reset_eeprom/keymap.c
index 8d68976585..c960af9cb9 100644
--- a/keyboards/ergodox/keymaps/reset_eeprom/keymap.c
+++ b/layouts/community/ergodox/reset_eeprom/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         EPRM,         EPRM,         EPRM,   EPRM,   EPRM,   EPRM,   EPRM,
         EPRM,        EPRM,         EPRM,   EPRM,   EPRM,   EPRM,   EPRM,
diff --git a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c b/layouts/community/ergodox/robot_test_layout/keymap.c
index e9e2597d7e..5d672deeb9 100644
--- a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c
+++ b/layouts/community/ergodox/robot_test_layout/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -17,7 +17,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = KEYMAP(
+[0] = LAYOUT_ergodox(
         RGB_TOGGLE, RGB_FF0000, RGB_00FF00, RGB_0000FF, RGB_FFFFFF, KC_5, KC_LPRN,
         KC_GRAVE,   KC_A,       KC_B,       KC_C,       KC_D,       KC_E, KC_EXLM,
         KC_HASH,    KC_J,       KC_K,       KC_L,       KC_M,       KC_N,
diff --git a/keyboards/ergodox/keymaps/robot_test_layout/readme.md b/layouts/community/ergodox/robot_test_layout/readme.md
index 45dc2aa76c..45dc2aa76c 100644
--- a/keyboards/ergodox/keymaps/robot_test_layout/readme.md
+++ b/layouts/community/ergodox/robot_test_layout/readme.md
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
index 2c64304404..e024d5fb95 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
@@ -1,11 +1,11 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
 #define BASE 0
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = KEYMAP(
+  [BASE] = LAYOUT_ergodox(
     KC_GRV,   KC_1,    KC_2,  KC_3,    KC_4,    KC_5,    KC_F5,
     KC_TAB,   KC_Q,    KC_W,  KC_D,    KC_F,    KC_K,    KC_BSLS,
     KC_LCTRL, KC_A,    KC_S,  KC_E,    KC_T,    KC_G,
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md b/layouts/community/ergodox/romanzolotarev-norman-osx/readme.md
index 637f9cba2c..5e7d0ebb1e 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
+++ b/layouts/community/ergodox/romanzolotarev-norman-osx/readme.md
@@ -37,5 +37,5 @@ Then you can clone this repository, make and flash your ErgoDox.
 git clone https://github.com/romanzolotarev/qmk_firmware
 cd qmk_firmware/keyboards/ergodox
 # Optionally tweak ./keymaps/romanzolotarev-norman-osx/keymap.c
-SLEEP_LED_ENABLED=no KEYMAP=romanzolotarev-norman-osx make teensy
+SLEEP_LED_ENABLED=no LAYOUT_ergodox=romanzolotarev-norman-osx make teensy
 ```
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/keymap.c
index 9f41e51899..1dd956bdad 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -8,7 +8,7 @@
 #define ARRW 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = KEYMAP(
+  [BASE] = LAYOUT_ergodox(
     KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F14,
     KC_TAB,        KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    TG(PLVR),
     CTL_T(KC_ESC), KC_A,    KC_S,    KC_E,    KC_T,    KC_G,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MPRV,
     KC_FN3,        KC_QUOT, KC_SPC
   ),
-  [SYMB] = KEYMAP(
+  [SYMB] = LAYOUT_ergodox(
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
     KC_TRNS,       KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS
   ),
-  [PLVR] = KEYMAP(
+  [PLVR] = LAYOUT_ergodox(
     KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
     KC_NO,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
     KC_NO,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,
     KC_NO,         KC_N,    KC_M
   ),
-  [ARRW] = KEYMAP(
+  [ARRW] = LAYOUT_ergodox(
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R,
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md b/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/readme.md
index 577d5749cd..577d5749cd 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
+++ b/layouts/community/ergodox/romanzolotarev-norman-plover-osx-hjkl/readme.md
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-plover-osx/keymap.c
index 563e24872d..f8ae8a51d1 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-plover-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -8,7 +8,7 @@
 #define ARRW 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = KEYMAP(
+  [BASE] = LAYOUT_ergodox(
     KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F14,
     KC_TAB,        KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    TG(PLVR),
     CTL_T(KC_ESC), KC_A,    KC_S,    KC_E,    KC_T,    KC_G,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MPRV,
     KC_FN3,        KC_QUOT, KC_SPC
   ),
-  [SYMB] = KEYMAP(
+  [SYMB] = LAYOUT_ergodox(
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
     KC_TRNS,       KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS
   ),
-  [PLVR] = KEYMAP(
+  [PLVR] = LAYOUT_ergodox(
     KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
     KC_NO,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
     KC_NO,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,
     KC_NO,         KC_N,    KC_M
   ),
-  [ARRW] = KEYMAP(
+  [ARRW] = LAYOUT_ergodox(
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md b/layouts/community/ergodox/romanzolotarev-norman-plover-osx/readme.md
index 6703bb8bc7..6703bb8bc7 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
+++ b/layouts/community/ergodox/romanzolotarev-norman-plover-osx/readme.md
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/keymap.c
index 5569f5c74e..d0b7520c31 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -6,7 +6,7 @@
 #define QWRT 1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = KEYMAP(
+  [BASE] = LAYOUT_ergodox(
     KC_GRV,  KC_1,     KC_2,  KC_3,    KC_4,    KC_5,    KC_F5,
     KC_TAB,  KC_Q,     KC_W,  KC_D,    KC_F,    KC_K,    KC_BSLS,
     KC_LCTL, KC_A,     KC_S,  KC_E,    KC_T,    KC_G,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MPRV,
     KC_RALT, KC_QUOT,  KC_SPC
   ),
-  [QWRT] = KEYMAP(
+  [QWRT] = LAYOUT_ergodox(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_E,    KC_R,    KC_T,    KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_D,    KC_F,    KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md b/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/readme.md
index 41859f1ad2..41859f1ad2 100644
--- a/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
+++ b/layouts/community/ergodox/romanzolotarev-norman-qwerty-osx/readme.md
diff --git a/keyboards/ergodox/keymaps/sethbc/keymap.c b/layouts/community/ergodox/sethbc/keymap.c
index 8816ad63bb..7f142a9760 100644
--- a/keyboards/ergodox/keymaps/sethbc/keymap.c
+++ b/layouts/community/ergodox/sethbc/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 
 #define BASE 0 // default layer
@@ -6,7 +6,7 @@
 #define FN2 2 // media keys
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_ESC,
         KC_BSLS, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    MO(FN2),
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_PGDN, KC_ENT, KC_SPC
     ),
 // FN1
-[FN1] = KEYMAP(
+[FN1] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,   KC_F1,  KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F11,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
 // FN2
-[FN2] = KEYMAP(
+[FN2] = LAYOUT_ergodox(
        RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/sethbc/readme.md b/layouts/community/ergodox/sethbc/readme.md
index 57b5d0ec7c..57b5d0ec7c 100644
--- a/keyboards/ergodox/keymaps/sethbc/readme.md
+++ b/layouts/community/ergodox/sethbc/readme.md
diff --git a/layouts/community/ergodox/sethbc/rules.mk b/layouts/community/ergodox/sethbc/rules.mk
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/layouts/community/ergodox/sethbc/rules.mk
@@ -0,0 +1 @@
+
diff --git a/keyboards/ergodox/keymaps/siroken3/default.png.md b/layouts/community/ergodox/siroken3/default.png.md
index 440b424d0e..440b424d0e 100644
--- a/keyboards/ergodox/keymaps/siroken3/default.png.md
+++ b/layouts/community/ergodox/siroken3/default.png.md
diff --git a/keyboards/ergodox/keymaps/siroken3/default_highres.png.md b/layouts/community/ergodox/siroken3/default_highres.png.md
index 22453303d3..22453303d3 100644
--- a/keyboards/ergodox/keymaps/siroken3/default_highres.png.md
+++ b/layouts/community/ergodox/siroken3/default_highres.png.md
diff --git a/keyboards/ergodox/keymaps/siroken3/keymap.c b/layouts/community/ergodox/siroken3/keymap.c
index 258f122b48..e8e1223873 100644
--- a/keyboards/ergodox/keymaps/siroken3/keymap.c
+++ b/layouts/community/ergodox/siroken3/keymap.c
@@ -1,7 +1,7 @@
 // Netable differences vs. the default firmware for the ErgoDox EZ:
 // 1. The Cmd key is now on the right side, making Cmd+Space easier.
 // 2. The media keys work on OSX (But not on Windows).
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/siroken3/readme.md b/layouts/community/ergodox/siroken3/readme.md
index ed085ebfd5..ed085ebfd5 100644
--- a/keyboards/ergodox/keymaps/siroken3/readme.md
+++ b/layouts/community/ergodox/siroken3/readme.md
diff --git a/keyboards/ergodox/keymaps/sneako/keymap.c b/layouts/community/ergodox/sneako/keymap.c
index 08cadd6852..98f3469fce 100644
--- a/keyboards/ergodox/keymaps/sneako/keymap.c
+++ b/layouts/community/ergodox/sneako/keymap.c
@@ -1,7 +1,7 @@
 // Based on `default_osx`
 // Replace left Bksp with Ctrl/Esc
 // Remove the Ctrl from Z and /
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(1),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/sneako/readme.md b/layouts/community/ergodox/sneako/readme.md
index 8dd110ee68..8dd110ee68 100644
--- a/keyboards/ergodox/keymaps/sneako/readme.md
+++ b/layouts/community/ergodox/sneako/readme.md
diff --git a/keyboards/ergodox/keymaps/software_neo2/keymap.c b/layouts/community/ergodox/software_neo2/keymap.c
index 571ca062cd..925caa0161 100644
--- a/keyboards/ergodox/keymaps/software_neo2/keymap.c
+++ b/layouts/community/ergodox/software_neo2/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "led.h"
 #include "action_layer.h"
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_DELT,         NEO_1,         NEO_2,         NEO_3,         NEO_4,   NEO_5,   KC_MPLY,
         KC_TAB,          NEO_X,         NEO_V,         NEO_L,         NEO_C,   NEO_W,   KC_ESC,
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_TRNS,
        KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
diff --git a/keyboards/ergodox/keymaps/supercoder/config.h b/layouts/community/ergodox/supercoder/config.h
index 2de3599f87..8c191a87c5 100644
--- a/keyboards/ergodox/keymaps/supercoder/config.h
+++ b/layouts/community/ergodox/supercoder/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H 1
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ergodox/keymaps/supercoder/keymap.c b/layouts/community/ergodox/supercoder/keymap.c
index 775acf2c96..a42937bd6b 100644
--- a/keyboards/ergodox/keymaps/supercoder/keymap.c
+++ b/layouts/community/ergodox/supercoder/keymap.c
@@ -2,7 +2,7 @@
  * SuperCoder 2000 layout
  */
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 
 /* Layers */
 
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                  |      |      | DONE |           | DONE |      |      |
    *                                  `--------------------'           `--------------------'
    */
-[SC2K] = KEYMAP(
+[SC2K] = LAYOUT_ergodox(
  // left hand
  KC_0    ,KC_0    ,KC_0    ,KC_0    ,KC_0    ,KC_0    ,KC_0
 ,KC_0    ,KC_0    ,KC_0    ,KC_0    ,KC_0    ,KC_0    ,KC_0
diff --git a/keyboards/ergodox/keymaps/supercoder/makefile.mk b/layouts/community/ergodox/supercoder/makefile.mk
index 41a195d9c0..41a195d9c0 100644
--- a/keyboards/ergodox/keymaps/supercoder/makefile.mk
+++ b/layouts/community/ergodox/supercoder/makefile.mk
diff --git a/keyboards/ergodox/keymaps/supercoder/readme.md b/layouts/community/ergodox/supercoder/readme.md
index e1aa0b00a8..7f2c9ef695 100644
--- a/keyboards/ergodox/keymaps/supercoder/readme.md
+++ b/layouts/community/ergodox/supercoder/readme.md
@@ -25,5 +25,5 @@ your own:
 $ git clone https://github.com/qmk/qmk_firmware.git
 $ cd qmk_firmware/keyboards/ergodox
 $ git clone https://github.com/algernon/ergodox-supercoder.git keymaps/supercoder
-$ make KEYMAP=supercoder
+$ make LAYOUT_ergodox=supercoder
 ```
diff --git a/keyboards/ergodox/keymaps/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index 9f3e82184d..e977ab9948 100644
--- a/keyboards/ergodox/keymaps/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_swedish.h"
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `---------------------'
  */
 
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
     // left hand
     KC_PSCR,         KC_1,     KC_2,     KC_3,    KC_4,    KC_5,   KC_F11,
     KC_TAB,          KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,   MO(SYMB),
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_TRNS, KC_TRNS,
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/swedish-lindhe/readme.md b/layouts/community/ergodox/swedish-lindhe/readme.md
index ef62d9499c..ef62d9499c 100644
--- a/keyboards/ergodox/keymaps/swedish-lindhe/readme.md
+++ b/layouts/community/ergodox/swedish-lindhe/readme.md
diff --git a/keyboards/ergodox/keymaps/swedish/keymap.c b/layouts/community/ergodox/swedish/keymap.c
index c110538e6f..d2b9b40d1f 100644
--- a/keyboards/ergodox/keymaps/swedish/keymap.c
+++ b/layouts/community/ergodox/swedish/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
     // left hand
     NO_HALF,          KC_1,           KC_2,          KC_3,    KC_4,    KC_5,   KC_LEFT,
     KC_DELT,          KC_Q,           KC_W,          KC_E,    KC_R,    KC_T,   TG(SYMB),
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,NO_AT,  NO_LCBR,NO_RCBR,NO_PIPE,KC_TRNS,
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/swedish/readme.md b/layouts/community/ergodox/swedish/readme.md
index b5b859bce6..b5b859bce6 100644
--- a/keyboards/ergodox/keymaps/swedish/readme.md
+++ b/layouts/community/ergodox/swedish/readme.md
diff --git a/keyboards/ergodox/keymaps/swissgerman/keyboard-layout.json b/layouts/community/ergodox/swissgerman/keyboard-layout.json
index 6958952b48..6958952b48 100644
--- a/keyboards/ergodox/keymaps/swissgerman/keyboard-layout.json
+++ b/layouts/community/ergodox/swissgerman/keyboard-layout.json
diff --git a/keyboards/ergodox/keymaps/swissgerman/keyboard-layout_1_2.json b/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
index 38a728514f..38a728514f 100644
--- a/keyboards/ergodox/keymaps/swissgerman/keyboard-layout_1_2.json
+++ b/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
diff --git a/keyboards/ergodox/keymaps/swissgerman/keymap.c b/layouts/community/ergodox/swissgerman/keymap.c
index 2291fb651a..0288c955b5 100644
--- a/keyboards/ergodox/keymaps/swissgerman/keymap.c
+++ b/layouts/community/ergodox/swissgerman/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), ACTION_MODS_KEY(MOD_RALT, KC_2),  ACTION_MODS_KEY(MOD_RALT, KC_QUOT), ACTION_MODS_KEY(MOD_RALT, KC_BSLS),ACTION_MODS_KEY(MOD_RALT,KC_7),KC_TRNS,
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/swissgerman/readme.md b/layouts/community/ergodox/swissgerman/readme.md
index fa7fc1618f..fa7fc1618f 100644
--- a/keyboards/ergodox/keymaps/swissgerman/readme.md
+++ b/layouts/community/ergodox/swissgerman/readme.md
diff --git a/keyboards/ergodox/keymaps/techtomas/keymap.c b/layouts/community/ergodox/techtomas/keymap.c
index 93d59d4876..361583a0df 100644
--- a/keyboards/ergodox/keymaps/techtomas/keymap.c
+++ b/layouts/community/ergodox/techtomas/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         LT(APP,KC_GRV),   KC_1,                KC_2,    KC_3,    KC_4,    KC_5,   LGUI(KC_SPC),
         MEH_T(KC_TAB),    KC_Q,                KC_W,    KC_E,    KC_R,    KC_T,   KC_LBRC,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,S(KC_COMM),
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // Control
-[APP] = KEYMAP(
+[APP] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
        KC_TRNS, LGUI(KC_Q), LGUI(KC_W), KC_TRNS,    KC_TRNS,    KC_TRNS,    S(KC_TAB),
        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // Control
-[CNTL] = KEYMAP(
+[CNTL] = LAYOUT_ergodox(
        KC_PWR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1,
diff --git a/keyboards/ergodox/keymaps/techtomas/readme.md b/layouts/community/ergodox/techtomas/readme.md
index 36e0591a8e..36e0591a8e 100644
--- a/keyboards/ergodox/keymaps/techtomas/readme.md
+++ b/layouts/community/ergodox/techtomas/readme.md
diff --git a/keyboards/ergodox/keymaps/teckinesis/keymap.c b/layouts/community/ergodox/teckinesis/keymap.c
index 2837874f78..0b65572f68 100644
--- a/keyboards/ergodox/keymaps/teckinesis/keymap.c
+++ b/layouts/community/ergodox/teckinesis/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "led.h"
 #include "debug.h"
 #include "action_layer.h"
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                   |      |      | PgDn |           | Down |      |      |
  *                                   `--------------------'           `--------------------'
  */
-[BASE] = KEYMAP(
+[BASE] = LAYOUT_ergodox(
 // left hand
  F(LSpec),KC_1,KC_2,KC_3   ,KC_4  ,KC_5  ,KC_ESC
 ,F(LMdia)  ,KC_Q   ,KC_W   ,KC_E   ,KC_R  ,KC_T  ,KC_LBRC
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | Down |           | PgDn |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_ESC
 ,KC_TRNS ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM)
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                            |      |      | Home |           |VolDn |      | Pause|
  *                                            `--------------------'           `--------------------'
  */
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_F11   ,KC_F12  ,KC_F13   ,KC_F14  ,KC_F15  ,KC_ESC
 ,KC_TRNS ,KC_NO    ,M(MUL)  ,KC_MS_U  ,M(MUR)  ,KC_VOLU ,KC_WH_U
@@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      |      |           |      |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[SPEC] = KEYMAP(
+[SPEC] = LAYOUT_ergodox(
 // left hand
  KC_TRNS ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
diff --git a/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png.md b/layouts/community/ergodox/teckinesis/ordinary-special.png.md
index 20b8761ed0..20b8761ed0 100644
--- a/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png.md
+++ b/layouts/community/ergodox/teckinesis/ordinary-special.png.md
diff --git a/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt b/layouts/community/ergodox/teckinesis/ordinary-special.txt
index a08827c6de..a08827c6de 100644
--- a/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
+++ b/layouts/community/ergodox/teckinesis/ordinary-special.txt
diff --git a/keyboards/ergodox/keymaps/teckinesis/readme.md b/layouts/community/ergodox/teckinesis/readme.md
index 6804bb06f6..6804bb06f6 100644
--- a/keyboards/ergodox/keymaps/teckinesis/readme.md
+++ b/layouts/community/ergodox/teckinesis/readme.md
diff --git a/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json b/layouts/community/ergodox/teckinesis/teckinesis-base.json
index 69fe28cf7c..69fe28cf7c 100644
--- a/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
+++ b/layouts/community/ergodox/teckinesis/teckinesis-base.json
diff --git a/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json b/layouts/community/ergodox/teckinesis/teckinesis-media.json
index 65fe394e8a..65fe394e8a 100644
--- a/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
+++ b/layouts/community/ergodox/teckinesis/teckinesis-media.json
diff --git a/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json b/layouts/community/ergodox/teckinesis/teckinesis-symbol.json
index 439d0128ea..439d0128ea 100644
--- a/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
+++ b/layouts/community/ergodox/teckinesis/teckinesis-symbol.json
diff --git a/keyboards/ergodox/keymaps/tkuichooseyou/README.md b/layouts/community/ergodox/tkuichooseyou/README.md
index ab02fac2ca..ab02fac2ca 100644
--- a/keyboards/ergodox/keymaps/tkuichooseyou/README.md
+++ b/layouts/community/ergodox/tkuichooseyou/README.md
diff --git a/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c b/layouts/community/ergodox/tkuichooseyou/keymap.c
index d1c7791865..0a94b52052 100644
--- a/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
+++ b/layouts/community/ergodox/tkuichooseyou/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LGUI(LSFT(KC_LBRC)),
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   ALL_T(KC_NO),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-KEYMAP(
+LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/tm2030/keymap.c b/layouts/community/ergodox/tm2030/keymap.c
index 1d861ee7c2..fa919b5d88 100644
--- a/keyboards/ergodox/keymaps/tm2030/keymap.c
+++ b/layouts/community/ergodox/tm2030/keymap.c
@@ -1,5 +1,5 @@
 /* TypeMatrix-2030-like keymap  */
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "led.h"
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_DELT,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_BSPC,
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[DVRK] = KEYMAP(  // layer 0 : default
+[DVRK] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,   KC_1,      KC_2,    KC_3,    KC_4,   KC_5,   KC_DELT,
         KC_TAB,   KC_QUOT,   KC_COMM, KC_DOT,  KC_P,   KC_Y,   KC_BSPC,
@@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[NUMR] = KEYMAP(
+[NUMR] = LAYOUT_ergodox(
        // left hand
        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
        KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[FNLR] = KEYMAP(
+[FNLR] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_INS,
        KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,      KC_TRNS, KC_VOLU,
        KC_TRNS, KC_TRNS, KC_TRNS,      KC_CALC,     KC_MAIL,      KC_WHOM,
diff --git a/keyboards/ergodox/keymaps/tm2030/readme.md b/layouts/community/ergodox/tm2030/readme.md
index 6cd794726d..6cd794726d 100644
--- a/keyboards/ergodox/keymaps/tm2030/readme.md
+++ b/layouts/community/ergodox/tm2030/readme.md
diff --git a/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c b/layouts/community/ergodox/tonyabra_osx/keymap.c
index 2a15fcb8d8..d0b5c5d9c1 100644
--- a/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
+++ b/layouts/community/ergodox/tonyabra_osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/tonyabra_osx/readme.md b/layouts/community/ergodox/tonyabra_osx/readme.md
index f9d76efc23..f9d76efc23 100644
--- a/keyboards/ergodox/keymaps/tonyabra_osx/readme.md
+++ b/layouts/community/ergodox/tonyabra_osx/readme.md
diff --git a/keyboards/ergodox/keymaps/townk_osx/config.h b/layouts/community/ergodox/townk_osx/config.h
index 72d3e96700..59b3188dfb 100644
--- a/keyboards/ergodox/keymaps/townk_osx/config.h
+++ b/layouts/community/ergodox/townk_osx/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ergodox/keymaps/townk_osx/keymap.c b/layouts/community/ergodox/townk_osx/keymap.c
index 5043d49a09..a6097d9a3e 100644
--- a/keyboards/ergodox/keymaps/townk_osx/keymap.c
+++ b/layouts/community/ergodox/townk_osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "action_util.h"
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * M(2) = Cmd+C
  * M(3) = Cmd+V
  */
-[BASE]=KEYMAP(//left half
+[BASE]=LAYOUT_ergodox(//left half
               KC_GRV,         KC_1,       KC_2,     KC_3,           KC_4,       KC_5,     KC_ESC,
               KC_TAB,         KC_Q,       KC_W,     KC_E,           KC_R,       KC_T,     MEH_T(KC_F16),
               CTL_T(KC_BSLS), KC_A,       KC_S,     KC_D,           KC_F,       KC_G,
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      |      |           |      | XXXX |      |
  *                                  `--------------------'           `--------------------'
  */
-[KEYPAD]=KEYMAP(//left half
+[KEYPAD]=LAYOUT_ergodox(//left half
                 KC_NO,        KC_NO,    KC_MS_BTN1,    KC_MS_BTN2,     KC_MS_BTN3,     KC_NO,   KC_NO,
                 KC_MS_ACCEL2, KC_NO,    KC_MS_WH_UP,   KC_MS_U,        KC_MS_WH_DOWN,  KC_NO,   KC_NO,
                 KC_MS_ACCEL1, KC_NO,    KC_MS_L,       KC_MS_D,        KC_MS_R,        KC_NO,
@@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *
  * XXX = These keys are transparent keys that, when pressed, they issue the key from the previous layer.
  */
-[FN]=KEYMAP(//left half
+[FN]=LAYOUT_ergodox(//left half
             KC_NO,   KC_F1,          KC_F2,               KC_F3,               KC_F4,                 KC_F5,  KC_F6,
             KC_NO,   KC_MEDIA_STOP,  KC_MEDIA_REWIND,     KC_MEDIA_SELECT,     KC_MEDIA_FAST_FORWARD, KC_NO,  KC_TRNS,
             KC_CAPS, KC_MEDIA_EJECT, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,   KC_NO,
diff --git a/keyboards/ergodox/keymaps/townk_osx/makefile.mk b/layouts/community/ergodox/townk_osx/makefile.mk
index c06021b9fb..c06021b9fb 100644
--- a/keyboards/ergodox/keymaps/townk_osx/makefile.mk
+++ b/layouts/community/ergodox/townk_osx/makefile.mk
diff --git a/keyboards/ergodox/keymaps/townk_osx/readme.md b/layouts/community/ergodox/townk_osx/readme.md
index a2dcd35fa4..a2dcd35fa4 100644
--- a/keyboards/ergodox/keymaps/townk_osx/readme.md
+++ b/layouts/community/ergodox/townk_osx/readme.md
diff --git a/keyboards/ergodox/keymaps/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index c9dc43c561..909127ad4f 100644
--- a/keyboards/ergodox/keymaps/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 | SPACE|      | ALT  |       | PgDn |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[0] = KEYMAP(
+[0] = LAYOUT_ergodox(
 	TG(1),     KC_1,       KC_2,       KC_3,       KC_4,  KC_5, LALT(KC_LSHIFT),
 	KC_TAB,    KC_QUOTE,   KC_COMMA,   KC_DOT,     KC_P,  KC_Y, TG(3),
 	KC_ESCAPE, KC_A,       KC_O,       KC_E,       KC_U,  KC_I,
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[1] = KEYMAP(
+[1] = LAYOUT_ergodox(
 	KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_W,    KC_QUOTE, KC_SLASH, KC_R,    KC_T,    KC_TRNS,
 	KC_TRNS, KC_A,    KC_S,     KC_D,     KC_F,    KC_G,
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[2] = KEYMAP(
+[2] = LAYOUT_ergodox(
 	KC_TRNS, KC_F1,   KC_F2,      KC_F3,      KC_F4,       KC_F5,   KC_TRNS, 
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_MS_UP,   KC_TRNS,     KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, 
@@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[3] = KEYMAP(
+[3] = LAYOUT_ergodox(
 	// Left Hand
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/twentylives_dvorak_with_hebrew/readme.md b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/readme.md
index fbd54fd511..fbd54fd511 100644
--- a/keyboards/ergodox/keymaps/twentylives_dvorak_with_hebrew/readme.md
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/readme.md
diff --git a/keyboards/ergodox/keymaps/twey/keymap.c b/layouts/community/ergodox/twey/keymap.c
index 1ecbce4661..70152864b3 100644
--- a/keyboards/ergodox/keymaps/twey/keymap.c
+++ b/layouts/community/ergodox/twey/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_plover.h"
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   M(0),
         KC_DELT,        KC_QUOT,      KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_ESC,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
 
-[STEN] = KEYMAP(  // layout: layer 2: Steno for Plover
+[STEN] = LAYOUT_ergodox(  // layout: layer 2: Steno for Plover
         // left hand
         KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,   KC_TRNS,
         KC_NO,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM, PV_NUM,  PV_STAR,
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/twey/readme.md b/layouts/community/ergodox/twey/readme.md
index 979e4261e5..979e4261e5 100644
--- a/keyboards/ergodox/keymaps/twey/readme.md
+++ b/layouts/community/ergodox/twey/readme.md
diff --git a/keyboards/ergodox/keymaps/videck/config.h b/layouts/community/ergodox/videck/config.h
index d89aabe779..b18b7fa9a9 100644
--- a/keyboards/ergodox/keymaps/videck/config.h
+++ b/layouts/community/ergodox/videck/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 #ifndef NO_DEBUG
   #define NO_DEBUG
diff --git a/keyboards/ergodox/keymaps/videck/keymap.c b/layouts/community/ergodox/videck/keymap.c
index 7bd6274e94..1229469d71 100644
--- a/keyboards/ergodox/keymaps/videck/keymap.c
+++ b/layouts/community/ergodox/videck/keymap.c
@@ -1,6 +1,6 @@
 #include <stdbool.h>
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 
 enum {
@@ -15,7 +15,7 @@ enum {
 
 // See the videck.png image for a visualization of the layout.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = KEYMAP(
+  [BASE] = LAYOUT_ergodox(
     // left hand
     KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_HOME,
     KC_EQL,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_END,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_INS,
     KC_SLCK, KC_ENT, KC_SPC
   ),
-  [ARROWS] = KEYMAP(
+  [ARROWS] = LAYOUT_ergodox(
     // left hand
     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS
   ),
-  [MOUSE] = KEYMAP(
+  [MOUSE] = LAYOUT_ergodox(
     // left hand
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS
   ),
-  [PARENS] = KEYMAP(
+  [PARENS] = LAYOUT_ergodox(
     // left hand
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/videck/readme.md b/layouts/community/ergodox/videck/readme.md
index 35d20b6ce6..35d20b6ce6 100644
--- a/keyboards/ergodox/keymaps/videck/readme.md
+++ b/layouts/community/ergodox/videck/readme.md
diff --git a/keyboards/ergodox/keymaps/videck/Makefile b/layouts/community/ergodox/videck/rules.mk
index 5c7d21f2cc..62cf81ea31 100644
--- a/keyboards/ergodox/keymaps/videck/Makefile
+++ b/layouts/community/ergodox/videck/rules.mk
@@ -14,6 +14,4 @@ TAP_DANCE_ENABLE:=yes
 UNICODEMAP_ENABLE:=no
 UNICODE_ENABLE:=no
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/videck/videck.json b/layouts/community/ergodox/videck/videck.json
index 7068cf5485..7068cf5485 100644
--- a/keyboards/ergodox/keymaps/videck/videck.json
+++ b/layouts/community/ergodox/videck/videck.json
diff --git a/keyboards/ergodox/keymaps/win10_writers-block/config.h b/layouts/community/ergodox/win10_writers-block/config.h
index c6da3dc6ae..ed6170369e 100644
--- a/keyboards/ergodox/keymaps/win10_writers-block/config.h
+++ b/layouts/community/ergodox/win10_writers-block/config.h
@@ -1,6 +1,13 @@
 #ifndef KEYBOARDS_ERGODOX_CONFIG_H_
 #define KEYBOARDS_ERGODOX_CONFIG_H_
 
+#include QMK_KEYBOARD_CONFIG_H
+
+#undef MOUSEKEY_DELAY          
+#undef MOUSEKEY_INTERVAL       
+#undef MOUSEKEY_MAX_SPEED      
+#undef MOUSEKEY_TIME_TO_MAX    
+
 #define MOUSEKEY_DELAY          100
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_MAX_SPEED      3
@@ -10,7 +17,7 @@
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
-
+#undef TAPPING_TERM
 #define TAPPING_TERM    300
 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
@@ -25,15 +32,4 @@
     keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
 
-#ifdef SUBPROJECT_ez
-    #include "ez/config.h"
-#endif
-#ifdef SUBPROJECT_infinity
-    #include "infinity/config.h"
-#endif
-#ifdef SUBPROJECT_ergodone
-    #include "ergodone/config.h"
-#endif
-
-
 #endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
diff --git a/keyboards/ergodox/keymaps/win10_writers-block/keymap.c b/layouts/community/ergodox/win10_writers-block/keymap.c
index 3106b33747..05adaed759 100644
--- a/keyboards/ergodox/keymaps/win10_writers-block/keymap.c
+++ b/layouts/community/ergodox/win10_writers-block/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
           KC_GRV,         KC_1,         KC_2,         KC_3,        KC_4,   KC_5,   KC_6,
 LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,   KC_LBRC,
@@ -144,7 +144,7 @@ LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,
        KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -187,7 +187,7 @@ LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,
  *                                 `--------------------'       `--------------------'
  */
 // RIMWORLD 
-[RIMW] = KEYMAP(
+[RIMW] = LAYOUT_ergodox(
        // left hand
         KC_ESC,   KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,
         KC_TAB,   KC_C, KC_COMM,     KC_W,  KC_DOT,    KC_R,  KC_F10,
@@ -229,7 +229,7 @@ LT(SYMB, KC_F12),         KC_Q,         KC_W,         KC_E,        KC_R,   KC_T,
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/win10_writers-block/readme.md b/layouts/community/ergodox/win10_writers-block/readme.md
index cb135b4437..cb135b4437 100644
--- a/keyboards/ergodox/keymaps/win10_writers-block/readme.md
+++ b/layouts/community/ergodox/win10_writers-block/readme.md
diff --git a/keyboards/ergodox/keymaps/win10_writers-block/Makefile b/layouts/community/ergodox/win10_writers-block/rules.mk
index fbab4b71c4..83c5090c5f 100644
--- a/keyboards/ergodox/keymaps/win10_writers-block/Makefile
+++ b/layouts/community/ergodox/win10_writers-block/rules.mk
@@ -4,6 +4,4 @@
 TAP_DANCE_ENABLE=yes
 
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c b/layouts/community/ergodox/workman_osx_mdw/keymap.c
index c05a1018de..d0f3882fa8 100644
--- a/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
+++ b/layouts/community/ergodox/workman_osx_mdw/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 // readme
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
         KC_TAB,         KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   TG(1),
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,   KC_F1,    KC_F2,    KC_F3,          KC_F4,        KC_F5,          KC_TRNS,
        KC_TRNS,   KC_PERC,  KC_AMPR,  LSFT(KC_SLSH),  LSFT(KC_EQL), KC_AT,          KC_TRNS,
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
@@ -165,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[DEAD] = KEYMAP(
+[DEAD] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,   KC_F1,    KC_F2,    KC_F3,      KC_F4,    KC_F5,          KC_TRNS,
        KC_TRNS,   M(100),   M(101),   M(102),     M(103),   M(104),         KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/xyverz/keymap.c b/layouts/community/ergodox/xyverz/keymap.c
index b186c70ba3..2e4b1e797e 100644
--- a/keyboards/ergodox/keymaps/xyverz/keymap.c
+++ b/layouts/community/ergodox/xyverz/keymap.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "eeconfig.h"
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               `--------------------' `--------------------'
  *
  */
-[_DV] = KEYMAP(
+[_DV] = LAYOUT_ergodox(
         // left hand
         KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_ESC,
         KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    XXXXXXX,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |      | End  | | PgDn |      |      |
  *                               `--------------------' `--------------------'
  */
-[_QW] = KEYMAP(
+[_QW] = LAYOUT_ergodox(
         // left hand
         KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LEFT,
         KC_DELT, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX,
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |      | End  | | PgDn |      |      |
  *                               `--------------------' `--------------------'
  */
-[_CM] = KEYMAP( 
+[_CM] = LAYOUT_ergodox( 
         // left hand
         KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LEFT,
         KC_DELT, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    XXXXXXX,
@@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |      |      | |      |      |      |
  *                               `--------------------' `--------------------'
  */
-[_MD] = KEYMAP(
+[_MD] = LAYOUT_ergodox(
         // left hand
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
         _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
@@ -227,7 +227,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                               |      |      |      | |      |      |      |
  *                               `--------------------' `--------------------'
  */
-[_KP] = KEYMAP(
+[_KP] = LAYOUT_ergodox(
         // left hand
         KC_PWR,  _______, _______, _______, _______, _______, _______,
         KC_SLEP, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ergodox/keymaps/xyverz/readme.md b/layouts/community/ergodox/xyverz/readme.md
index 134fb50afd..134fb50afd 100644
--- a/keyboards/ergodox/keymaps/xyverz/readme.md
+++ b/layouts/community/ergodox/xyverz/readme.md
diff --git a/keyboards/ergodox/keymaps/yoruian/90-ergodox-yoruian.conf b/layouts/community/ergodox/yoruian/90-ergodox-yoruian.conf
index ce4fce3b1d..ce4fce3b1d 100644
--- a/keyboards/ergodox/keymaps/yoruian/90-ergodox-yoruian.conf
+++ b/layouts/community/ergodox/yoruian/90-ergodox-yoruian.conf
diff --git a/keyboards/ergodox/keymaps/yoruian/README b/layouts/community/ergodox/yoruian/README
index 99b41434ef..99b41434ef 100644
--- a/keyboards/ergodox/keymaps/yoruian/README
+++ b/layouts/community/ergodox/yoruian/README
diff --git a/keyboards/ergodox/keymaps/yoruian/ergodox_yoruian b/layouts/community/ergodox/yoruian/ergodox_yoruian
index 0d13fbfd4c..0d13fbfd4c 100644
--- a/keyboards/ergodox/keymaps/yoruian/ergodox_yoruian
+++ b/layouts/community/ergodox/yoruian/ergodox_yoruian
diff --git a/keyboards/ergodox/keymaps/yoruian/keymap.c b/layouts/community/ergodox/yoruian/keymap.c
index 41dfda3c6d..367fe3c097 100644
--- a/keyboards/ergodox/keymaps/yoruian/keymap.c
+++ b/layouts/community/ergodox/yoruian/keymap.c
@@ -17,7 +17,7 @@
 #include "yoruian.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP_YORUIAN\
+[0] = LAYOUT_ergodox_YORUIAN\
 (9,  7,    5,    3,    1,    GRV,  MINS, EQL,  LBRC, 0,    2,    4,    6,    8,
  ES, RBRC, Y,    O,    R,    BSLS, P3,   P3,   J,    V,    D,    F,    W,    Q,
  LC, U,    I,    A,    N,    SCLN,             M,    H,    T,    S,    C,    RC,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                              BSPC, RALT, P2,   TAB,
                                    NO,   NO,
                        E,    LSFT, NO,   NO,   ENT,  SPC),
-[1] = KEYMAP_YORUIAN\
+[1] = LAYOUT_ergodox_YORUIAN\
 (TR, TR,   TR,   TR,   TR,   TR,   TR,   TR,   TR,   F5,   F6,   F7,   F8,   F9,
  TR, TR,   TR,   TR,   TR,   TR,   TR,   TR,   TR,   F1,   F2,   F3,   F4,   FT,
  TR, TR,   TR,   TR,   TR,   TR,               PAUS, LEFT, DOWN, UP,   RGHT, FE,
diff --git a/layouts/community/ergodox/yoruian/rules.mk b/layouts/community/ergodox/yoruian/rules.mk
new file mode 100644
index 0000000000..0e9338d249
--- /dev/null
+++ b/layouts/community/ergodox/yoruian/rules.mk
@@ -0,0 +1,11 @@
+
+
+install-xorg-configuration:
+	install -m 0664 90-$(KEYBOARD)-$(LAYOUT_ergodox).conf \
+	    /etc/X11/xorg.conf.d/90-$(KEYBOARD)-$(LAYOUT_ergodox).conf
+	install -m 0644 $(KEYBOARD)_$(LAYOUT_ergodox) \
+	    /usr/share/X11/xkb/symbols/$(KEYBOARD)_$(LAYOUT_ergodox)
+
+uninstall-xorg-configuration:
+	-rm -f /etc/X11/xorg.conf.d/90-$(KEYBOARD)-$(LAYOUT_ergodox).conf
+	-rm -f /usr/share/X11/xkb/symbols/$(KEYBOARD)_$(LAYOUT_ergodox)
diff --git a/keyboards/ergodox/keymaps/yoruian/yoruian.h b/layouts/community/ergodox/yoruian/yoruian.h
index b5aaf74b1a..2a85ef9a2e 100644
--- a/keyboards/ergodox/keymaps/yoruian/yoruian.h
+++ b/layouts/community/ergodox/yoruian/yoruian.h
@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
-#define KEYMAP_YORUIAN(                                                        \
+#define LAYOUT_ergodox_YORUIAN(                                                        \
  /* Spacial positions. */                                                      \
  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,         \
  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         \
@@ -28,7 +28,7 @@
                           k55, k56, k57, k58,                                  \
                                k54, k59,                                       \
                      k53, k52, k51, k5C, k5B, k5A)                             \
-  KEYMAP(KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, \
+  LAYOUT_ergodox(KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, \
          KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, \
          KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25,           \
          KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, \
diff --git a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c b/layouts/community/ergodox/zweihander-osx/keymap.c
index 725a73e346..2ace33ee2b 100644
--- a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
+++ b/layouts/community/ergodox/zweihander-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(SYMB),
         KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   MO(SYMB),
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
        // left hand
        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_DQT ,KC_TRNS,
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
        KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,  /* F14 dims screen, F15 brightens */
        KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, M(SGWF), M(TMNL), KC_TRNS,
        KC_TRNS, KC_TRNS, M(SAFA), KC_PGDN, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown b/layouts/community/ergodox/zweihander-osx/readme.markdown
index 5125a12ee1..5125a12ee1 100644
--- a/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
+++ b/layouts/community/ergodox/zweihander-osx/readme.markdown
diff --git a/keyboards/ergodox/keymaps/zweihander-osx/Makefile b/layouts/community/ergodox/zweihander-osx/rules.mk
index 6e3d088a43..6e3d088a43 100644
--- a/keyboards/ergodox/keymaps/zweihander-osx/Makefile
+++ b/layouts/community/ergodox/zweihander-osx/rules.mk
diff --git a/keyboards/lets_split/keymaps/ergodoxish/config.h b/layouts/community/ortho_4x12/ergodoxish/config.h
index 7f33a43630..3c3d9b8858 100644
--- a/keyboards/lets_split/keymaps/ergodoxish/config.h
+++ b/layouts/community/ortho_4x12/ergodoxish/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
 
 /* Use I2C or Serial, not both */
 
diff --git a/keyboards/lets_split/keymaps/ergodoxish/keymap.c b/layouts/community/ortho_4x12/ergodoxish/keymap.c
index 42f81a0eb8..49600aa33e 100644
--- a/keyboards/lets_split/keymaps/ergodoxish/keymap.c
+++ b/layouts/community/ortho_4x12/ergodoxish/keymap.c
@@ -1,4 +1,4 @@
-#include "lets_split.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 #include "eeconfig.h"
 
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_QWERTY] = KEYMAP( \
+[_QWERTY] = LAYOUT_ortho_4x12( \
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_COLEMAK] = KEYMAP( \
+[_COLEMAK] = LAYOUT_ortho_4x12( \
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
   KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-[_DVORAK] = KEYMAP( \
+[_DVORAK] = LAYOUT_ortho_4x12( \
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
   KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[_LOWER] = KEYMAP( \
+[_LOWER] = LAYOUT_ortho_4x12( \
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[_RAISE] = KEYMAP( \
+[_RAISE] = LAYOUT_ortho_4x12( \
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[_ADJUST] =  KEYMAP( \
+[_ADJUST] =  LAYOUT_ortho_4x12( \
   _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/layouts/community/ortho_4x12/layout.json b/layouts/community/ortho_4x12/layout.json
new file mode 100644
index 0000000000..9439b6e0be
--- /dev/null
+++ b/layouts/community/ortho_4x12/layout.json
@@ -0,0 +1,4 @@
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""]
\ No newline at end of file
diff --git a/layouts/community/ortho_4x12/readme.md b/layouts/community/ortho_4x12/readme.md
new file mode 100644
index 0000000000..6963727c6e
--- /dev/null
+++ b/layouts/community/ortho_4x12/readme.md
@@ -0,0 +1,3 @@
+# ortho_4x12
+
+    LAYOUT_ortho_4x12
\ No newline at end of file
diff --git a/layouts/community/ortho_4x4/layout.json b/layouts/community/ortho_4x4/layout.json
new file mode 100644
index 0000000000..ef2a095267
--- /dev/null
+++ b/layouts/community/ortho_4x4/layout.json
@@ -0,0 +1,4 @@
+["","","",""],
+["","","",""],
+["","","",""],
+["","","",""]
diff --git a/layouts/community/ortho_4x4/readme.md b/layouts/community/ortho_4x4/readme.md
new file mode 100644
index 0000000000..b7afef7b88
--- /dev/null
+++ b/layouts/community/ortho_4x4/readme.md
@@ -0,0 +1,3 @@
+# ortho_4x4
+
+    LAYOUT_ortho_4x4
\ No newline at end of file
diff --git a/layouts/community/ortho_5x12/layout.json b/layouts/community/ortho_5x12/layout.json
new file mode 100644
index 0000000000..9b12fa1825
--- /dev/null
+++ b/layouts/community/ortho_5x12/layout.json
@@ -0,0 +1,5 @@
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""]
diff --git a/layouts/community/ortho_5x12/readme.md b/layouts/community/ortho_5x12/readme.md
new file mode 100644
index 0000000000..b5037efecd
--- /dev/null
+++ b/layouts/community/ortho_5x12/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x12
+
+    LAYOUT_ortho_5x12
\ No newline at end of file
diff --git a/layouts/community/ortho_5x15/layout.json b/layouts/community/ortho_5x15/layout.json
new file mode 100644
index 0000000000..e7703827e8
--- /dev/null
+++ b/layouts/community/ortho_5x15/layout.json
@@ -0,0 +1,5 @@
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""]
diff --git a/layouts/community/ortho_5x15/readme.md b/layouts/community/ortho_5x15/readme.md
new file mode 100644
index 0000000000..137af0aeb0
--- /dev/null
+++ b/layouts/community/ortho_5x15/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x15
+
+    LAYOUT_ortho_5x15
\ No newline at end of file
diff --git a/layouts/default/60_ansi/default_60_ansi/keymap.c b/layouts/default/60_ansi/default_60_ansi/keymap.c
new file mode 100644
index 0000000000..130dc19c4b
--- /dev/null
+++ b/layouts/default/60_ansi/default_60_ansi/keymap.c
@@ -0,0 +1,11 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_ansi( 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO, 
+        KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO,       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO,
+        KC_NO,          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,         KC_NO,
+        KC_NO,  KC_NO,  KC_NO,                     KC_NO,                      KC_NO,  KC_NO,  KC_NO,  KC_NO 
+    )
+};
\ No newline at end of file
diff --git a/layouts/default/60_ansi/layout.json b/layouts/default/60_ansi/layout.json
new file mode 100644
index 0000000000..b7e1d0fed2
--- /dev/null
+++ b/layouts/default/60_ansi/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:2.75},""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},""]
diff --git a/layouts/default/60_ansi/readme.md b/layouts/default/60_ansi/readme.md
new file mode 100644
index 0000000000..15f51d3fa1
--- /dev/null
+++ b/layouts/default/60_ansi/readme.md
@@ -0,0 +1,3 @@
+# 60_ansi
+
+    LAYOUT_60_ansi
\ No newline at end of file
diff --git a/layouts/default/60_iso/default_60_iso/keymap.c b/layouts/default/60_iso/default_60_iso/keymap.c
new file mode 100644
index 0000000000..b9d932e770
--- /dev/null
+++ b/layouts/default/60_iso/default_60_iso/keymap.c
@@ -0,0 +1,11 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_iso( 
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
+          KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,  
+        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT,   
+        KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT,  
+        KC_LCTRL, KC_LALT, KC_LGUI,         KC_SPACE,       KC_NO,  KC_RGUI,  KC_RALT,  KC_MENU,  KC_RCTL
+    )
+};
\ No newline at end of file
diff --git a/layouts/default/60_iso/layout.json b/layouts/default/60_iso/layout.json
new file mode 100644
index 0000000000..2b8493fca7
--- /dev/null
+++ b/layouts/default/60_iso/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:2.75},""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},""]
diff --git a/layouts/default/60_iso/readme.md b/layouts/default/60_iso/readme.md
new file mode 100644
index 0000000000..42ff805fb6
--- /dev/null
+++ b/layouts/default/60_iso/readme.md
@@ -0,0 +1,3 @@
+# 60_iso
+
+    LAYOUT_60_iso
\ No newline at end of file
diff --git a/layouts/default/ergodox/default_ergodox/keymap.c b/layouts/default/ergodox/default_ergodox/keymap.c
new file mode 100644
index 0000000000..697b53f9f5
--- /dev/null
+++ b/layouts/default/ergodox/default_ergodox/keymap.c
@@ -0,0 +1,23 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ergodox(
+        KC_GRV,   KC_1,  KC_2,   KC_3,   KC_4,    KC_5,   KC_EQL,
+        KC_TAB,   KC_Q,  KC_W,   KC_E,   KC_R,    KC_T,   KC_EQL,
+        KC_ESC,   KC_A,  KC_S,   KC_D,   KC_F,    KC_G,
+        KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,    KC_B,   KC_B,
+        KC_LCTL, KC_F4,  KC_F5,  KC_LGUI,KC_LALT,
+                                                                              KC_C,   KC_V,
+                                                                                      KC_PGUP,
+                                                                    KC_BSPC, KC_BSPC, KC_DEL,
+
+             KC_5,  KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,
+             KC_Y,  KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_BSLS,
+                    KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,
+             KC_N , KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,  KC_RSFT,
+                            KC_LEFT,KC_DOWN,KC_UP,   KC_RIGHT, KC_RGUI,
+             KC_RALT, KC_A,
+             KC_PGDN,
+             KC_RCTL, KC_ENT, KC_SPC
+    ),
+};
\ No newline at end of file
diff --git a/layouts/default/ergodox/layout.json b/layouts/default/ergodox/layout.json
new file mode 100644
index 0000000000..5348e91a68
--- /dev/null
+++ b/layouts/default/ergodox/layout.json
@@ -0,0 +1,26 @@
+[{x:3.5,a:7},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"","",{x:4.5},"",""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"",{h:1.5},"",{x:4.5,h:1.5},"",""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"",{x:6.5},""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""],
+[{y:-0.75,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.875,x:5.5},"",{x:6.5},""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5},"",{x:10.5},""],
+[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
+[{y:-0.75,x:0.5},"","",{x:14.5},"",""],
+[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""],
+[{h:2},"",{h:2},"",""],
+[{x:2},""],
+[{r:-30,rx:13,y:-1,x:-3},"",""],
+[{x:-3},"",{h:2},"",{h:2},""],
+[{x:-3},""]
diff --git a/layouts/default/ergodox/readme.md b/layouts/default/ergodox/readme.md
new file mode 100644
index 0000000000..ddbe1933c2
--- /dev/null
+++ b/layouts/default/ergodox/readme.md
@@ -0,0 +1,3 @@
+# ergodox
+
+    LAYOUT_ergodox
\ No newline at end of file
diff --git a/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c b/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c
new file mode 100644
index 0000000000..4a2f8fd955
--- /dev/null
+++ b/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c
@@ -0,0 +1,10 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x12( 
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, 
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, 
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, 
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L 
+    )
+};
\ No newline at end of file
diff --git a/layouts/default/ortho_4x12/layout.json b/layouts/default/ortho_4x12/layout.json
new file mode 100644
index 0000000000..9439b6e0be
--- /dev/null
+++ b/layouts/default/ortho_4x12/layout.json
@@ -0,0 +1,4 @@
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""]
\ No newline at end of file
diff --git a/layouts/default/ortho_4x12/readme.md b/layouts/default/ortho_4x12/readme.md
new file mode 100644
index 0000000000..6963727c6e
--- /dev/null
+++ b/layouts/default/ortho_4x12/readme.md
@@ -0,0 +1,3 @@
+# ortho_4x12
+
+    LAYOUT_ortho_4x12
\ No newline at end of file
diff --git a/layouts/default/ortho_4x4/default_ortho_4x4/keymap.c b/layouts/default/ortho_4x4/default_ortho_4x4/keymap.c
new file mode 100644
index 0000000000..79581fa618
--- /dev/null
+++ b/layouts/default/ortho_4x4/default_ortho_4x4/keymap.c
@@ -0,0 +1,10 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x4( 
+        KC_A, KC_B, KC_C, KC_D, 
+        KC_A, KC_B, KC_C, KC_D, 
+        KC_A, KC_B, KC_C, KC_D, 
+        KC_A, KC_B, KC_C, KC_D 
+    )
+};
\ No newline at end of file
diff --git a/layouts/default/ortho_4x4/layout.json b/layouts/default/ortho_4x4/layout.json
new file mode 100644
index 0000000000..ef2a095267
--- /dev/null
+++ b/layouts/default/ortho_4x4/layout.json
@@ -0,0 +1,4 @@
+["","","",""],
+["","","",""],
+["","","",""],
+["","","",""]
diff --git a/layouts/default/ortho_4x4/readme.md b/layouts/default/ortho_4x4/readme.md
new file mode 100644
index 0000000000..b7afef7b88
--- /dev/null
+++ b/layouts/default/ortho_4x4/readme.md
@@ -0,0 +1,3 @@
+# ortho_4x4
+
+    LAYOUT_ortho_4x4
\ No newline at end of file
diff --git a/layouts/default/ortho_5x12/default_ortho_5x12/keymap.c b/layouts/default/ortho_5x12/default_ortho_5x12/keymap.c
new file mode 100644
index 0000000000..89ad14bba7
--- /dev/null
+++ b/layouts/default/ortho_5x12/default_ortho_5x12/keymap.c
@@ -0,0 +1,11 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x12(
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L
+    )
+};
\ No newline at end of file
diff --git a/layouts/default/ortho_5x12/layout.json b/layouts/default/ortho_5x12/layout.json
new file mode 100644
index 0000000000..9b12fa1825
--- /dev/null
+++ b/layouts/default/ortho_5x12/layout.json
@@ -0,0 +1,5 @@
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""],
+["","","","","","","","","","","",""]
diff --git a/layouts/default/ortho_5x12/readme.md b/layouts/default/ortho_5x12/readme.md
new file mode 100644
index 0000000000..b5037efecd
--- /dev/null
+++ b/layouts/default/ortho_5x12/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x12
+
+    LAYOUT_ortho_5x12
\ No newline at end of file
diff --git a/layouts/default/ortho_5x15/default_ortho_5x15/keymap.c b/layouts/default/ortho_5x15/default_ortho_5x15/keymap.c
new file mode 100644
index 0000000000..f67f324738
--- /dev/null
+++ b/layouts/default/ortho_5x15/default_ortho_5x15/keymap.c
@@ -0,0 +1,11 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x15(
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_J, KC_K, KC_L,
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_J, KC_K, KC_L
+    )
+};
\ No newline at end of file
diff --git a/layouts/default/ortho_5x15/layout.json b/layouts/default/ortho_5x15/layout.json
new file mode 100644
index 0000000000..e7703827e8
--- /dev/null
+++ b/layouts/default/ortho_5x15/layout.json
@@ -0,0 +1,5 @@
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","",""]
diff --git a/layouts/default/ortho_5x15/readme.md b/layouts/default/ortho_5x15/readme.md
new file mode 100644
index 0000000000..137af0aeb0
--- /dev/null
+++ b/layouts/default/ortho_5x15/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x15
+
+    LAYOUT_ortho_5x15
\ No newline at end of file
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index 102d23b7ef..671b63ea2c 100644
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -91,7 +91,7 @@ GDISP_DRIVER_LIST := $(subst $(GDISP_LIST_SPACE),$(GDISP_LIST_COMMA),$(GDISP_DRI
 GFXDEFS +=-DGDISP_DRIVER_LIST="$(GDISP_DRIVER_LIST)"
 
 ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","")
-    SRC += keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/visualizer.c
+    SRC += $(KEYMAP_PATH)/visualizer.c
 else 
     ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/visualizer.c)","")
         ifeq ("$(wildcard $(SUBPROJECT_PATH)/visualizer.c)","")