117 files changed, 73 insertions, 113 deletions
diff --git a/keyboards/kbd75/rev1/rev1.c b/keyboards/kbd75/rev1/rev1.c
deleted file mode 100644
index 520a869e5..000000000
--- a/keyboards/kbd75/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/kbd75/rev2/rev2.c b/keyboards/kbd75/rev2/rev2.c
deleted file mode 100644
index b1af81707..000000000
--- a/keyboards/kbd75/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
diff --git a/keyboards/kbd75/rules.mk b/keyboards/kbd75/rules.mk
deleted file mode 100644
index ae49271ab..000000000
--- a/keyboards/kbd75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = kbd75/rev1
diff --git a/keyboards/kbd8x/keymaps/default_backlighting/rules.mk b/keyboards/kbd8x/keymaps/default_backlighting/rules.mk
deleted file mode 100644
index 07b9f81fd..000000000
--- a/keyboards/kbd8x/keymaps/default_backlighting/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#Build Options
-
-BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # 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
diff --git a/keyboards/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 03b701b1c..03b701b1c 100644
--- a/keyboards/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
diff --git a/keyboards/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index 31f2f9cf5..31f2f9cf5 100644
--- a/keyboards/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
diff --git a/keyboards/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c
index 360345600..360345600 100644
--- a/keyboards/kbd19x/kbd19x.c
+++ b/keyboards/kbdfans/kbd19x/kbd19x.c
diff --git a/keyboards/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h
index 728c7ca5c..728c7ca5c 100644
--- a/keyboards/kbd19x/kbd19x.h
+++ b/keyboards/kbdfans/kbd19x/kbd19x.h
diff --git a/keyboards/kbd19x/keymaps/default/config.h b/keyboards/kbdfans/kbd19x/keymaps/default/config.h
index 70028a525..70028a525 100644
--- a/keyboards/kbd19x/keymaps/default/config.h
+++ b/keyboards/kbdfans/kbd19x/keymaps/default/config.h
diff --git a/keyboards/kbd19x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
index c80607211..c80607211 100644
--- a/keyboards/kbd19x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
diff --git a/keyboards/kbd19x/keymaps/default/readme.md b/keyboards/kbdfans/kbd19x/keymaps/default/readme.md
index 504a3ed02..504a3ed02 100644
--- a/keyboards/kbd19x/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd19x/keymaps/default/readme.md
diff --git a/keyboards/kbd19x/readme.md b/keyboards/kbdfans/kbd19x/readme.md
index ee4969b00..80b84b5f7 100644
--- a/keyboards/kbd19x/readme.md
+++ b/keyboards/kbdfans/kbd19x/readme.md
@@ -1,4 +1,4 @@
-# kbd19x
+# KBD19x
 
 ![kbd19x](https://i.imgur.com/0hWTEnh.jpg)
 
@@ -14,6 +14,6 @@ Hardware Availability: [KBDfans](https://kbdfans.cn)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd19x:default
+    make kbdfans/kbd19x:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd19x/rules.mk b/keyboards/kbdfans/kbd19x/rules.mk
index 8e50962af..8e50962af 100644
--- a/keyboards/kbd19x/rules.mk
+++ b/keyboards/kbdfans/kbd19x/rules.mk
diff --git a/keyboards/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index cac4ed95d..cac4ed95d 100644
--- a/keyboards/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
diff --git a/keyboards/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index f9952e790..f9952e790 100644
--- a/keyboards/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
diff --git a/keyboards/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c
index 84ada250d..84ada250d 100644
--- a/keyboards/kbd4x/kbd4x.c
+++ b/keyboards/kbdfans/kbd4x/kbd4x.c
diff --git a/keyboards/kbd4x/kbd4x.h b/keyboards/kbdfans/kbd4x/kbd4x.h
index d7a851e3e..d7a851e3e 100644
--- a/keyboards/kbd4x/kbd4x.h
+++ b/keyboards/kbdfans/kbd4x/kbd4x.h
diff --git a/keyboards/kbd4x/keymaps/default/config.h b/keyboards/kbdfans/kbd4x/keymaps/default/config.h
index 7f3bd7dd5..7f3bd7dd5 100644
--- a/keyboards/kbd4x/keymaps/default/config.h
+++ b/keyboards/kbdfans/kbd4x/keymaps/default/config.h
diff --git a/keyboards/kbd4x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd4x/keymaps/default/keymap.c
index ad49b3799..ad49b3799 100644
--- a/keyboards/kbd4x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd4x/keymaps/default/keymap.c
diff --git a/keyboards/kbd4x/keymaps/default/readme.md b/keyboards/kbdfans/kbd4x/keymaps/default/readme.md
index a950a25ac..a950a25ac 100644
--- a/keyboards/kbd4x/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd4x/keymaps/default/readme.md
diff --git a/keyboards/kbd4x/readme.md b/keyboards/kbdfans/kbd4x/readme.md
index 42dc45024..2e2a29290 100644
--- a/keyboards/kbd4x/readme.md
+++ b/keyboards/kbdfans/kbd4x/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: https://kbdfans.cn/collections/diy-kit/products/kbd4x-cus
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd4x:default
+    make kbdfans/kbd4x:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd4x/rules.mk b/keyboards/kbdfans/kbd4x/rules.mk
index 6cfd92bc6..6cfd92bc6 100644
--- a/keyboards/kbd4x/rules.mk
+++ b/keyboards/kbdfans/kbd4x/rules.mk
diff --git a/keyboards/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h
index f9990c0e4..f9990c0e4 100644
--- a/keyboards/kbd66/config.h
+++ b/keyboards/kbdfans/kbd66/config.h
diff --git a/keyboards/kbd66/info.json b/keyboards/kbdfans/kbd66/info.json
index 0308bfab7..0308bfab7 100644
--- a/keyboards/kbd66/info.json
+++ b/keyboards/kbdfans/kbd66/info.json
diff --git a/keyboards/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c
index 7a84b6368..7a84b6368 100644
--- a/keyboards/kbd66/kbd66.c
+++ b/keyboards/kbdfans/kbd66/kbd66.c
diff --git a/keyboards/kbd66/kbd66.h b/keyboards/kbdfans/kbd66/kbd66.h
index 6a4b99ec4..6a4b99ec4 100644
--- a/keyboards/kbd66/kbd66.h
+++ b/keyboards/kbdfans/kbd66/kbd66.h
diff --git a/keyboards/kbd66/keymaps/ansi/config.h b/keyboards/kbdfans/kbd66/keymaps/ansi/config.h
index c7b3d6ecc..c7b3d6ecc 100644
--- a/keyboards/kbd66/keymaps/ansi/config.h
+++ b/keyboards/kbdfans/kbd66/keymaps/ansi/config.h
diff --git a/keyboards/kbd66/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
index d73e5aec8..d73e5aec8 100644
--- a/keyboards/kbd66/keymaps/ansi/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
diff --git a/keyboards/kbd66/keymaps/ansi/readme.md b/keyboards/kbdfans/kbd66/keymaps/ansi/readme.md
index 6ad0d85e0..6ad0d85e0 100644
--- a/keyboards/kbd66/keymaps/ansi/readme.md
+++ b/keyboards/kbdfans/kbd66/keymaps/ansi/readme.md
diff --git a/keyboards/kbd66/keymaps/default/config.h b/keyboards/kbdfans/kbd66/keymaps/default/config.h
index c7b3d6ecc..c7b3d6ecc 100644
--- a/keyboards/kbd66/keymaps/default/config.h
+++ b/keyboards/kbdfans/kbd66/keymaps/default/config.h
diff --git a/keyboards/kbd66/keymaps/default/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
index a969d6510..a969d6510 100644
--- a/keyboards/kbd66/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
diff --git a/keyboards/kbd66/keymaps/default/readme.md b/keyboards/kbdfans/kbd66/keymaps/default/readme.md
index f4ab771a5..f4ab771a5 100644
--- a/keyboards/kbd66/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd66/keymaps/default/readme.md
diff --git a/keyboards/kbd66/keymaps/iso/config.h b/keyboards/kbdfans/kbd66/keymaps/iso/config.h
index c7b3d6ecc..c7b3d6ecc 100644
--- a/keyboards/kbd66/keymaps/iso/config.h
+++ b/keyboards/kbdfans/kbd66/keymaps/iso/config.h
diff --git a/keyboards/kbd66/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
index 5ee64e352..5ee64e352 100644
--- a/keyboards/kbd66/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
diff --git a/keyboards/kbd66/keymaps/iso/readme.md b/keyboards/kbdfans/kbd66/keymaps/iso/readme.md
index f325b741c..f325b741c 100644
--- a/keyboards/kbd66/keymaps/iso/readme.md
+++ b/keyboards/kbdfans/kbd66/keymaps/iso/readme.md
diff --git a/keyboards/kbd66/keymaps/maartenwut/config.h b/keyboards/kbdfans/kbd66/keymaps/maartenwut/config.h
index c7b3d6ecc..c7b3d6ecc 100755
--- a/keyboards/kbd66/keymaps/maartenwut/config.h
+++ b/keyboards/kbdfans/kbd66/keymaps/maartenwut/config.h
diff --git a/keyboards/kbd66/keymaps/maartenwut/keymap.c b/keyboards/kbdfans/kbd66/keymaps/maartenwut/keymap.c
index daeb93477..daeb93477 100755
--- a/keyboards/kbd66/keymaps/maartenwut/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/maartenwut/keymap.c
diff --git a/keyboards/kbd66/keymaps/maartenwut/readme.md b/keyboards/kbdfans/kbd66/keymaps/maartenwut/readme.md
index 24be72c01..24be72c01 100755
--- a/keyboards/kbd66/keymaps/maartenwut/readme.md
+++ b/keyboards/kbdfans/kbd66/keymaps/maartenwut/readme.md
diff --git a/keyboards/kbd66/readme.md b/keyboards/kbdfans/kbd66/readme.md
index 2ac555571..a2e5de015 100644
--- a/keyboards/kbd66/readme.md
+++ b/keyboards/kbdfans/kbd66/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [KBDFans](https://kbdfans.cn), [Massdrop](https://www.mas
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd66:default
+    make kbdfans/kbd66:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
-\ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd66/rules.mk b/keyboards/kbdfans/kbd66/rules.mk
index 45eb6ee37..dcc9b5bbd 100644
--- a/keyboards/kbd66/rules.mk
+++ b/keyboards/kbdfans/kbd66/rules.mk
@@ -60,7 +60,7 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 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 = no       # Enable keyboard backlight functionality on B7 by default
+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
diff --git a/keyboards/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index f54ffa1ca..f54ffa1ca 100644
--- a/keyboards/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
diff --git a/keyboards/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
index e6999f6af..e6999f6af 100644
--- a/keyboards/kbd67/hotswap/hotswap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
diff --git a/keyboards/kbd67/hotswap/hotswap.h b/keyboards/kbdfans/kbd67/hotswap/hotswap.h
index 57220050b..57220050b 100644
--- a/keyboards/kbd67/hotswap/hotswap.h
+++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.h
diff --git a/keyboards/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json
index 9f23a5f34..9f23a5f34 100644
--- a/keyboards/kbd67/hotswap/info.json
+++ b/keyboards/kbdfans/kbd67/hotswap/info.json
diff --git a/keyboards/kbd67/hotswap/keymaps/default/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/config.h
index 26c6d6ade..26c6d6ade 100644
--- a/keyboards/kbd67/hotswap/keymaps/default/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/config.h
diff --git a/keyboards/kbd67/hotswap/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c
index 536963011..536963011 100644
--- a/keyboards/kbd67/hotswap/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c
diff --git a/keyboards/kbd67/hotswap/keymaps/default/readme.md b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md
index 7e681294f..7e681294f 100644
--- a/keyboards/kbd67/hotswap/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md
diff --git a/keyboards/kbd67/hotswap/keymaps/zunger/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/config.h
index cc06440e0..cc06440e0 100644
--- a/keyboards/kbd67/hotswap/keymaps/zunger/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/config.h
diff --git a/keyboards/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index 0d542bf84..0d542bf84 100644
--- a/keyboards/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
diff --git a/keyboards/kbd67/hotswap/keymaps/zunger/readme.md b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/readme.md
index 923a4824a..923a4824a 100644
--- a/keyboards/kbd67/hotswap/keymaps/zunger/readme.md
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/readme.md
diff --git a/keyboards/kbd67/hotswap/keymaps/zunger/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/rules.mk
index a61cfa33f..a61cfa33f 100644
--- a/keyboards/kbd67/hotswap/keymaps/zunger/rules.mk
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/rules.mk
diff --git a/keyboards/kbd67/hotswap/readme.md b/keyboards/kbdfans/kbd67/hotswap/readme.md
index 6b4070593..6b4070593 100644
--- a/keyboards/kbd67/hotswap/readme.md
+++ b/keyboards/kbdfans/kbd67/hotswap/readme.md
diff --git a/keyboards/kbd67/hotswap/rules.mk b/keyboards/kbdfans/kbd67/hotswap/rules.mk
index f8667d280..f8667d280 100644
--- a/keyboards/kbd67/hotswap/rules.mk
+++ b/keyboards/kbdfans/kbd67/hotswap/rules.mk
diff --git a/keyboards/kbd67/readme.md b/keyboards/kbdfans/kbd67/readme.md
index cdaf7e922..7ee3c6adb 100644
--- a/keyboards/kbd67/readme.md
+++ b/keyboards/kbdfans/kbd67/readme.md
@@ -9,7 +9,7 @@ Hardware Availability: KBDFans
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd67/rev1:default
-    make kbd67/hotswap:default
+    make kbdfans/kbd67/rev1:default
+    make kbdfans/kbd67/hotswap:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 2a1e558ab..2a1e558ab 100644
--- a/keyboards/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
diff --git a/keyboards/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index 70a926a7f..70a926a7f 100644
--- a/keyboards/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
diff --git a/keyboards/kbd67/rev1/keymaps/default/config.h b/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h
index a3ed4f762..a3ed4f762 100644
--- a/keyboards/kbd67/rev1/keymaps/default/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h
diff --git a/keyboards/kbd67/rev1/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
index 89fa9a534..89fa9a534 100644
--- a/keyboards/kbd67/rev1/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
diff --git a/keyboards/kbd67/rev1/keymaps/default/readme.md b/keyboards/kbdfans/kbd67/rev1/keymaps/default/readme.md
index 2cb43c5e1..2cb43c5e1 100644
--- a/keyboards/kbd67/rev1/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/readme.md
diff --git a/keyboards/kbd67/rev1/readme.md b/keyboards/kbdfans/kbd67/rev1/readme.md
index ab5209646..ab5209646 100644
--- a/keyboards/kbd67/rev1/readme.md
+++ b/keyboards/kbdfans/kbd67/rev1/readme.md
diff --git a/keyboards/kbd67/rev1/rev1.c b/keyboards/kbdfans/kbd67/rev1/rev1.c
index 94cb9e553..94cb9e553 100644
--- a/keyboards/kbd67/rev1/rev1.c
+++ b/keyboards/kbdfans/kbd67/rev1/rev1.c
diff --git a/keyboards/kbd67/rev1/rev1.h b/keyboards/kbdfans/kbd67/rev1/rev1.h
index 4ee136393..4ee136393 100644
--- a/keyboards/kbd67/rev1/rev1.h
+++ b/keyboards/kbdfans/kbd67/rev1/rev1.h
diff --git a/keyboards/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk
index 0d7c14ad4..0d7c14ad4 100644
--- a/keyboards/kbd67/rev1/rules.mk
+++ b/keyboards/kbdfans/kbd67/rev1/rules.mk
diff --git a/keyboards/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 4a3fb881b..4a3fb881b 100644
--- a/keyboards/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
diff --git a/keyboards/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json
index 201c6bd3c..201c6bd3c 100644
--- a/keyboards/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
diff --git a/keyboards/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c
index f558af030..f558af030 100644
--- a/keyboards/kbd6x/kbd6x.c
+++ b/keyboards/kbdfans/kbd6x/kbd6x.c
diff --git a/keyboards/kbd6x/kbd6x.h b/keyboards/kbdfans/kbd6x/kbd6x.h
index 3d0c70f77..3d0c70f77 100644
--- a/keyboards/kbd6x/kbd6x.h
+++ b/keyboards/kbdfans/kbd6x/kbd6x.h
diff --git a/keyboards/kbd6x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
index e2e96fc63..e2e96fc63 100644
--- a/keyboards/kbd6x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
diff --git a/keyboards/kbd6x/keymaps/default/readme.md b/keyboards/kbdfans/kbd6x/keymaps/default/readme.md
index c416cd8fa..c416cd8fa 100644
--- a/keyboards/kbd6x/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd6x/keymaps/default/readme.md
diff --git a/keyboards/kbd6x/keymaps/hhkb-default-improved/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
index 80c22e5d9..80c22e5d9 100644
--- a/keyboards/kbd6x/keymaps/hhkb-default-improved/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c
diff --git a/keyboards/kbd6x/keymaps/hhkb-default-improved/readme.md b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md
index be22dd16c..be22dd16c 100644
--- a/keyboards/kbd6x/keymaps/hhkb-default-improved/readme.md
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md
diff --git a/keyboards/kbd6x/keymaps/hhkb-default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
index 03153b67a..03153b67a 100644
--- a/keyboards/kbd6x/keymaps/hhkb-default/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c
diff --git a/keyboards/kbd6x/keymaps/hhkb-default/readme.md b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md
index cf93c3553..cf93c3553 100644
--- a/keyboards/kbd6x/keymaps/hhkb-default/readme.md
+++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md
diff --git a/keyboards/kbd6x/keymaps/konstantin/config.h b/keyboards/kbdfans/kbd6x/keymaps/konstantin/config.h
index 16387fa2f..16387fa2f 100644
--- a/keyboards/kbd6x/keymaps/konstantin/config.h
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/config.h
diff --git a/keyboards/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index fa324be9a..fa324be9a 100644
--- a/keyboards/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
diff --git a/keyboards/kbd6x/keymaps/konstantin/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
index a45a631dc..a45a631dc 100644
--- a/keyboards/kbd6x/keymaps/konstantin/rules.mk
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
diff --git a/keyboards/kbd6x/keymaps/othi/config.h b/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
index 42f68b435..42f68b435 100644
--- a/keyboards/kbd6x/keymaps/othi/config.h
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
diff --git a/keyboards/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
index 1e0fc8ad7..1e0fc8ad7 100644
--- a/keyboards/kbd6x/keymaps/othi/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
diff --git a/keyboards/kbd6x/keymaps/othi/readme.md b/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md
index 95be36d05..95be36d05 100644
--- a/keyboards/kbd6x/keymaps/othi/readme.md
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md
diff --git a/keyboards/kbd6x/keymaps/othi/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
index 9cda4109d..9cda4109d 100644
--- a/keyboards/kbd6x/keymaps/othi/rules.mk
+++ b/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
diff --git a/keyboards/kbd6x/readme.md b/keyboards/kbdfans/kbd6x/readme.md
index 0e8e86562..1728c8c21 100644
--- a/keyboards/kbd6x/readme.md
+++ b/keyboards/kbdfans/kbd6x/readme.md
@@ -8,6 +8,6 @@ Hardware Availability: [KBDFans](https://kbdfans.cn/products/kbd6x-wkl-hot-swap-
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd6x:default
+    make kbdfans/kbd6x:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd6x/rules.mk b/keyboards/kbdfans/kbd6x/rules.mk
index e9b61a76d..e9b61a76d 100644
--- a/keyboards/kbd6x/rules.mk
+++ b/keyboards/kbdfans/kbd6x/rules.mk
diff --git a/keyboards/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 6f0cd86de..6f0cd86de 100644
--- a/keyboards/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
diff --git a/keyboards/kbd75/kbd75.c b/keyboards/kbdfans/kbd75/kbd75.c
index 9f6e545ca..9f6e545ca 100644
--- a/keyboards/kbd75/kbd75.c
+++ b/keyboards/kbdfans/kbd75/kbd75.c
diff --git a/keyboards/kbd75/kbd75.h b/keyboards/kbdfans/kbd75/kbd75.h
index 0798ad099..8e6f09450 100644
--- a/keyboards/kbd75/kbd75.h
+++ b/keyboards/kbdfans/kbd75/kbd75.h
@@ -3,11 +3,11 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_kbd75_rev1
+#ifdef KEYBOARD_kbdfans_kbd75_rev1
     #include "rev1.h"
 #endif
 
-#ifdef KEYBOARD_kbd75_rev2
+#ifdef KEYBOARD_kbdfans_kbd75_rev2
     #include "../rev1/rev1.h"
     #include "rev2.h"
 #endif
diff --git a/keyboards/kbd75/keymaps/adit/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
index 3c70d9786..b7cae4810 100644
--- a/keyboards/kbd75/keymaps/adit/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
@@ -2,8 +2,6 @@
 
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
@@ -45,40 +43,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-	} else {
-		DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_KANA)) {
-
-	} else {
-
-	}
-
-}
-
 enum function_id {
     SHIFT_ESC,
 };
diff --git a/keyboards/kbd75/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75/keymaps/default/keymap.c
index 3074d8692..839030aaa 100644
--- a/keyboards/kbd75/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/default/keymap.c
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [0] = LAYOUT(
@@ -22,12 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
   ),
 };
