diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 86fcdb8c29..760e54b889 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1575,6 +1575,12 @@
     "1upkeyboards/sweet16": {
         "target": "1upkeyboards/sweet16/v1"
     },
+    "25keys/aleth42": {
+        "target": "25keys/aleth42/rev1"
+    },
+    "25keys/zinc": {
+        "target": "25keys/zinc/rev1"
+    },
     "40percentclub/i75": {
         "target": "40percentclub/i75/promicro"
     },
@@ -1599,6 +1605,9 @@
     "atreyu": {
         "target": "atreyu/rev1"
     },
+    "biacco42/ergo42": {
+        "target": "biacco42/ergo42/rev1"
+    },
     "binepad/bn009": {
         "target": "binepad/bn009/r2"
     },
@@ -1641,6 +1650,9 @@
     "deltasplit75": {
         "target": "deltasplit75/v2"
     },
+    "drhigsby/ogurec": {
+        "target": "drhigsby/ogurec/left_pm"
+    },
     "duck/octagon": {
         "target": "duck/octagon/v2"
     },
@@ -1755,9 +1767,15 @@
     "inett_studio/sq80": {
         "target": "inett_studio/sq80/hotswap_layout_i"
     },
+    "input_club/infinity60": {
+        "target": "input_club/infinity60/led"
+    },
     "jacky_studio/bear_65": {
         "target": "jacky_studio/bear_65/rev1"
     },
+    "jacky_studio/piggy60/rev1": {
+        "target": "jacky_studio/piggy60/rev1/solder"
+    },
     "jadookb/jkb65": {
         "target": "jadookb/jkb65/r1"
     },
@@ -1773,12 +1791,18 @@
     "junco": {
         "target": "junco/rev1"
     },
+    "kakunpc/angel17": {
+        "target": "kakunpc/angel17/rev1"
+    },
     "kakunpc/business_card": {
         "target": "kakunpc/business_card/beta"
     },
     "kakunpc/suihankey": {
         "target": "kakunpc/suihankey/rev1"
     },
+    "kakunpc/suihankey/split": {
+        "target": "kakunpc/suihankey/split/rev1"
+    },
     "kapcave/paladinpad": {
         "target": "kapcave/paladinpad/rev2"
     },
@@ -1821,6 +1845,12 @@
     "keycapsss/kimiko": {
         "target": "keycapsss/kimiko/rev2"
     },
+    "keyhive/navi10": {
+        "target": "keyhive/navi10/rev3"
+    },
+    "keyhive/uno": {
+        "target": "keyhive/uno/rev1"
+    },
     "kin80": {
         "target": "kin80/blackpill401"
     },
@@ -1851,6 +1881,9 @@
     "lime": {
         "target": "lime/rev1"
     },
+    "maple_computing/christmas_tree": {
+        "target": "maple_computing/christmas_tree/v2017"
+    },
     "maple_computing/ivy": {
         "target": "maple_computing/ivy/rev1"
     },
@@ -1866,6 +1899,9 @@
     "marksard/rhymestone": {
         "target": "marksard/rhymestone/rev1"
     },
+    "marksard/treadstone32": {
+        "target": "marksard/treadstone32/rev1"
+    },
     "marksard/treadstone48": {
         "target": "marksard/treadstone48/rev1"
     },
@@ -1890,6 +1926,9 @@
     "mechlovin/adelais/standard_led/avr": {
         "target": "mechlovin/adelais/standard_led/avr/rev1"
     },
+    "mechlovin/hannah65/rev1": {
+        "target": "mechlovin/hannah65/rev1/haus"
+    },
     "mechlovin/infinity87/rev1": {
         "target": "mechlovin/infinity87/rev1/standard"
     },
@@ -1986,6 +2025,15 @@
     "qwertyydox": {
         "target": "qwertyydox/rev1"
     },
+    "rate/pistachio": {
+        "target": "rate/pistachio/rev2"
+    },
+    "recompile_keys/choco60": {
+        "target": "recompile_keys/choco60/rev1"
+    },
+    "recompile_keys/nomu30": {
+        "target": "recompile_keys/nomu30/rev1"
+    },
     "redox/rev1": {
         "target": "redox/rev1/base"
     },
@@ -2025,6 +2073,27 @@
     "rura66": {
         "target": "rura66/rev1"
     },
