78 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/s60_x/config.h b/keyboards/sentraq/s60_x/config.h
index bb2602dcab..bb2602dcab 100644
--- a/keyboards/s60_x/config.h
+++ b/keyboards/sentraq/s60_x/config.h
diff --git a/keyboards/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index f6b7f8d683..f6b7f8d683 100644
--- a/keyboards/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
diff --git a/keyboards/s60_x/default/default.c b/keyboards/sentraq/s60_x/default/default.c
index 253f5495c2..253f5495c2 100644
--- a/keyboards/s60_x/default/default.c
+++ b/keyboards/sentraq/s60_x/default/default.c
diff --git a/keyboards/s60_x/default/default.h b/keyboards/sentraq/s60_x/default/default.h
index f3646f1559..f3646f1559 100644
--- a/keyboards/s60_x/default/default.h
+++ b/keyboards/sentraq/s60_x/default/default.h
diff --git a/keyboards/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json
index 1aa2dbf3e0..1aa2dbf3e0 100644
--- a/keyboards/s60_x/default/info.json
+++ b/keyboards/sentraq/s60_x/default/info.json
diff --git a/keyboards/s60_x/default/rules.mk b/keyboards/sentraq/s60_x/default/rules.mk
index ce4064d1c6..ce4064d1c6 100644
--- a/keyboards/s60_x/default/rules.mk
+++ b/keyboards/sentraq/s60_x/default/rules.mk
diff --git a/keyboards/s60_x/keymaps/amnesia0287/keymap.c b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
index c17c9e7449..c17c9e7449 100644
--- a/keyboards/s60_x/keymaps/amnesia0287/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
diff --git a/keyboards/s60_x/keymaps/amnesia0287/readme.md b/keyboards/sentraq/s60_x/keymaps/amnesia0287/readme.md
index 69cede566a..69cede566a 100644
--- a/keyboards/s60_x/keymaps/amnesia0287/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/amnesia0287/readme.md
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/config.h b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/config.h
index aee65690f3..aee65690f3 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/config.h
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/config.h
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg
index f03858993e..f03858993e 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg
index 2304b2a4c3..2304b2a4c3 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg
index 1ca6a9c872..1ca6a9c872 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
index e4660e6688..e4660e6688 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/readme.md b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/readme.md
index 7fab63b738..7fab63b738 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/readme.md
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/rules.mk
index 1bcd7ea7f2..1bcd7ea7f2 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/rules.mk
diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/sentraq/s60_x/keymaps/bluebear/config.h
index c1db5f64a6..c1db5f64a6 100644
--- a/keyboards/s60_x/keymaps/bluebear/config.h
+++ b/keyboards/sentraq/s60_x/keymaps/bluebear/config.h
diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
index 2ba29b09ee..2ba29b09ee 100644
--- a/keyboards/s60_x/keymaps/bluebear/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/bluebear/keymap.c
diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/sentraq/s60_x/keymaps/bluebear/readme.md
index d2cf6a4c58..d2cf6a4c58 100644
--- a/keyboards/s60_x/keymaps/bluebear/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/bluebear/readme.md
diff --git a/keyboards/s60_x/keymaps/bluebear/rules.mk b/keyboards/sentraq/s60_x/keymaps/bluebear/rules.mk
index b7c9a04790..b7c9a04790 100644
--- a/keyboards/s60_x/keymaps/bluebear/rules.mk
+++ b/keyboards/sentraq/s60_x/keymaps/bluebear/rules.mk
diff --git a/keyboards/s60_x/keymaps/custom/keymap.c b/keyboards/sentraq/s60_x/keymaps/custom/keymap.c
index c98d14349f..c98d14349f 100644
--- a/keyboards/s60_x/keymaps/custom/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/custom/keymap.c
diff --git a/keyboards/s60_x/keymaps/custom/readme.md b/keyboards/sentraq/s60_x/keymaps/custom/readme.md
index fd79d53607..fd79d53607 100644
--- a/keyboards/s60_x/keymaps/custom/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/custom/readme.md
diff --git a/keyboards/s60_x/keymaps/dbroqua/keymap.c b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
index 71cf93f004..71cf93f004 100644
--- a/keyboards/s60_x/keymaps/dbroqua/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
diff --git a/keyboards/s60_x/keymaps/default/keymap.c b/keyboards/sentraq/s60_x/keymaps/default/keymap.c
index c730505cdb..c730505cdb 100644
--- a/keyboards/s60_x/keymaps/default/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/default/keymap.c
diff --git a/keyboards/s60_x/keymaps/default/readme.md b/keyboards/sentraq/s60_x/keymaps/default/readme.md
index 01cda9df9b..01cda9df9b 100644
--- a/keyboards/s60_x/keymaps/default/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/default/readme.md
diff --git a/keyboards/s60_x/keymaps/default_rgb/keymap.c b/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
index fdaa6065bd..fdaa6065bd 100644
--- a/keyboards/s60_x/keymaps/default_rgb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/default_rgb/keymap.c
diff --git a/keyboards/s60_x/keymaps/default_rgb/readme.md b/keyboards/sentraq/s60_x/keymaps/default_rgb/readme.md
index 69cede566a..69cede566a 100644
--- a/keyboards/s60_x/keymaps/default_rgb/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/default_rgb/readme.md
diff --git a/keyboards/s60_x/keymaps/hasu/keymap.c b/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
index 76398697c2..76398697c2 100644
--- a/keyboards/s60_x/keymaps/hasu/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/hasu/keymap.c
diff --git a/keyboards/s60_x/keymaps/hasu/readme.md b/keyboards/sentraq/s60_x/keymaps/hasu/readme.md
index b79d0e97a5..b79d0e97a5 100644
--- a/keyboards/s60_x/keymaps/hasu/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/hasu/readme.md
diff --git a/keyboards/s60_x/keymaps/hhkb/keymap.c b/keyboards/sentraq/s60_x/keymaps/hhkb/keymap.c
index b572b4484b..b572b4484b 100644
--- a/keyboards/s60_x/keymaps/hhkb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/hhkb/keymap.c
diff --git a/keyboards/s60_x/keymaps/hhkb/readme.md b/keyboards/sentraq/s60_x/keymaps/hhkb/readme.md
index c7dcec899f..c7dcec899f 100644
--- a/keyboards/s60_x/keymaps/hhkb/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/hhkb/readme.md
diff --git a/keyboards/s60_x/keymaps/iso/keymap.c b/keyboards/sentraq/s60_x/keymaps/iso/keymap.c
index d10bfcc136..d10bfcc136 100644
--- a/keyboards/s60_x/keymaps/iso/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/iso/keymap.c
diff --git a/keyboards/s60_x/keymaps/iso/readme.md b/keyboards/sentraq/s60_x/keymaps/iso/readme.md
index 2c06bf86f0..2c06bf86f0 100644
--- a/keyboards/s60_x/keymaps/iso/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/iso/readme.md
diff --git a/keyboards/s60_x/keymaps/iso_rgb/keymap.c b/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
index d76055a82e..d76055a82e 100644
--- a/keyboards/s60_x/keymaps/iso_rgb/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/iso_rgb/keymap.c
diff --git a/keyboards/s60_x/keymaps/iso_rgb/readme.md b/keyboards/sentraq/s60_x/keymaps/iso_rgb/readme.md
index d02498e6a2..d02498e6a2 100644
--- a/keyboards/s60_x/keymaps/iso_rgb/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/iso_rgb/readme.md
diff --git a/keyboards/s60_x/keymaps/jpec/keymap.c b/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
index 4d84396e31..4d84396e31 100644
--- a/keyboards/s60_x/keymaps/jpec/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/jpec/keymap.c
diff --git a/keyboards/s60_x/keymaps/jpec/readme.md b/keyboards/sentraq/s60_x/keymaps/jpec/readme.md
index 73318dad72..73318dad72 100644
--- a/keyboards/s60_x/keymaps/jpec/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/jpec/readme.md
diff --git a/keyboards/s60_x/keymaps/plain/keymap.c b/keyboards/sentraq/s60_x/keymaps/plain/keymap.c
index 3cdda75620..3cdda75620 100644
--- a/keyboards/s60_x/keymaps/plain/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/plain/keymap.c
diff --git a/keyboards/s60_x/keymaps/plain/readme.md b/keyboards/sentraq/s60_x/keymaps/plain/readme.md
index 02f524495e..02f524495e 100644
--- a/keyboards/s60_x/keymaps/plain/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/plain/readme.md
diff --git a/keyboards/s60_x/keymaps/poker/keymap.c b/keyboards/sentraq/s60_x/keymaps/poker/keymap.c
index 61685b477a..61685b477a 100644
--- a/keyboards/s60_x/keymaps/poker/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/poker/keymap.c
diff --git a/keyboards/s60_x/keymaps/poker/readme.md b/keyboards/sentraq/s60_x/keymaps/poker/readme.md
index 04d2b78bef..04d2b78bef 100644
--- a/keyboards/s60_x/keymaps/poker/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/poker/readme.md
diff --git a/keyboards/s60_x/keymaps/poker_bit/keymap.c b/keyboards/sentraq/s60_x/keymaps/poker_bit/keymap.c
index d66cc93c3a..d66cc93c3a 100644
--- a/keyboards/s60_x/keymaps/poker_bit/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/poker_bit/keymap.c
diff --git a/keyboards/s60_x/keymaps/poker_bit/readme.md b/keyboards/sentraq/s60_x/keymaps/poker_bit/readme.md
index 04d2b78bef..04d2b78bef 100644
--- a/keyboards/s60_x/keymaps/poker_bit/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/poker_bit/readme.md
diff --git a/keyboards/s60_x/keymaps/poker_set/keymap.c b/keyboards/sentraq/s60_x/keymaps/poker_set/keymap.c
index 3f63924679..3f63924679 100644
--- a/keyboards/s60_x/keymaps/poker_set/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/poker_set/keymap.c
diff --git a/keyboards/s60_x/keymaps/poker_set/readme.md b/keyboards/sentraq/s60_x/keymaps/poker_set/readme.md
index 04d2b78bef..04d2b78bef 100644
--- a/keyboards/s60_x/keymaps/poker_set/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/poker_set/readme.md
diff --git a/keyboards/s60_x/keymaps/spacefn/keymap.c b/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
index b0d08202da..b0d08202da 100644
--- a/keyboards/s60_x/keymaps/spacefn/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c
diff --git a/keyboards/s60_x/keymaps/spacefn/readme.md b/keyboards/sentraq/s60_x/keymaps/spacefn/readme.md
index fd657f6526..fd657f6526 100644
--- a/keyboards/s60_x/keymaps/spacefn/readme.md
+++ b/keyboards/sentraq/s60_x/keymaps/spacefn/readme.md
diff --git a/keyboards/s60_x/readme.md b/keyboards/sentraq/s60_x/readme.md
index 1e4b4cc316..09ad068e73 100644
--- a/keyboards/s60_x/readme.md
+++ b/keyboards/sentraq/s60_x/readme.md
@@ -6,14 +6,14 @@ Keyboard Maintainer: QMK Community
 Hardware Supported: S60-x PCB  
 Hardware Availability: https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit?mode=guest_open
 