-
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-    } else {
-        DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-    }
-}
-
diff --git a/keyboards/kbd75/keymaps/edulpn/README.md b/keyboards/kbdfans/kbd75/keymaps/edulpn/README.md
index 57989ff9b..57989ff9b 100644
--- a/keyboards/kbd75/keymaps/edulpn/README.md
+++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/README.md
diff --git a/keyboards/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
index 78a501ec4..78a501ec4 100644
--- a/keyboards/kbd75/keymaps/edulpn/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
diff --git a/keyboards/kbd75/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c
index 230f1dd73..0b7c701a3 100644
--- a/keyboards/kbd75/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[0] = LAYOUT(
@@ -22,11 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
   )
 };
-
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-	} else {
-		DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-	}
-}
diff --git a/keyboards/kbd75/keymaps/smt/keymap.c b/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
index a29a7e8a9..edf01c854 100644
--- a/keyboards/kbd75/keymaps/smt/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
@@ -12,10 +12,6 @@ enum planck_keycodes {
   DVORAK
 };
 
-// Helpful defines
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Custom macros
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
diff --git a/keyboards/kbd75/keymaps/spacemanspiff/keymap.c b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
index 82a2ad9be..05e7c5671 100644
--- a/keyboards/kbd75/keymaps/spacemanspiff/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
@@ -39,12 +39,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 };
-
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-    } else {
-        DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-    }
-}
-
diff --git a/keyboards/kbd75/keymaps/spacemanspiff/readme.md b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/readme.md
index 6a78140a3..6a78140a3 100644
--- a/keyboards/kbd75/keymaps/spacemanspiff/readme.md
+++ b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/readme.md
diff --git a/keyboards/kbd75/readme.md b/keyboards/kbdfans/kbd75/readme.md
index 4c93a8fbe..89fe27416 100644
--- a/keyboards/kbd75/readme.md
+++ b/keyboards/kbdfans/kbd75/readme.md
@@ -1,8 +1,7 @@
-KBD75
-===
+# KBD75
 
 Keyboard Maintainer: QMK Community  