+    "salicylic_acid3/7skb": {
+        "target": "salicylic_acid3/7skb/rev1"
+    },
+    "salicylic_acid3/getta25": {
+        "target": "salicylic_acid3/getta25/rev1"
+    },
+    "salicylic_acid3/jisplit89": {
+        "target": "salicylic_acid3/jisplit89/rev1"
+    },
+    "salicylic_acid3/naked48": {
+        "target": "salicylic_acid3/naked48/rev1"
+    },
+    "salicylic_acid3/naked60": {
+        "target": "salicylic_acid3/naked60/rev1"
+    },
+    "salicylic_acid3/naked64": {
+        "target": "salicylic_acid3/naked64/rev1"
+    },
+    "salicylic_acid3/setta21": {
+        "target": "salicylic_acid3/setta21/rev1"
+    },
     "sawnsprojects/okayu": {
         "target": "sawnsprojects/okayu/stm32f072"
     },
@@ -2034,6 +2103,9 @@
     "sofle": {
         "target": "sofle/rev1"
     },
+    "spaceholdings/nebula68b": {
+        "target": "spaceholdings/nebula68b/solder"
+    },
     "spacetime": {
         "target": "spacetime/rev1"
     },
@@ -2052,6 +2124,9 @@
     "splitkb/aurora/sweep": {
         "target": "splitkb/aurora/sweep/rev1"
     },
+    "splitkb/kyria": {
+        "target": "splitkb/kyria/rev3"
+    },
     "splitkb/kyria/rev1": {
         "target": "splitkb/kyria/rev1/base"
     },
@@ -2067,12 +2142,18 @@
     "takashiski/hecomi": {
         "target": "takashiski/hecomi/alpha"
     },
+    "takashiski/namecard2x4": {
+        "target": "takashiski/namecard2x4/rev2"
+    },
     "themadnoodle/noodlepad": {
         "target": "themadnoodle/noodlepad/v1"
     },
     "tkw/grandiceps": {
         "target": "tkw/grandiceps/rev1"
     },
+    "tominabox1/le_chiffre": {
+        "target": "tominabox1/le_chiffre/rev1"
+    },
     "tominabox1/littlefoot_lx": {
         "target": "tominabox1/littlefoot_lx/rev1"
     },
@@ -2103,6 +2184,9 @@
     "yosino58": {
         "target": "yosino58/rev1"
     },
+    "ymdk/yd60mq": {
+        "target": "ymdk/yd60mq/12led"
+    },
     "yushakobo/navpad/10": {
         "target": "yushakobo/navpad/10/rev1"
     },