-There are two versions of this keyboard, an RGB and a non RGB one. 
+There are two versions of this keyboard, an RGB and a non RGB one.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make s60_x:default
+    make sentraq/s60_x:default
 
 Make example for rgb version of this keyboard:
 
-    make s60_x/rgb:default
+    make sentraq/s60_x/rgb: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/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index d9c26658df..d9c26658df 100644
--- a/keyboards/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
diff --git a/keyboards/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index 1aa2dbf3e0..1aa2dbf3e0 100644
--- a/keyboards/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
diff --git a/keyboards/s60_x/rgb/rgb.c b/keyboards/sentraq/s60_x/rgb/rgb.c
index 0117e14ae5..0117e14ae5 100644
--- a/keyboards/s60_x/rgb/rgb.c
+++ b/keyboards/sentraq/s60_x/rgb/rgb.c
diff --git a/keyboards/s60_x/rgb/rgb.h b/keyboards/sentraq/s60_x/rgb/rgb.h
index d70473eeaa..d70473eeaa 100644
--- a/keyboards/s60_x/rgb/rgb.h
+++ b/keyboards/sentraq/s60_x/rgb/rgb.h
diff --git a/keyboards/s60_x/rgb/rules.mk b/keyboards/sentraq/s60_x/rgb/rules.mk
index 42d45c332b..42d45c332b 100644
--- a/keyboards/s60_x/rgb/rules.mk
+++ b/keyboards/sentraq/s60_x/rgb/rules.mk
diff --git a/keyboards/s60_x/rules.mk b/keyboards/sentraq/s60_x/rules.mk
index 9f0ae7caeb..31de8ba39e 100644
--- a/keyboards/s60_x/rules.mk
+++ b/keyboards/sentraq/s60_x/rules.mk
@@ -64,6 +64,6 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 
-DEFAULT_FOLDER = s60_x/default
+DEFAULT_FOLDER = sentraq/s60_x/default
 
 LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso
diff --git a/keyboards/s60_x/s60_x.c b/keyboards/sentraq/s60_x/s60_x.c
index 595418bfac..595418bfac 100644
--- a/keyboards/s60_x/s60_x.c
+++ b/keyboards/sentraq/s60_x/s60_x.c
diff --git a/keyboards/s60_x/s60_x.h b/keyboards/sentraq/s60_x/s60_x.h
index b70cb5864b..59c9741b5a 100644
--- a/keyboards/s60_x/s60_x.h
+++ b/keyboards/sentraq/s60_x/s60_x.h
@@ -1,10 +1,10 @@
 #ifndef S60X_H
 #define S60X_H
 
-#ifdef KEYBOARD_s60_x_default
+#ifdef KEYBOARD_sentraq_s60_x_default
     #include "default.h"
 #endif
-#ifdef KEYBOARD_s60_x_rgb
+#ifdef KEYBOARD_sentraq_s60_x_rgb
     #include "rgb.h"
 #endif
 
diff --git a/keyboards/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index c45fd24124..c45fd24124 100644
--- a/keyboards/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
diff --git a/keyboards/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index 1b17ddb53d..1b17ddb53d 100644
--- a/keyboards/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
diff --git a/keyboards/s65_plus/keymaps/default/keymap.c b/keyboards/sentraq/s65_plus/keymaps/default/keymap.c
index bbeea6a8fb..bbeea6a8fb 100644
--- a/keyboards/s65_plus/keymaps/default/keymap.c
+++ b/keyboards/sentraq/s65_plus/keymaps/default/keymap.c
diff --git a/keyboards/s65_plus/keymaps/iso/keymap.c b/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c
index 2218d051fd..2218d051fd 100644
--- a/keyboards/s65_plus/keymaps/iso/keymap.c
+++ b/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c
diff --git a/keyboards/s65_plus/keymaps/iso/readme.md b/keyboards/sentraq/s65_plus/keymaps/iso/readme.md
index de1d9adf80..de1d9adf80 100644
--- a/keyboards/s65_plus/keymaps/iso/readme.md
+++ b/keyboards/sentraq/s65_plus/keymaps/iso/readme.md
diff --git a/keyboards/s65_plus/readme.md b/keyboards/sentraq/s65_plus/readme.md
index b1ee865bfc..0940d9a4fd 100644
--- a/keyboards/s65_plus/readme.md
+++ b/keyboards/sentraq/s65_plus/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [Sentraq](https://sentraq.com/collections/kits/products/s
 
 Make example for this keyboard (after setting up your build environment):
 
-    make s65_plus:default
+    make sentraq/s65_plus: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/s65_plus/rules.mk b/keyboards/sentraq/s65_plus/rules.mk
index 08dd2d93c8..08dd2d93c8 100644
--- a/keyboards/s65_plus/rules.mk
+++ b/keyboards/sentraq/s65_plus/rules.mk
diff --git a/keyboards/s65_plus/s65_plus.c b/keyboards/sentraq/s65_plus/s65_plus.c
index 3eaaa37174..3eaaa37174 100644
--- a/keyboards/s65_plus/s65_plus.c
+++ b/keyboards/sentraq/s65_plus/s65_plus.c
diff --git a/keyboards/s65_plus/s65_plus.h b/keyboards/sentraq/s65_plus/s65_plus.h
index 95d06122e0..95d06122e0 100644
--- a/keyboards/s65_plus/s65_plus.h
+++ b/keyboards/sentraq/s65_plus/s65_plus.h
diff --git a/keyboards/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index 4867652730..4867652730 100644
--- a/keyboards/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
diff --git a/keyboards/s65_x/info.json b/keyboards/sentraq/s65_x/info.json
index 9aeb7eb7de..9aeb7eb7de 100644
--- a/keyboards/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
diff --git a/keyboards/s65_x/keymaps/default/keymap.c b/keyboards/sentraq/s65_x/keymaps/default/keymap.c
index 00ae4d0a20..00ae4d0a20 100644
--- a/keyboards/s65_x/keymaps/default/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/default/keymap.c
diff --git a/keyboards/s65_x/keymaps/default/readme.md b/keyboards/sentraq/s65_x/keymaps/default/readme.md
index 96fa2ff53e..96fa2ff53e 100644
--- a/keyboards/s65_x/keymaps/default/readme.md
+++ b/keyboards/sentraq/s65_x/keymaps/default/readme.md
diff --git a/keyboards/s65_x/keymaps/iso/keymap.c b/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
index f5a0a86306..f5a0a86306 100644
--- a/keyboards/s65_x/keymaps/iso/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/iso/keymap.c
diff --git a/keyboards/s65_x/keymaps/iso/readme.md b/keyboards/sentraq/s65_x/keymaps/iso/readme.md
index 179b0b908c..179b0b908c 100644
--- a/keyboards/s65_x/keymaps/iso/readme.md
+++ b/keyboards/sentraq/s65_x/keymaps/iso/readme.md
diff --git a/keyboards/s65_x/keymaps/kelorean/keymap.c b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
index 7a0de8559d..7a0de8559d 100644
--- a/keyboards/s65_x/keymaps/kelorean/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
diff --git a/keyboards/s65_x/keymaps/kelorean/readme.md b/keyboards/sentraq/s65_x/keymaps/kelorean/readme.md
index 12e39eae61..12e39eae61 100644
--- a/keyboards/s65_x/keymaps/kelorean/readme.md
+++ b/keyboards/sentraq/s65_x/keymaps/kelorean/readme.md
diff --git a/keyboards/s65_x/keymaps/nall/keymap.c b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
index a5daed006a..a5daed006a 100644
--- a/keyboards/s65_x/keymaps/nall/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
diff --git a/keyboards/s65_x/keymaps/smt/keymap.c b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
index 8c3984c21f..8c3984c21f 100644
--- a/keyboards/s65_x/keymaps/smt/keymap.c
+++ b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
diff --git a/keyboards/s65_x/readme.md b/keyboards/sentraq/s65_x/readme.md
index d1dbdb10b6..d6d309c843 100644
--- a/keyboards/s65_x/readme.md
+++ b/keyboards/sentraq/s65_x/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [Sentraq](https://sentraq.com/products/s65-x-rgb-diy-keyb
 
 Make example for this keyboard (after setting up your build environment):
 
-    make s65_x:default
+    make sentraq/s65_x: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/s65_x/rules.mk b/keyboards/sentraq/s65_x/rules.mk
index 598e269cbf..598e269cbf 100644
--- a/keyboards/s65_x/rules.mk
+++ b/keyboards/sentraq/s65_x/rules.mk
diff --git a/keyboards/s65_x/s65_x.c b/keyboards/sentraq/s65_x/s65_x.c
index 844f5cf28b..844f5cf28b 100644
--- a/keyboards/s65_x/s65_x.c
+++ b/keyboards/sentraq/s65_x/s65_x.c
diff --git a/keyboards/s65_x/s65_x.h b/keyboards/sentraq/s65_x/s65_x.h
index aef9205754..aef9205754 100644
--- a/keyboards/s65_x/s65_x.h
+++ b/keyboards/sentraq/s65_x/s65_x.h