-Hardware Supported: KBD75 PCB rev 1 and 2 
+Hardware Supported: KBD75 PCB rev 1 and 2  
 Hardware Availability: https://kbdfans.myshopify.com/products/kbd75-keyboard-set?variant=35638534029
 
 The KBD75 has two revisions. Revision 2 has a USB C port and allows a numpad layout. `.hex` files made
@@ -12,7 +11,7 @@ different areas.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd75/rev1:default
-    make kbd75/rev2:default
+    make kbdfans/kbd75/rev1:default
+    make kbdfans/kbd75/rev2:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index 4f963c2d8..4f963c2d8 100644
--- a/keyboards/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.c b/keyboards/kbdfans/kbd75/rev1/rev1.c
new file mode 100644
index 000000000..9ed08602a
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rev1/rev1.c
@@ -0,0 +1,12 @@
+#include "rev1.h"
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    writePinHigh(B2);
+  } else {
+    writePinLow(B2);
+  }
+
+	led_set_user(usb_led);
+}
diff --git a/keyboards/kbd75/rev1/rev1.h b/keyboards/kbdfans/kbd75/rev1/rev1.h
index fd3e6e488..fd3e6e488 100644
--- a/keyboards/kbd75/rev1/rev1.h
+++ b/keyboards/kbdfans/kbd75/rev1/rev1.h
diff --git a/keyboards/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk
index 9c4082da2..9c4082da2 100644
--- a/keyboards/kbd75/rev1/rules.mk
+++ b/keyboards/kbdfans/kbd75/rev1/rules.mk
diff --git a/keyboards/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index 31a5d3117..31a5d3117 100644
--- a/keyboards/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.c b/keyboards/kbdfans/kbd75/rev2/rev2.c
new file mode 100644
index 000000000..bec65d6a6
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rev2/rev2.c
@@ -0,0 +1,12 @@
+#include "rev2.h"
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    writePinHigh(B2);
+  } else {
+    writePinLow(B2);
+  }
+
+	led_set_user(usb_led);
+}
diff --git a/keyboards/kbd75/rev2/rev2.h b/keyboards/kbdfans/kbd75/rev2/rev2.h
index f2a1fead2..f2a1fead2 100644
--- a/keyboards/kbd75/rev2/rev2.h
+++ b/keyboards/kbdfans/kbd75/rev2/rev2.h
diff --git a/keyboards/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk
index 9c4082da2..9c4082da2 100644
--- a/keyboards/kbd75/rev2/rules.mk
+++ b/keyboards/kbdfans/kbd75/rev2/rules.mk
diff --git a/keyboards/kbdfans/kbd75/rules.mk b/keyboards/kbdfans/kbd75/rules.mk
new file mode 100644
index 000000000..5c4617131
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = kbdfans/kbd75/rev1
diff --git a/keyboards/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index dca9b40ee..dca9b40ee 100644
--- a/keyboards/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
diff --git a/keyboards/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json
index fe94f1b3a..fe94f1b3a 100644
--- a/keyboards/kbd8x/info.json
+++ b/keyboards/kbdfans/kbd8x/info.json
diff --git a/keyboards/kbd8x/kbd8x.c b/keyboards/kbdfans/kbd8x/kbd8x.c
index 97c2e74e3..97c2e74e3 100644
--- a/keyboards/kbd8x/kbd8x.c
+++ b/keyboards/kbdfans/kbd8x/kbd8x.c
diff --git a/keyboards/kbd8x/kbd8x.h b/keyboards/kbdfans/kbd8x/kbd8x.h
index f28b8ca7a..f28b8ca7a 100644
--- a/keyboards/kbd8x/kbd8x.h
+++ b/keyboards/kbdfans/kbd8x/kbd8x.h
diff --git a/keyboards/kbd8x/keymaps/default/config.h b/keyboards/kbdfans/kbd8x/keymaps/default/config.h
index fa7db0bc1..fa7db0bc1 100644
--- a/keyboards/kbd8x/keymaps/default/config.h
+++ b/keyboards/kbdfans/kbd8x/keymaps/default/config.h
diff --git a/keyboards/kbd8x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
index 3d315035b..a7dcd5518 100644
--- a/keyboards/kbd8x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c
@@ -25,6 +25,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                   KC_UP, \
       KC_LCTL, KC_LGUI, KC_LALT,         KC_SPC,                 KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RGHT),
 
