43 files changed, 15 insertions, 15 deletions
diff --git a/keyboards/idobao/id80/rules.mk b/keyboards/idobao/id80/rules.mk
index eea8b69900..f988be4e29 100644
--- a/keyboards/idobao/id80/rules.mk
+++ b/keyboards/idobao/id80/rules.mk
@@ -1,5 +1,5 @@
 # Defalt to the ansi version
-DEFAULT_FOLDER = id80/ansi
+DEFAULT_FOLDER = idobao/id80/ansi
 
 # MCU name
 MCU = atmega32u4
diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
index 096c25856e..a0b43873cc 100644
--- a/keyboards/marksard/treadstone32/rules.mk
+++ b/keyboards/marksard/treadstone32/rules.mk
@@ -15,4 +15,4 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 LEADER_ENABLE = no
 
-DEFAULT_FOLDER = treadstone32/rev1
+DEFAULT_FOLDER = marksard/treadstone32/rev1
diff --git a/keyboards/marksard/treadstone48/treadstone48/.noci b/keyboards/marksard/treadstone48/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/marksard/treadstone48/treadstone48/.noci
+++ b/keyboards/marksard/treadstone48/.noci
diff --git a/keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c b/keyboards/marksard/treadstone48/common/glcdfont.c
index 003ce1a87b..003ce1a87b 100644
--- a/keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c
+++ b/keyboards/marksard/treadstone48/common/glcdfont.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index 68adbe83a8..68adbe83a8 100644
--- a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/common/oled_helper.h
index 56c2a5b236..56c2a5b236 100644
--- a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h
+++ b/keyboards/marksard/treadstone48/common/oled_helper.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h b/keyboards/marksard/treadstone48/keymaps/default/config.h
index baa4ec8461..a5f68e7a2b 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h
+++ b/keyboards/marksard/treadstone48/keymaps/default/config.h
@@ -46,4 +46,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define RHYMESTONE_RIGHTHAND
 
-#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c"
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
index 00884f3918..00884f3918 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c
+++ b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md b/keyboards/marksard/treadstone48/keymaps/default/readme.md
index bb835d169c..bb835d169c 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md
+++ b/keyboards/marksard/treadstone48/keymaps/default/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md b/keyboards/marksard/treadstone48/keymaps/default/readme_jp.md
index 93aaa190e3..93aaa190e3 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md
+++ b/keyboards/marksard/treadstone48/keymaps/default/readme_jp.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
index 23c4ae9542..23c4ae9542 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk
+++ b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h b/keyboards/marksard/treadstone48/keymaps/like_jis/config.h
index baa4ec8461..a5f68e7a2b 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/config.h
@@ -46,4 +46,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define RHYMESTONE_RIGHTHAND
 
-#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c"
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
index 1e90a2416e..1e90a2416e 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md
index 796df6c4cd..796df6c4cd 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme_jp.md
index 5ae638b0d1..5ae638b0d1 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/readme_jp.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
index 23c4ae9542..23c4ae9542 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/readme.md b/keyboards/marksard/treadstone48/readme.md
index c5f6f8f73f..c5f6f8f73f 100644
--- a/keyboards/marksard/treadstone48/treadstone48/readme.md
+++ b/keyboards/marksard/treadstone48/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/.noci b/keyboards/marksard/treadstone48/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/.noci
+++ b/keyboards/marksard/treadstone48/rev1/.noci
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index ad9de636d0..ad9de636d0 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index 8b90429d00..8b90429d00 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
index 95b58c23db..54ac1f2fce 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
@@ -48,4 +48,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define RHYMESTONE_RIGHTHAND
 
-#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c"
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
index e1f0835881..e1f0835881 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md
index 796df6c4cd..796df6c4cd 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
index 81c5e017ec..81c5e017ec 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
index fafe992d6f..fafe992d6f 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/rev1/rev1.c
index 3daa3e8e81..3daa3e8e81 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c
+++ b/keyboards/marksard/treadstone48/rev1/rev1.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h b/keyboards/marksard/treadstone48/rev1/rev1.h
index 7534796422..7534796422 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h
+++ b/keyboards/marksard/treadstone48/rev1/rev1.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/rev1/rules.mk
index fff00a1b51..fff00a1b51 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk
+++ b/keyboards/marksard/treadstone48/rev1/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 6df1467d8c..6df1467d8c 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 73527155e8..73527155e8 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/rev2/rev2.c
index f7e7bc7702..f7e7bc7702 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c
+++ b/keyboards/marksard/treadstone48/rev2/rev2.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/rev2/rev2.h
index 651468c4a5..651468c4a5 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h
+++ b/keyboards/marksard/treadstone48/rev2/rev2.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk
index d29d9074a0..d29d9074a0 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk
+++ b/keyboards/marksard/treadstone48/rev2/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index 3bf42c85c6..67c171a7b7 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -22,4 +22,4 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
-DEFAULT_FOLDER = treadstone48/rev1
+DEFAULT_FOLDER = marksard/treadstone48/rev1
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
index ea7399dc75..3ae2e899ca 100644
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ b/keyboards/salicylic_acid3/7skb/rules.mk
@@ -15,8 +15,8 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = 7skb/rev1
+DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
index 54265d2285..977ef5bb1d 100644
--- a/keyboards/salicylic_acid3/getta25/rules.mk
+++ b/keyboards/salicylic_acid3/getta25/rules.mk
@@ -18,4 +18,4 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = no
 
-DEFAULT_FOLDER = getta25/rev1
+DEFAULT_FOLDER = salicylic_acid3/getta25/rev1
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
index 5427cabfa2..a6a8510675 100644
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ b/keyboards/salicylic_acid3/jisplit89/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = jisplit89/rev1
+DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 6e848a2815..0e297ebf60 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -21,4 +21,4 @@ RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = naked48/rev1
+DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
index 46aef17c7a..1aefc7b595 100644
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ b/keyboards/salicylic_acid3/naked60/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = naked60/rev1
+DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
index 7de80383e1..db027e3bda 100644
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ b/keyboards/salicylic_acid3/naked64/rules.mk
@@ -21,4 +21,4 @@ USE_I2C = no
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = naked64/rev1
+DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
index e31a7b5c7a..c7920fdfe8 100644
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/rules.mk
@@ -21,6 +21,6 @@ USE_I2C = no
 RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
 
-DEFAULT_FOLDER = setta21/rev1
+DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
 
 LAYOUTS = numpad_6x4
diff --git a/keyboards/ymd75/.noci b/keyboards/ymdk/ymd75/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/ymd75/.noci
+++ b/keyboards/ymdk/ymd75/.noci
diff --git a/keyboards/ymdk/ymd75/rules.mk b/keyboards/ymdk/ymd75/rules.mk
index 756d20c54c..ec66e0734a 100644
--- a/keyboards/ymdk/ymd75/rules.mk
+++ b/keyboards/ymdk/ymd75/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = ymd75/rev1
+DEFAULT_FOLDER = ymdk/ymd75/rev1