diff --git a/keyboards/25keys/aleth42/rules.mk b/keyboards/25keys/aleth42/rules.mk
deleted file mode 100644
index 8034ad5440..0000000000
--- a/keyboards/25keys/aleth42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 25keys/aleth42/rev1
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
deleted file mode 100644
index 1edcb0a345..0000000000
--- a/keyboards/25keys/zinc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = 25keys/zinc/rev1
diff --git a/keyboards/aeboards/ext65/rules.mk b/keyboards/aeboards/ext65/rules.mk
deleted file mode 100644
index d8b0595a5d..0000000000
--- a/keyboards/aeboards/ext65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = aeboards/ext65/rev2
\ No newline at end of file
diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
deleted file mode 100644
index 18059c0a3b..0000000000
--- a/keyboards/biacco42/ergo42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk
deleted file mode 100644
index 3d64c0af2b..0000000000
--- a/keyboards/custommk/genesis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = custommk/genesis/rev2
diff --git a/keyboards/drhigsby/ogurec/rules.mk b/keyboards/drhigsby/ogurec/rules.mk
deleted file mode 100644
index ed83fb6386..0000000000
--- a/keyboards/drhigsby/ogurec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = drhigsby/ogurec/left_pm
diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
deleted file mode 100644
index 9c4b1e74c2..0000000000
--- a/keyboards/input_club/infinity60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = input_club/infinity60/led
diff --git a/keyboards/jacky_studio/piggy60/rev1/rules.mk b/keyboards/jacky_studio/piggy60/rev1/rules.mk
deleted file mode 100644
index 873e9334ed..0000000000
--- a/keyboards/jacky_studio/piggy60/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jacky_studio/piggy60/rules.mk b/keyboards/jacky_studio/piggy60/rules.mk
deleted file mode 100644
index 873e9334ed..0000000000
--- a/keyboards/jacky_studio/piggy60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jones/rules.mk b/keyboards/jones/rules.mk
deleted file mode 100644
index 9f0da2abec..0000000000
--- a/keyboards/jones/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = jones/v1
diff --git a/keyboards/kakunpc/angel17/rules.mk b/keyboards/kakunpc/angel17/rules.mk
deleted file mode 100644
index 48095d37e6..0000000000
--- a/keyboards/kakunpc/angel17/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kakunpc/angel17/rev1
diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
deleted file mode 100644
index 1dc7b014f0..0000000000
--- a/keyboards/kakunpc/suihankey/split/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kakunpc/suihankey/split/rev1
diff --git a/keyboards/keyhive/navi10/rules.mk b/keyboards/keyhive/navi10/rules.mk
deleted file mode 100644
index 6ebb2d0ceb..0000000000
--- a/keyboards/keyhive/navi10/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keyhive/navi10/rev3
diff --git a/keyboards/keyhive/uno/rules.mk b/keyboards/keyhive/uno/rules.mk
deleted file mode 100644
index 3220994593..0000000000
--- a/keyboards/keyhive/uno/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = keyhive/uno/rev1
diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
deleted file mode 100644
index 3a6633cf56..0000000000
--- a/keyboards/maple_computing/christmas_tree/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = maple_computing/christmas_tree/v2017
diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
deleted file mode 100644
index 2d7ca16d86..0000000000
--- a/keyboards/marksard/treadstone32/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = marksard/treadstone32/rev1
diff --git a/keyboards/mechlovin/hannah65/rev1/rules.mk b/keyboards/mechlovin/hannah65/rev1/rules.mk
deleted file mode 100644
index ae9bc176a4..0000000000
--- a/keyboards/mechlovin/hannah65/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus
diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk
deleted file mode 100644
index ae9bc176a4..0000000000
--- a/keyboards/mechlovin/hannah65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus
diff --git a/keyboards/rate/pistachio/rules.mk b/keyboards/rate/pistachio/rules.mk
deleted file mode 100644
index a5f4485316..0000000000
--- a/keyboards/rate/pistachio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = rate/pistachio/rev2
diff --git a/keyboards/recompile_keys/choco60/rules.mk b/keyboards/recompile_keys/choco60/rules.mk
deleted file mode 100644
index 6abfd34d47..0000000000
--- a/keyboards/recompile_keys/choco60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = recompile_keys/choco60/rev1
diff --git a/keyboards/recompile_keys/nomu30/rules.mk b/keyboards/recompile_keys/nomu30/rules.mk
deleted file mode 100644
index 431b619249..0000000000
--- a/keyboards/recompile_keys/nomu30/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = recompile_keys/nomu30/rev1
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
deleted file mode 100644
index 15364c29a5..0000000000
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
deleted file mode 100644
index 069fe74b14..0000000000
--- a/keyboards/salicylic_acid3/getta25/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/getta25/rev1
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
deleted file mode 100644
index d54d2ccef4..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
deleted file mode 100644
index dadfa7a257..0000000000
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
deleted file mode 100644
index 904309ea35..0000000000
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
deleted file mode 100644
index 0ac8d83bfc..0000000000
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
deleted file mode 100644
index 02e68b5748..0000000000
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
deleted file mode 100644
index 8fe37f83b3..0000000000
--- a/keyboards/spaceholdings/nebula68b/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = spaceholdings/nebula68b/solder
diff --git a/keyboards/splitkb/kyria/rules.mk b/keyboards/splitkb/kyria/rules.mk
deleted file mode 100644
index 1342089f56..0000000000
--- a/keyboards/splitkb/kyria/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = splitkb/kyria/rev3
diff --git a/keyboards/takashiski/namecard2x4/rules.mk b/keyboards/takashiski/namecard2x4/rules.mk
deleted file mode 100644
index f93cfc823d..0000000000
--- a/keyboards/takashiski/namecard2x4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = takashiski/namecard2x4/rev2
diff --git a/keyboards/tominabox1/le_chiffre/rules.mk b/keyboards/tominabox1/le_chiffre/rules.mk
deleted file mode 100644
index 57b3d94eab..0000000000
--- a/keyboards/tominabox1/le_chiffre/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = tominabox1/le_chiffre/rev1
diff --git a/keyboards/ymdk/yd60mq/rules.mk b/keyboards/ymdk/yd60mq/rules.mk
deleted file mode 100644
index c37722c8bb..0000000000
--- a/keyboards/ymdk/yd60mq/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ymdk/yd60mq/12led