104 files changed, 35 insertions, 26 deletions
diff --git a/keyboards/clueboard_17/clueboard_17.c b/keyboards/clueboard/17/clueboard_17.c
index 04cc812178..04cc812178 100644
--- a/keyboards/clueboard_17/clueboard_17.c
+++ b/keyboards/clueboard/17/clueboard_17.c
diff --git a/keyboards/clueboard_17/clueboard_17.h b/keyboards/clueboard/17/clueboard_17.h
index 5e4a5999e2..5e4a5999e2 100644
--- a/keyboards/clueboard_17/clueboard_17.h
+++ b/keyboards/clueboard/17/clueboard_17.h
diff --git a/keyboards/clueboard_17/config.h b/keyboards/clueboard/17/config.h
index bd64dfd27d..bd64dfd27d 100644
--- a/keyboards/clueboard_17/config.h
+++ b/keyboards/clueboard/17/config.h
diff --git a/keyboards/clueboard_17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
index 7a0d518515..7a0d518515 100644
--- a/keyboards/clueboard_17/keymaps/default/keymap.c
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
diff --git a/keyboards/clueboard_17/readme.md b/keyboards/clueboard/17/readme.md
index f3590fdbb5..877adc7842 100644
--- a/keyboards/clueboard_17/readme.md
+++ b/keyboards/clueboard/17/readme.md
@@ -1,15 +1,16 @@
-# Cluepad
+# Clueboard 17% (Formerly Cluepad)
 