+    [1] = LAYOUT_all(
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,                    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, RESET, RESET,      KC_TRNS, KC_TRNS, KC_TRNS, \
+      KC_TRNS, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, 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, 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),
+
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/keyboards/kbd8x/keymaps/default/readme.md b/keyboards/kbdfans/kbd8x/keymaps/default/readme.md
index 773a3dfba..773a3dfba 100644
--- a/keyboards/kbd8x/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbd8x/keymaps/default/readme.md
diff --git a/keyboards/kbd8x/keymaps/default_backlighting/config.h b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/config.h
index fa7db0bc1..fa7db0bc1 100644
--- a/keyboards/kbd8x/keymaps/default_backlighting/config.h
+++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/config.h
diff --git a/keyboards/kbd8x/keymaps/default_backlighting/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
index e664575d5..e664575d5 100644
--- a/keyboards/kbd8x/keymaps/default_backlighting/keymap.c
+++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c
diff --git a/keyboards/kbd8x/keymaps/default_backlighting/readme.md b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/readme.md
index 773a3dfba..773a3dfba 100644
--- a/keyboards/kbd8x/keymaps/default_backlighting/readme.md
+++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/readme.md
diff --git a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/rules.mk b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/rules.mk
new file mode 100644
index 000000000..d98bb1cb1
--- /dev/null
+++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/rules.mk
@@ -0,0 +1 @@
+#Build Options
diff --git a/keyboards/kbd8x/readme.md b/keyboards/kbdfans/kbd8x/readme.md
index 8c50af68f..9f8555560 100644
--- a/keyboards/kbd8x/readme.md
+++ b/keyboards/kbdfans/kbd8x/readme.md
@@ -1,4 +1,4 @@
-# KBD 8X
+# KBD8X
 
 ![kbd8x](imgur.com image replace me!)
 
