diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index d03ff33f2c..09549baf69 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1626,9 +1626,15 @@
"buzzard": {
"target": "buzzard/rev1"
},
+ "cannonkeys/db60": {
+ "target": "cannonkeys/db60/rev2"
+ },
"clickety_split/leeloo": {
"target": "clickety_split/leeloo/rev3"
},
+ "converter/palm_usb": {
+ "target": "converter/palm_usb/stowaway"
+ },
"crkbd": {
"target": "crkbd/rev1"
},
@@ -1713,6 +1719,9 @@
"handwired/dactyl_manuform/6x6": {
"target": "handwired/dactyl_manuform/6x6/promicro"
},
+ "handwired/meck_tkl": {
+ "target": "handwired/meck_tkl/blackpill_f401"
+ },
"handwired/ms_sculpt_mobile": {
"target": "handwired/ms_sculpt_mobile/teensy2pp"
},
@@ -1752,6 +1761,9 @@
"hillside/46": {
"target": "hillside/46/0_1"
},
+ "hhkb/ansi": {
+ "target": "hhkb/ansi/32u4"
+ },
"hillside/48": {
"target": "hillside/48/0_1"
},
@@ -1797,6 +1809,9 @@
"kakunpc/angel17": {
"target": "kakunpc/angel17/rev1"
},
+ "kakunpc/angel64": {
+ "target": "kakunpc/angel64/rev1"
+ },
"kakunpc/business_card": {
"target": "kakunpc/business_card/beta"
},
@@ -2148,6 +2163,9 @@
"takashiski/namecard2x4": {
"target": "takashiski/namecard2x4/rev2"
},
+ "teleport/native": {
+ "target": "teleport/native/iso"
+ },
"themadnoodle/noodlepad": {
"target": "themadnoodle/noodlepad/v1"
},
@@ -2181,6 +2199,21 @@
"vitamins_included": {
"target": "vitamins_included/rev2"
},
+ "westm/westm68": {
+ "target": "westm/westm68/rev2"
+ },
+ "westm/westm9": {
+ "target": "westm/westm9/rev2"
+ },
+ "woodkeys/meira": {
+ "target": "woodkeys/meira/promicro"
+ },
+ "work_louder/loop": {
+ "target": "work_louder/loop/rev3"
+ },
+ "work_louder/work_board": {
+ "target": "work_louder/work_board/rev3"
+ },
"yanghu/unicorne": {
"target": "yanghu/unicorne/f411"
},
@@ -2195,5 +2228,8 @@
},
"yynmt/acperience12": {
"target": "yynmt/acperience12/rev1"
+ },
+ "zsa/planck_ez": {
+ "target": "zsa/planck_ez/base"
}
}
diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/cannonkeys/db60/hotswap/rules.mk
similarity index 64%
rename from keyboards/westm/westm9/rules.mk
rename to keyboards/cannonkeys/db60/hotswap/rules.mk
index 3ff78857b3..0ab54aaaf7 100644
--- a/keyboards/westm/westm9/rules.mk
+++ b/keyboards/cannonkeys/db60/hotswap/rules.mk
@@ -1,4 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm9/rev2
diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/cannonkeys/db60/j02/rules.mk
similarity index 63%
rename from keyboards/westm/westm68/rules.mk
rename to keyboards/cannonkeys/db60/j02/rules.mk
index 2a716f41c4..0ab54aaaf7 100644
--- a/keyboards/westm/westm68/rules.mk
+++ b/keyboards/cannonkeys/db60/j02/rules.mk
@@ -1,4 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm68/rev2
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rev2/rules.mk
similarity index 62%
rename from keyboards/cannonkeys/db60/rules.mk
rename to keyboards/cannonkeys/db60/rev2/rules.mk
index 60addd7fe7..0ab54aaaf7 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rev2/rules.mk
@@ -1,4 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = cannonkeys/db60/rev2
diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json
deleted file mode 100644
index c5b893d757..0000000000
--- a/keyboards/converter/palm_usb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "keyboard_name": "Stowaway Converter",
- "manufacturer": "QMK",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0001",
- "device_version": "1.0.0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "features": {
- "bootmagic": false,
- "mousekey": false,
- "extrakey": false,
- "console": true,
- "command": true
- }
-}
diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/stowaway/config.h
similarity index 100%
rename from keyboards/converter/palm_usb/config.h
rename to keyboards/converter/palm_usb/stowaway/config.h
diff --git a/keyboards/converter/palm_usb/stowaway/keyboard.json b/keyboards/converter/palm_usb/stowaway/keyboard.json
index 9a263327ad..c93957b7d8 100644
--- a/keyboards/converter/palm_usb/stowaway/keyboard.json
+++ b/keyboards/converter/palm_usb/stowaway/keyboard.json
@@ -1,4 +1,22 @@
{
+ "keyboard_name": "Stowaway Converter",
+ "manufacturer": "QMK",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0001",
+ "device_version": "1.0.0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true,
+ "command": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/stowaway/matrix.c
similarity index 100%
rename from keyboards/converter/palm_usb/matrix.c
rename to keyboards/converter/palm_usb/stowaway/matrix.c
diff --git a/keyboards/converter/palm_usb/readme.md b/keyboards/converter/palm_usb/stowaway/readme.md
similarity index 100%
rename from keyboards/converter/palm_usb/readme.md
rename to keyboards/converter/palm_usb/stowaway/readme.md
diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/stowaway/rules.mk
similarity index 65%
rename from keyboards/converter/palm_usb/rules.mk
rename to keyboards/converter/palm_usb/stowaway/rules.mk
index bdb3bb0d6b..ccb8eb9ecc 100644
--- a/keyboards/converter/palm_usb/rules.mk
+++ b/keyboards/converter/palm_usb/stowaway/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = converter/palm_usb/stowaway
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
new file mode 100644
index 0000000000..6e47ffcd67
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
@@ -0,0 +1,2 @@
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
deleted file mode 100644
index cdf3900ff0..0000000000
--- a/keyboards/handwired/meck_tkl/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
-
-DEFAULT_FOLDER = handwired/meck_tkl/blackpill_f401
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk
similarity index 64%
rename from keyboards/hhkb/ansi/rules.mk
rename to keyboards/hhkb/ansi/32u2/rules.mk
index 841565b846..94eaaab9c0 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/32u2/rules.mk
@@ -2,5 +2,3 @@ CUSTOM_MATRIX = yes
# project specific files
SRC = matrix.c
-
-DEFAULT_FOLDER = hhkb/ansi/32u4
diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk
new file mode 100644
index 0000000000..94eaaab9c0
--- /dev/null
+++ b/keyboards/hhkb/ansi/32u4/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = yes
+
+# project specific files
+SRC = matrix.c
diff --git a/keyboards/kakunpc/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk
new file mode 100644
index 0000000000..09c02c88b0
--- /dev/null
+++ b/keyboards/kakunpc/angel64/alpha/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c
diff --git a/keyboards/kakunpc/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk
new file mode 100644
index 0000000000..09c02c88b0
--- /dev/null
+++ b/keyboards/kakunpc/angel64/rev1/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c
diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
deleted file mode 100644
index c95d5297bd..0000000000
--- a/keyboards/kakunpc/angel64/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CUSTOM_MATRIX = yes
-
-SRC += matrix.c
-
-DEFAULT_FOLDER = kakunpc/angel64/rev1
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/v1/rules.mk
similarity index 53%
rename from keyboards/oddball/rules.mk
rename to keyboards/oddball/v1/rules.mk
index 2fc8995acb..84de35aeb1 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/v1/rules.mk
@@ -1,3 +1 @@
POINTING_DEVICE_DRIVER = adns9800
-
-DEFAULT_FOLDER = oddball/v1
diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk
new file mode 100644
index 0000000000..84de35aeb1
--- /dev/null
+++ b/keyboards/oddball/v2/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk
new file mode 100644
index 0000000000..84de35aeb1
--- /dev/null
+++ b/keyboards/oddball/v2_1/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/teleport/native/ansi/rules.mk b/keyboards/teleport/native/ansi/rules.mk
new file mode 100644
index 0000000000..942ef4c5db
--- /dev/null
+++ b/keyboards/teleport/native/ansi/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/teleport/native/iso/rules.mk b/keyboards/teleport/native/iso/rules.mk
new file mode 100644
index 0000000000..942ef4c5db
--- /dev/null
+++ b/keyboards/teleport/native/iso/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
deleted file mode 100644
index 53dc2b1747..0000000000
--- a/keyboards/teleport/native/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_CUSTOM_KB = yes
-
-DEFAULT_FOLDER = teleport/native/iso
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm68/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm68/rev2/rules.mk b/keyboards/westm/westm68/rev2/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm9/rev1/rules.mk b/keyboards/westm/westm9/rev1/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm9/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm9/rev2/rules.mk b/keyboards/westm/westm9/rev2/rules.mk
new file mode 100644
index 0000000000..0ab54aaaf7
--- /dev/null
+++ b/keyboards/westm/westm9/rev2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
index 3437a35bdf..44ebb2c1fe 100644
--- a/keyboards/woodkeys/meira/featherble/rules.mk
+++ b/keyboards/woodkeys/meira/featherble/rules.mk
@@ -1,2 +1,5 @@
# Processor frequency
F_CPU = 8000000
+
+CUSTOM_MATRIX = yes
+SRC += matrix.c
diff --git a/keyboards/woodkeys/meira/promicro/rules.mk b/keyboards/woodkeys/meira/promicro/rules.mk
index 09057bea54..32a05accc5 100644
--- a/keyboards/woodkeys/meira/promicro/rules.mk
+++ b/keyboards/woodkeys/meira/promicro/rules.mk
@@ -1,3 +1,6 @@
+CUSTOM_MATRIX = yes
+SRC += matrix.c
+
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
deleted file mode 100644
index 423c14cfb7..0000000000
--- a/keyboards/woodkeys/meira/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CUSTOM_MATRIX = yes
-SRC += matrix.c
-
-DEFAULT_FOLDER = woodkeys/meira/promicro
diff --git a/keyboards/work_louder/loop/post_rules.mk b/keyboards/work_louder/loop/post_rules.mk
new file mode 100644
index 0000000000..e0822c009b
--- /dev/null
+++ b/keyboards/work_louder/loop/post_rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
deleted file mode 100644
index 53c3227972..0000000000
--- a/keyboards/work_louder/loop/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += rgb_functions.c
-
-DEFAULT_FOLDER = work_louder/loop/rev3
diff --git a/keyboards/work_louder/work_board/post_rules.mk b/keyboards/work_louder/work_board/post_rules.mk
new file mode 100644
index 0000000000..e0822c009b
--- /dev/null
+++ b/keyboards/work_louder/work_board/post_rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
deleted file mode 100644
index a4c45393c0..0000000000
--- a/keyboards/work_louder/work_board/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += rgb_functions.c
-
-DEFAULT_FOLDER = work_louder/work_board/rev3
diff --git a/keyboards/zsa/planck_ez/base/rules.mk b/keyboards/zsa/planck_ez/base/rules.mk
new file mode 100644
index 0000000000..c0b951fba9
--- /dev/null
+++ b/keyboards/zsa/planck_ez/base/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/planck_ez/glow/rules.mk b/keyboards/zsa/planck_ez/glow/rules.mk
new file mode 100644
index 0000000000..c0b951fba9
--- /dev/null
+++ b/keyboards/zsa/planck_ez/glow/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/planck_ez/rules.mk b/keyboards/zsa/planck_ez/rules.mk
deleted file mode 100644
index 67921c96ed..0000000000
--- a/keyboards/zsa/planck_ez/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_SUPPORTED = no
-BAKCLIGHT_SUPPORTED = no
-
-DEFAULT_FOLDER = zsa/planck_ez/base