-![Cluepad](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
+![Clueboard 17%](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
 
 A basic 17 key numpad PCB.
 
 * Keyboard Maintainer: [Zach White](https://github.com/skullydazed)
-* Hardware Supported: Cluepad PCB 1.0
+* Hardware Supported:
+  * Cluepad PCB 1.0
 * Hardware Availability: [clueboard.co](https://clueboard.co/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard_17:default
+    make clueboard/17:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/clueboard_17/rules.mk b/keyboards/clueboard/17/rules.mk
index 264aba044d..264aba044d 100644
--- a/keyboards/clueboard_17/rules.mk
+++ b/keyboards/clueboard/17/rules.mk
diff --git a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.c b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
index 897f20a887..897f20a887 100644
--- a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.c
+++ b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
diff --git a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.h b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
index 145d569f09..145d569f09 100644
--- a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.h
+++ b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
diff --git a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.mk
index 43377629a3..43377629a3 100644
--- a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk
+++ b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.mk
diff --git a/keyboards/clueboard_60/bootloader_defs.h b/keyboards/clueboard/60/bootloader_defs.h
index 3b0e9d20a6..3b0e9d20a6 100644
--- a/keyboards/clueboard_60/bootloader_defs.h
+++ b/keyboards/clueboard/60/bootloader_defs.h
diff --git a/keyboards/clueboard_60/chconf.h b/keyboards/clueboard/60/chconf.h
index 5a9b833107..5a9b833107 100644
--- a/keyboards/clueboard_60/chconf.h
+++ b/keyboards/clueboard/60/chconf.h
diff --git a/keyboards/clueboard_60/clueboard_60.c b/keyboards/clueboard/60/clueboard_60.c
index a0b74db72f..a0b74db72f 100644
--- a/keyboards/clueboard_60/clueboard_60.c
+++ b/keyboards/clueboard/60/clueboard_60.c
diff --git a/keyboards/clueboard_60/clueboard_60.h b/keyboards/clueboard/60/clueboard_60.h
index ffff18f9e4..ffff18f9e4 100644
--- a/keyboards/clueboard_60/clueboard_60.h
+++ b/keyboards/clueboard/60/clueboard_60.h
diff --git a/keyboards/clueboard_60/config.h b/keyboards/clueboard/60/config.h
index 333698a087..333698a087 100644
--- a/keyboards/clueboard_60/config.h
+++ b/keyboards/clueboard/60/config.h
diff --git a/keyboards/clueboard_60/halconf.h b/keyboards/clueboard/60/halconf.h
index 254470cbd0..254470cbd0 100644
--- a/keyboards/clueboard_60/halconf.h
+++ b/keyboards/clueboard/60/halconf.h
diff --git a/keyboards/clueboard_60/keymaps/default/keymap.c b/keyboards/clueboard/60/keymaps/default/keymap.c
index e662057f08..e662057f08 100644
--- a/keyboards/clueboard_60/keymaps/default/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default/keymap.c
diff --git a/keyboards/clueboard_60/keymaps/default/readme.md b/keyboards/clueboard/60/keymaps/default/readme.md
index 32d4bfba61..32d4bfba61 100644
--- a/keyboards/clueboard_60/keymaps/default/readme.md
+++ b/keyboards/clueboard/60/keymaps/default/readme.md
diff --git a/keyboards/clueboard_60/keymaps/default_aek/keymap.c b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
index d2d3db7720..d2d3db7720 100644
--- a/keyboards/clueboard_60/keymaps/default_aek/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
diff --git a/keyboards/clueboard_60/keymaps/default_aek/readme.md b/keyboards/clueboard/60/keymaps/default_aek/readme.md
index cdec241609..cdec241609 100644
--- a/keyboards/clueboard_60/keymaps/default_aek/readme.md
+++ b/keyboards/clueboard/60/keymaps/default_aek/readme.md
diff --git a/keyboards/clueboard_60/led.c b/keyboards/clueboard/60/led.c
index fdf244ad50..fdf244ad50 100644
--- a/keyboards/clueboard_60/led.c
+++ b/keyboards/clueboard/60/led.c
diff --git a/keyboards/clueboard_60/matrix.c b/keyboards/clueboard/60/matrix.c
index 76a15ca7ef..76a15ca7ef 100644
--- a/keyboards/clueboard_60/matrix.c
+++ b/keyboards/clueboard/60/matrix.c
diff --git a/keyboards/clueboard_60/mcuconf.h b/keyboards/clueboard/60/mcuconf.h
index 94cb540ec9..94cb540ec9 100644
--- a/keyboards/clueboard_60/mcuconf.h
+++ b/keyboards/clueboard/60/mcuconf.h
diff --git a/keyboards/clueboard_60/readme.md b/keyboards/clueboard/60/readme.md
index 7221c82039..b81d70d0c3 100644
--- a/keyboards/clueboard_60/readme.md
+++ b/keyboards/clueboard/60/readme.md
@@ -9,6 +9,6 @@ A fully customizable 60% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard_60:default:dfu-util
+    make clueboard/60:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/clueboard_60/rules.mk b/keyboards/clueboard/60/rules.mk
index 01b7dad9b3..01b7dad9b3 100644
--- a/keyboards/clueboard_60/rules.mk
+++ b/keyboards/clueboard/60/rules.mk
diff --git a/keyboards/clueboard_66/clueboard_66.c b/keyboards/clueboard/66/clueboard_66.c
index 1e000e62de..1e000e62de 100644
--- a/keyboards/clueboard_66/clueboard_66.c
+++ b/keyboards/clueboard/66/clueboard_66.c
diff --git a/keyboards/clueboard_66/clueboard_66.h b/keyboards/clueboard/66/clueboard_66.h
index c8989983d0..c8989983d0 100644
--- a/keyboards/clueboard_66/clueboard_66.h
+++ b/keyboards/clueboard/66/clueboard_66.h
diff --git a/keyboards/clueboard_66/config.h b/keyboards/clueboard/66/config.h
index eaf3e073fb..dff5c96d0f 100644
--- a/keyboards/clueboard_66/config.h
+++ b/keyboards/clueboard/66/config.h
@@ -15,8 +15,8 @@ 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
+#ifndef CLUEBOARD_66_CONFIG_H
+#define CLUEBOARD_66_CONFIG_H
 
 #include "config_common.h"
 
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/Makefile b/keyboards/clueboard/66/keymaps/bloodlvst/Makefile
index b1c2f32f6a..b1c2f32f6a 100644
--- a/keyboards/clueboard_66/keymaps/bloodlvst/Makefile
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/Makefile
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/config.h b/keyboards/clueboard/66/keymaps/bloodlvst/config.h
index 320401dbda..320401dbda 100644
--- a/keyboards/clueboard_66/keymaps/bloodlvst/config.h
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/config.h
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index bc50afa2f2..bc50afa2f2 100644
--- a/keyboards/clueboard_66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/readme.md b/keyboards/clueboard/66/keymaps/bloodlvst/readme.md
index ee287ca476..ee287ca476 100644
--- a/keyboards/clueboard_66/keymaps/bloodlvst/readme.md
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/readme.md
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/rules.mk b/keyboards/clueboard/66/keymaps/bloodlvst/rules.mk
index b1c2f32f6a..b1c2f32f6a 100644
--- a/keyboards/clueboard_66/keymaps/bloodlvst/rules.mk
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index 78eb43390e..78eb43390e 100644
--- a/keyboards/clueboard_66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/caps_fn/readme.md b/keyboards/clueboard/66/keymaps/caps_fn/readme.md
index 47a530a80b..47a530a80b 100644
--- a/keyboards/clueboard_66/keymaps/caps_fn/readme.md
+++ b/keyboards/clueboard/66/keymaps/caps_fn/readme.md
diff --git a/keyboards/clueboard_66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
index b2921cca24..b2921cca24 100644
--- a/keyboards/clueboard_66/keymaps/colemak/keymap.c
+++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c
index ad623c5480..ad623c5480 100644
--- a/keyboards/clueboard_66/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66/keymaps/default/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/default/readme.md b/keyboards/clueboard/66/keymaps/default/readme.md
index 019131aeb1..019131aeb1 100644
--- a/keyboards/clueboard_66/keymaps/default/readme.md
+++ b/keyboards/clueboard/66/keymaps/default/readme.md
diff --git a/keyboards/clueboard_66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
index dd38e904c2..dd38e904c2 100644
--- a/keyboards/clueboard_66/keymaps/jokrik/keymap.c
+++ b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/jokrik/readme.md b/keyboards/clueboard/66/keymaps/jokrik/readme.md
index a845e65f1b..a845e65f1b 100644
--- a/keyboards/clueboard_66/keymaps/jokrik/readme.md
+++ b/keyboards/clueboard/66/keymaps/jokrik/readme.md
diff --git a/keyboards/clueboard_66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
index 8c3568e593..8c3568e593 100644
--- a/keyboards/clueboard_66/keymaps/mac_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/mac_optimized/readme.md b/keyboards/clueboard/66/keymaps/mac_optimized/readme.md
index 282da369dc..282da369dc 100644
--- a/keyboards/clueboard_66/keymaps/mac_optimized/readme.md
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/readme.md
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/Makefile b/keyboards/clueboard/66/keymaps/magicmonty/Makefile
index 289018f343..289018f343 100644
--- a/keyboards/clueboard_66/keymaps/magicmonty/Makefile
+++ b/keyboards/clueboard/66/keymaps/magicmonty/Makefile
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/config.h b/keyboards/clueboard/66/keymaps/magicmonty/config.h
index d933fa9979..d933fa9979 100644
--- a/keyboards/clueboard_66/keymaps/magicmonty/config.h
+++ b/keyboards/clueboard/66/keymaps/magicmonty/config.h
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index 6df7d78697..6df7d78697 100644
--- a/keyboards/clueboard_66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/readme.md b/keyboards/clueboard/66/keymaps/magicmonty/readme.md
index e24212d04f..e24212d04f 100644
--- a/keyboards/clueboard_66/keymaps/magicmonty/readme.md
+++ b/keyboards/clueboard/66/keymaps/magicmonty/readme.md
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/rules.mk b/keyboards/clueboard/66/keymaps/magicmonty/rules.mk
index 289018f343..289018f343 100644
--- a/keyboards/clueboard_66/keymaps/magicmonty/rules.mk
+++ b/keyboards/clueboard/66/keymaps/magicmonty/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
index 260f974773..260f974773 100644
--- a/keyboards/clueboard_66/keymaps/maximised/keymap.c
+++ b/keyboards/clueboard/66/keymaps/maximised/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/maximised/readme.md b/keyboards/clueboard/66/keymaps/maximised/readme.md
index fc82e68793..fc82e68793 100644
--- a/keyboards/clueboard_66/keymaps/maximised/readme.md
+++ b/keyboards/clueboard/66/keymaps/maximised/readme.md
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/Makefile b/keyboards/clueboard/66/keymaps/mouse_keys/Makefile
index 6c605daecf..6c605daecf 100644
--- a/keyboards/clueboard_66/keymaps/mouse_keys/Makefile
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/Makefile
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index 15e068aa14..15e068aa14 100644
--- a/keyboards/clueboard_66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/readme.md b/keyboards/clueboard/66/keymaps/mouse_keys/readme.md
index 7fb038205a..7fb038205a 100644
--- a/keyboards/clueboard_66/keymaps/mouse_keys/readme.md
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/readme.md
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/rules.mk b/keyboards/clueboard/66/keymaps/mouse_keys/rules.mk
index 6c605daecf..6c605daecf 100644
--- a/keyboards/clueboard_66/keymaps/mouse_keys/rules.mk
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/serubin/Makefile b/keyboards/clueboard/66/keymaps/serubin/Makefile
index ba997f8696..ba997f8696 100644
--- a/keyboards/clueboard_66/keymaps/serubin/Makefile
+++ b/keyboards/clueboard/66/keymaps/serubin/Makefile
diff --git a/keyboards/clueboard_66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
index 112670d662..112670d662 100644
--- a/keyboards/clueboard_66/keymaps/serubin/keymap.c
+++ b/keyboards/clueboard/66/keymaps/serubin/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/serubin/readme.md b/keyboards/clueboard/66/keymaps/serubin/readme.md
index 78eef53523..78eef53523 100644
--- a/keyboards/clueboard_66/keymaps/serubin/readme.md
+++ b/keyboards/clueboard/66/keymaps/serubin/readme.md
diff --git a/keyboards/clueboard_66/keymaps/serubin/rules.mk b/keyboards/clueboard/66/keymaps/serubin/rules.mk
index ba997f8696..ba997f8696 100644
--- a/keyboards/clueboard_66/keymaps/serubin/rules.mk
+++ b/keyboards/clueboard/66/keymaps/serubin/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
index 0d57e38a10..0d57e38a10 100644
--- a/keyboards/clueboard_66/keymaps/shift_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/shift_fn/readme.md b/keyboards/clueboard/66/keymaps/shift_fn/readme.md
index 4bd920ad4e..4bd920ad4e 100644
--- a/keyboards/clueboard_66/keymaps/shift_fn/readme.md
+++ b/keyboards/clueboard/66/keymaps/shift_fn/readme.md
diff --git a/keyboards/clueboard_66/keymaps/skully/keymap.c b/keyboards/clueboard/66/keymaps/skully/keymap.c
index 2e23948b23..2e23948b23 100644
--- a/keyboards/clueboard_66/keymaps/skully/keymap.c
+++ b/keyboards/clueboard/66/keymaps/skully/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/skully/readme.md b/keyboards/clueboard/66/keymaps/skully/readme.md
index b9ad1b09a9..b9ad1b09a9 100644
--- a/keyboards/clueboard_66/keymaps/skully/readme.md
+++ b/keyboards/clueboard/66/keymaps/skully/readme.md
diff --git a/keyboards/clueboard_66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
index c61b32f8b6..c61b32f8b6 100644
--- a/keyboards/clueboard_66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/smt/readme.md b/keyboards/clueboard/66/keymaps/smt/readme.md
index 7fc0f0248d..7fc0f0248d 100644
--- a/keyboards/clueboard_66/keymaps/smt/readme.md
+++ b/keyboards/clueboard/66/keymaps/smt/readme.md
diff --git a/keyboards/clueboard_66/keymaps/tetris/Makefile b/keyboards/clueboard/66/keymaps/tetris/Makefile
index 4613531296..4613531296 100644
--- a/keyboards/clueboard_66/keymaps/tetris/Makefile
+++ b/keyboards/clueboard/66/keymaps/tetris/Makefile
diff --git a/keyboards/clueboard_66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index 4bf2465a9f..4bf2465a9f 100644
--- a/keyboards/clueboard_66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/tetris/readme.md b/keyboards/clueboard/66/keymaps/tetris/readme.md
index 20e97fb19f..20e97fb19f 100644
--- a/keyboards/clueboard_66/keymaps/tetris/readme.md
+++ b/keyboards/clueboard/66/keymaps/tetris/readme.md
diff --git a/keyboards/clueboard_66/keymaps/tetris/rules.mk b/keyboards/clueboard/66/keymaps/tetris/rules.mk
index 4613531296..4613531296 100644
--- a/keyboards/clueboard_66/keymaps/tetris/rules.mk
+++ b/keyboards/clueboard/66/keymaps/tetris/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/tetris/tetris_text.c b/keyboards/clueboard/66/keymaps/tetris/tetris_text.c
index 1376ead005..1376ead005 100644
--- a/keyboards/clueboard_66/keymaps/tetris/tetris_text.c
+++ b/keyboards/clueboard/66/keymaps/tetris/tetris_text.c
diff --git a/keyboards/clueboard_66/keymaps/tetris/tetris_text.h b/keyboards/clueboard/66/keymaps/tetris/tetris_text.h
index 25b4177e0b..25b4177e0b 100644
--- a/keyboards/clueboard_66/keymaps/tetris/tetris_text.h
+++ b/keyboards/clueboard/66/keymaps/tetris/tetris_text.h
diff --git a/keyboards/clueboard_66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index dab959bdc7..dab959bdc7 100644
--- a/keyboards/clueboard_66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/unix_optimized/readme.md b/keyboards/clueboard/66/keymaps/unix_optimized/readme.md
index 9e6d0e902a..9e6d0e902a 100644
--- a/keyboards/clueboard_66/keymaps/unix_optimized/readme.md
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/readme.md
diff --git a/keyboards/clueboard_66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index fb83aaa24c..fb83aaa24c 100644
--- a/keyboards/clueboard_66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/win_optimized/readme.md b/keyboards/clueboard/66/keymaps/win_optimized/readme.md
index 703a37be0c..703a37be0c 100644
--- a/keyboards/clueboard_66/keymaps/win_optimized/readme.md
+++ b/keyboards/clueboard/66/keymaps/win_optimized/readme.md
diff --git a/keyboards/clueboard_66/keymaps/xyverz/Makefile b/keyboards/clueboard/66/keymaps/xyverz/Makefile
index 950dadf841..950dadf841 100644
--- a/keyboards/clueboard_66/keymaps/xyverz/Makefile
+++ b/keyboards/clueboard/66/keymaps/xyverz/Makefile
diff --git a/keyboards/clueboard_66/keymaps/xyverz/keymap.c b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
index b725b11dd7..b725b11dd7 100644
--- a/keyboards/clueboard_66/keymaps/xyverz/keymap.c
+++ b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/xyverz/rules.mk b/keyboards/clueboard/66/keymaps/xyverz/rules.mk
index 950dadf841..950dadf841 100644
--- a/keyboards/clueboard_66/keymaps/xyverz/rules.mk
+++ b/keyboards/clueboard/66/keymaps/xyverz/rules.mk
diff --git a/keyboards/clueboard_66/readme.md b/keyboards/clueboard/66/readme.md
index c2423096ec..ad14ae9d69 100644
--- a/keyboards/clueboard_66/readme.md
+++ b/keyboards/clueboard/66/readme.md
@@ -13,6 +13,6 @@ A fully customizable 66% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard/rev3:default
+    make clueboard/66:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/clueboard_66/rev1/config.h b/keyboards/clueboard/66/rev1/config.h
index 519e4d3ecb..210718d560 100644
--- a/keyboards/clueboard_66/rev1/config.h
+++ b/keyboards/clueboard/66/rev1/config.h
@@ -1,5 +1,5 @@
-#ifndef REV2_CONFIG_H
-#define REV2_CONFIG_H
+#ifndef CLUEBOARD_66_REV1_CONFIG_H
+#define CLUEBOARD_66_REV1_CONFIG_H
 
 #include "config_common.h"
 
@@ -33,4 +33,4 @@
 #define RGBLIGHT_VAL_STEP 17
 
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/keyboards/clueboard_66/rev1/rev1.c b/keyboards/clueboard/66/rev1/rev1.c
index 90fc6956c9..90fc6956c9 100644
--- a/keyboards/clueboard_66/rev1/rev1.c
+++ b/keyboards/clueboard/66/rev1/rev1.c
diff --git a/keyboards/clueboard_66/rev1/rev1.h b/keyboards/clueboard/66/rev1/rev1.h
index cc94085f92..cc94085f92 100644
--- a/keyboards/clueboard_66/rev1/rev1.h
+++ b/keyboards/clueboard/66/rev1/rev1.h
diff --git a/keyboards/clueboard_66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk
index f845616741..f845616741 100644
--- a/keyboards/clueboard_66/rev1/rules.mk
+++ b/keyboards/clueboard/66/rev1/rules.mk
diff --git a/keyboards/clueboard_66/rev2/config.h b/keyboards/clueboard/66/rev2/config.h
index 3c96f79870..6ab2b1127d 100644
--- a/keyboards/clueboard_66/rev2/config.h
+++ b/keyboards/clueboard/66/rev2/config.h
@@ -1,5 +1,5 @@
-#ifndef REV2_CONFIG_H
-#define REV2_CONFIG_H
+#ifndef CLUEBOARD_66_REV2_CONFIG_H
+#define CLUEBOARD_66_REV2_CONFIG_H
 
 #include "config_common.h"
 
diff --git a/keyboards/clueboard_66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c
index 1a35b87b84..1a35b87b84 100644
--- a/keyboards/clueboard_66/rev2/rev2.c
+++ b/keyboards/clueboard/66/rev2/rev2.c
diff --git a/keyboards/clueboard_66/rev2/rev2.h b/keyboards/clueboard/66/rev2/rev2.h
index da7ce500f9..da7ce500f9 100644
--- a/keyboards/clueboard_66/rev2/rev2.h
+++ b/keyboards/clueboard/66/rev2/rev2.h
diff --git a/keyboards/clueboard_66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk
index 54a2685bf6..54a2685bf6 100644
--- a/keyboards/clueboard_66/rev2/rules.mk
+++ b/keyboards/clueboard/66/rev2/rules.mk
diff --git a/keyboards/clueboard_66/rev3/config.h b/keyboards/clueboard/66/rev3/config.h
index 513dc11696..218736a889 100644
--- a/keyboards/clueboard_66/rev3/config.h
+++ b/keyboards/clueboard/66/rev3/config.h
@@ -1,5 +1,5 @@
-#ifndef REV3_CONFIG_H
-#define REV3_CONFIG_H
+#ifndef CLUEBOARD_66_REV3_CONFIG_H
+#define CLUEBOARD_66_REV3_CONFIG_H
 
 #include "config_common.h"
 
diff --git a/keyboards/clueboard_66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c
index 8f703d2c99..8f703d2c99 100644
--- a/keyboards/clueboard_66/rev3/rev3.c
+++ b/keyboards/clueboard/66/rev3/rev3.c
diff --git a/keyboards/clueboard_66/rev3/rev3.h b/keyboards/clueboard/66/rev3/rev3.h
index 7fd243c809..7fd243c809 100644
--- a/keyboards/clueboard_66/rev3/rev3.h
+++ b/keyboards/clueboard/66/rev3/rev3.h
diff --git a/keyboards/clueboard_66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk
index 54a2685bf6..54a2685bf6 100644
--- a/keyboards/clueboard_66/rev3/rules.mk
+++ b/keyboards/clueboard/66/rev3/rules.mk
diff --git a/keyboards/clueboard_66/rules.mk b/keyboards/clueboard/66/rules.mk
index abab3bd5b7..d5d8ea0d20 100644
--- a/keyboards/clueboard_66/rules.mk
+++ b/keyboards/clueboard/66/rules.mk
@@ -1,3 +1,4 @@
+DEFAULT_FOLDER = clueboard/66/rev2
 MCU = atmega32u4
 F_CPU = 16000000
 ARCH = AVR8
@@ -19,5 +20,3 @@ RGBLIGHT_ENABLE = yes  # Enable keyboard underlight functionality
 MIDI_ENABLE = no 		# MIDI controls
 UNICODE_ENABLE = no 		# Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-
-DEFAULT_FOLDER = clueboard_66/rev2
diff --git a/keyboards/cluecard/cluecard.c b/keyboards/clueboard/card/cluecard.c
index 81db252d28..81db252d28 100644
--- a/keyboards/cluecard/cluecard.c
+++ b/keyboards/clueboard/card/cluecard.c
diff --git a/keyboards/cluecard/cluecard.h b/keyboards/clueboard/card/cluecard.h
index 3342a08233..3342a08233 100644
--- a/keyboards/cluecard/cluecard.h
+++ b/keyboards/clueboard/card/cluecard.h
diff --git a/keyboards/cluecard/config.h b/keyboards/clueboard/card/config.h
index 6520eb5574..6520eb5574 100644
--- a/keyboards/cluecard/config.h
+++ b/keyboards/clueboard/card/config.h
diff --git a/keyboards/cluecard/keymaps/default/config.h b/keyboards/clueboard/card/keymaps/default/config.h
index 8893d122e0..8893d122e0 100644
--- a/keyboards/cluecard/keymaps/default/config.h
+++ b/keyboards/clueboard/card/keymaps/default/config.h
diff --git a/keyboards/cluecard/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
index cd87750a81..cd87750a81 100644
--- a/keyboards/cluecard/keymaps/default/keymap.c
+++ b/keyboards/clueboard/card/keymaps/default/keymap.c
diff --git a/keyboards/clueboard/card/keymaps/default/readme.md b/keyboards/clueboard/card/keymaps/default/readme.md
new file mode 100644
index 0000000000..53ba902536
--- /dev/null
+++ b/keyboards/clueboard/card/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for cluecard
+
+Note that this keymap has audio enabled, so the RGB mode button does not go through the different effects.  So the LEDs will still show a static light, that is configurable with the hue, staturation and brightness buttons. You can of course also turn them on and off with the on/off button.
diff --git a/keyboards/cluecard/keymaps/default/rules.mk b/keyboards/clueboard/card/keymaps/default/rules.mk
index 8ee841da02..8ee841da02 100644
--- a/keyboards/cluecard/keymaps/default/rules.mk
+++ b/keyboards/clueboard/card/keymaps/default/rules.mk
diff --git a/keyboards/cluecard/keymaps/rgb_effects/config.h b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
index c6c9342c81..c6c9342c81 100644
--- a/keyboards/cluecard/keymaps/rgb_effects/config.h
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
diff --git a/keyboards/cluecard/keymaps/rgb_effects/keymap.c b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
index 74c95ce8a8..74c95ce8a8 100644
--- a/keyboards/cluecard/keymaps/rgb_effects/keymap.c
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
diff --git a/keyboards/cluecard/keymaps/rgb_effects/readme.md b/keyboards/clueboard/card/keymaps/rgb_effects/readme.md
index 949cac394e..f99dcebf0c 100644
--- a/keyboards/cluecard/keymaps/rgb_effects/readme.md
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/readme.md
@@ -1,7 +1,5 @@
 # RGB effect test keymap for cluecard
 
-This keymap is made for testing the RGB effects. Audio is disabled and the mode buttons goes through each
-effect. If you run HID-listen you will be able to see which effect is active. For a list of effects, check
-the `rgblight.c` file.
+This keymap is made for testing the RGB effects. Audio is disabled and the mode buttons goes through each effect. If you run HID-listen you will be able to see which effect is active. For a list of effects, check the `rgblight.c` file.
 
 The hue, saturation and brightness buttons will work depending on which effect is active.
diff --git a/keyboards/cluecard/keymaps/rgb_effects/rules.mk b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
index 00670c0cf4..00670c0cf4 100644
--- a/keyboards/cluecard/keymaps/rgb_effects/rules.mk
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
diff --git a/keyboards/cluecard/readme.md b/keyboards/clueboard/card/readme.md
index 589eb57f37..27089d465b 100644
--- a/keyboards/cluecard/readme.md
+++ b/keyboards/clueboard/card/readme.md
@@ -8,6 +8,6 @@ A simple QMK dev kit.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cluecard:default
+    make clueboard/card:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/cluecard/rules.mk b/keyboards/clueboard/card/rules.mk
index 2117c81272..2117c81272 100644
--- a/keyboards/cluecard/rules.mk
+++ b/keyboards/clueboard/card/rules.mk
diff --git a/keyboards/clueboard/readme.md b/keyboards/clueboard/readme.md
new file mode 100644
index 0000000000..5dfa1e3537
--- /dev/null
+++ b/keyboards/clueboard/readme.md
@@ -0,0 +1,13 @@
+# Clueboard
+
+![Clueboard Logo](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/t/59c9703318b27d1ab34f40df/1508257572555/)
+
+Clueboard makes fully customizable custom keyboards in a variety of formfactors. Inside this directory you'll find support for the entire line of Clueboard products.
+
+* Maintainer: [Zach White](https://github.com/skullydazed)
+* Hardware Supported:
+  * [`17`](17/): Clueboard "Cluepad" PCB
+  * [`60`](60/): Clueboard 60% PCB
+  * [`66`](66/): Clueboard 66% PCB
+  * [`card`](card/): Special Cluecard PCB
+* Hardware Availability: [clueboard.co](https://clueboard.co/)
diff --git a/keyboards/cluecard/keymaps/default/readme.md b/keyboards/cluecard/keymaps/default/readme.md
deleted file mode 100644
index fa4e8ccad4..0000000000
--- a/keyboards/cluecard/keymaps/default/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The default keymap for cluecard
-
-Note that this keymap has audio enabled, so the RGB mode button does not go through the different effects. 
-So the LEDs will still show a static light, that is configurable with the hue, staturation and brightness
-buttons. You can of course also turn them on and off with the on/off button.