@@ -10,6 +10,6 @@ Hardware Availability: [KBDFans](https://kbdfans.cn/blogs/updates/kbd-8x-update-
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbd8x:default
+    make kbdfans/kbd8x:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kbd8x/rules.mk b/keyboards/kbdfans/kbd8x/rules.mk
index e5925463e..be7577564 100644
--- a/keyboards/kbd8x/rules.mk
+++ b/keyboards/kbdfans/kbd8x/rules.mk
@@ -60,8 +60,8 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 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 = no       # Enable keyboard backlight functionality on B7 by default
-RGBLIGHT_ENABLE ?= yes      # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 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
diff --git a/keyboards/kbdfans/readme.md b/keyboards/kbdfans/readme.md
new file mode 100644
index 000000000..1ba5ed3d1
--- /dev/null
+++ b/keyboards/kbdfans/readme.md
@@ -0,0 +1,17 @@
+# KBDFans
+
+KBDfans is a keyboard retailer located in China. 
+
+## Online Stores
+
+**Website:** https://kbdfans.cn/  
+**AliExpress:** https://kbdfans.aliexpress.com/  
+**eBay:** https://www.ebay.com/str/KBDfans/  
+**Taobao:** https://yikewaishe.taobao.com/  
+
+## Social Media
+
+**Discord:** https://discord.gg/HMZKDhn  
+**Facebook:** https://www.facebook.com/KBDfanskeyboard/  
+**Instagram:** https://www.instagram.com/kbdfans.cn/  
+