120 files changed, 10 insertions, 17 deletions
diff --git a/keyboards/gh60/config.h b/keyboards/gh60/revc/config.h
index 8b7391faf..e0cfa7268 100644
--- a/keyboards/gh60/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -14,10 +14,6 @@ GNU General Public License for more details.
 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
-
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
@@ -152,5 +148,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/gh60/info.json b/keyboards/gh60/revc/info.json
index e2a774645..e2a774645 100644
--- a/keyboards/gh60/info.json
+++ b/keyboards/gh60/revc/info.json
diff --git a/keyboards/gh60/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
index c0f650ecc..c0f650ecc 100644
--- a/keyboards/gh60/keymaps/bluezio/keymap.c
+++ b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
diff --git a/keyboards/gh60/keymaps/bluezio/rules.mk b/keyboards/gh60/revc/keymaps/bluezio/rules.mk
index 4b820c974..4b820c974 100644
--- a/keyboards/gh60/keymaps/bluezio/rules.mk
+++ b/keyboards/gh60/revc/keymaps/bluezio/rules.mk
diff --git a/keyboards/gh60/keymaps/chaser/README.md b/keyboards/gh60/revc/keymaps/chaser/README.md
index e6ec9e82b..e6ec9e82b 100644
--- a/keyboards/gh60/keymaps/chaser/README.md
+++ b/keyboards/gh60/revc/keymaps/chaser/README.md
diff --git a/keyboards/gh60/keymaps/chaser/keymap.c b/keyboards/gh60/revc/keymaps/chaser/keymap.c
index 29228eec2..29228eec2 100644
--- a/keyboards/gh60/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/revc/keymaps/chaser/keymap.c
diff --git a/keyboards/gh60/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
index 8952200e0..8952200e0 100644
--- a/keyboards/gh60/keymaps/dbroqua/config.h
+++ b/keyboards/gh60/revc/keymaps/dbroqua/config.h
diff --git a/keyboards/gh60/keymaps/dbroqua/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
index 2030355a7..2030355a7 100644
--- a/keyboards/gh60/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
diff --git a/keyboards/gh60/keymaps/dbroqua/rules.mk b/keyboards/gh60/revc/keymaps/dbroqua/rules.mk
index 21d4b60d9..21d4b60d9 100644
--- a/keyboards/gh60/keymaps/dbroqua/rules.mk
+++ b/keyboards/gh60/revc/keymaps/dbroqua/rules.mk
diff --git a/keyboards/gh60/keymaps/dbroqua_7U/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
index 74ff97a93..74ff97a93 100644
--- a/keyboards/gh60/keymaps/dbroqua_7U/keymap.c
+++ b/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
diff --git a/keyboards/gh60/keymaps/dbroqua_7U/rules.mk b/keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk
index 21192b179..21192b179 100644
--- a/keyboards/gh60/keymaps/dbroqua_7U/rules.mk
+++ b/keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk
diff --git a/keyboards/gh60/keymaps/default/keymap.c b/keyboards/gh60/revc/keymaps/default/keymap.c
index a8fd4f3c2..a8fd4f3c2 100644
--- a/keyboards/gh60/keymaps/default/keymap.c
+++ b/keyboards/gh60/revc/keymaps/default/keymap.c
diff --git a/keyboards/gh60/keymaps/emiilsd/keymap.c b/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
index a863511d6..a863511d6 100644
--- a/keyboards/gh60/keymaps/emiilsd/keymap.c
+++ b/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
diff --git a/keyboards/gh60/keymaps/maartenwut/keymap.c b/keyboards/gh60/revc/keymaps/maartenwut/keymap.c
index d5e101e7f..d5e101e7f 100755
--- a/keyboards/gh60/keymaps/maartenwut/keymap.c
+++ b/keyboards/gh60/revc/keymaps/maartenwut/keymap.c
diff --git a/keyboards/gh60/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h
index 8c3b9b250..8c3b9b250 100644
--- a/keyboards/gh60/keymaps/maxr1998/config.h
+++ b/keyboards/gh60/revc/keymaps/maxr1998/config.h
diff --git a/keyboards/gh60/keymaps/maxr1998/keymap.c b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
index eff94ff65..eff94ff65 100644
--- a/keyboards/gh60/keymaps/maxr1998/keymap.c
+++ b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
diff --git a/keyboards/gh60/keymaps/maxr1998/rules.mk b/keyboards/gh60/revc/keymaps/maxr1998/rules.mk
index d64f11e1f..d64f11e1f 100644
--- a/keyboards/gh60/keymaps/maxr1998/rules.mk
+++ b/keyboards/gh60/revc/keymaps/maxr1998/rules.mk
diff --git a/keyboards/gh60/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
index 1cc41d183..1cc41d183 100644
--- a/keyboards/gh60/keymaps/robotmaxtron/config.h
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
diff --git a/keyboards/gh60/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
index 649cbec38..649cbec38 100644
--- a/keyboards/gh60/keymaps/robotmaxtron/keymap.c
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
diff --git a/keyboards/gh60/keymaps/robotmaxtron/readme.md b/keyboards/gh60/revc/keymaps/robotmaxtron/readme.md
index 8db7b3f65..8db7b3f65 100644
--- a/keyboards/gh60/keymaps/robotmaxtron/readme.md
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/readme.md
diff --git a/keyboards/gh60/keymaps/robotmaxtron/rules.mk b/keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk
index b6761ac9f..b6761ac9f 100644
--- a/keyboards/gh60/keymaps/robotmaxtron/rules.mk
+++ b/keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk
diff --git a/keyboards/gh60/keymaps/sethbc/keymap.c b/keyboards/gh60/revc/keymaps/sethbc/keymap.c
index 6c2c00ec2..6c2c00ec2 100644
--- a/keyboards/gh60/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/revc/keymaps/sethbc/keymap.c
diff --git a/keyboards/gh60/keymaps/sethbc/rules.mk b/keyboards/gh60/revc/keymaps/sethbc/rules.mk
index e69de29bb..e69de29bb 100644
--- a/keyboards/gh60/keymaps/sethbc/rules.mk
+++ b/keyboards/gh60/revc/keymaps/sethbc/rules.mk
diff --git a/keyboards/gh60/keymaps/xyverz/keymap.c b/keyboards/gh60/revc/keymaps/xyverz/keymap.c
index e47fcc2f9..e47fcc2f9 100644
--- a/keyboards/gh60/keymaps/xyverz/keymap.c
+++ b/keyboards/gh60/revc/keymaps/xyverz/keymap.c
diff --git a/keyboards/gh60/pinout.txt b/keyboards/gh60/revc/pinout.txt
index e9bf1983a..e9bf1983a 100644
--- a/keyboards/gh60/pinout.txt
+++ b/keyboards/gh60/revc/pinout.txt
diff --git a/keyboards/gh60/readme.md b/keyboards/gh60/revc/readme.md
index b63cce973..cb0d95351 100644
--- a/keyboards/gh60/readme.md
+++ b/keyboards/gh60/revc/readme.md
@@ -1,5 +1,4 @@
-GH60
-===
+# GH60 Rev C
 
 ![gh60 Rev C PCB](https://i.imgur.com/FejpoNF.jpg)
 
@@ -11,7 +10,9 @@ Hardware Availability: http://blog.komar.be/projects/gh60-programmable-keyboard/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gh60:default
+    make gh60/revc:default
+
+**Note:** This GH60 firmware will not be compatible with the GH60 Satan PCB. Conversely, the GH60 Satan firmware will not be compatible with this PCB. Please ensure you have the correct firmware/pcb combination before flashing. 
 
 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/gh60/gh60.c b/keyboards/gh60/revc/revc.c
index 10ae89359..e06739d2b 100644
--- a/keyboards/gh60/gh60.c
+++ b/keyboards/gh60/revc/revc.c
@@ -1,4 +1,4 @@
-#include "gh60.h"
+#include "revc.h"
 
 
 extern inline void gh60_caps_led_on(void);
diff --git a/keyboards/gh60/gh60.h b/keyboards/gh60/revc/revc.h
index 048263ba7..048263ba7 100644
--- a/keyboards/gh60/gh60.h
+++ b/keyboards/gh60/revc/revc.h
diff --git a/keyboards/gh60/rules.mk b/keyboards/gh60/revc/rules.mk
index a4ee56d84..bf7ea514d 100644
--- a/keyboards/gh60/rules.mk
+++ b/keyboards/gh60/revc/rules.mk
@@ -50,7 +50,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes		# Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = lite		# Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes		# Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes		# Audio control and System control(+450)
 # CONSOLE_ENABLE = yes		# Console for debug(+400)
diff --git a/keyboards/satan/config.h b/keyboards/gh60/satan/config.h
index d8c9ae9ab..d8c9ae9ab 100644
--- a/keyboards/satan/config.h
+++ b/keyboards/gh60/satan/config.h
diff --git a/keyboards/satan/info.json b/keyboards/gh60/satan/info.json
index 2b2e96ed1..2b2e96ed1 100644
--- a/keyboards/satan/info.json
+++ b/keyboards/gh60/satan/info.json
diff --git a/keyboards/satan/keymaps/abhixec/keymap.c b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
index 59a8c4312..59a8c4312 100644
--- a/keyboards/satan/keymaps/abhixec/keymap.c
+++ b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
diff --git a/keyboards/satan/keymaps/abhixec/readme.md b/keyboards/gh60/satan/keymaps/abhixec/readme.md
index 59a95b7fc..59a95b7fc 100644
--- a/keyboards/satan/keymaps/abhixec/readme.md
+++ b/keyboards/gh60/satan/keymaps/abhixec/readme.md
diff --git a/keyboards/satan/keymaps/abhixec/rules.mk b/keyboards/gh60/satan/keymaps/abhixec/rules.mk
index fdbd25ea8..fdbd25ea8 100644
--- a/keyboards/satan/keymaps/abhixec/rules.mk
+++ b/keyboards/gh60/satan/keymaps/abhixec/rules.mk
diff --git a/keyboards/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
index 5012fee56..5012fee56 100644
--- a/keyboards/satan/keymaps/addcninblue/keymap.c
+++ b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
diff --git a/keyboards/satan/keymaps/addcninblue/readme.md b/keyboards/gh60/satan/keymaps/addcninblue/readme.md
index 7e6520534..7e6520534 100644
--- a/keyboards/satan/keymaps/addcninblue/readme.md
+++ b/keyboards/gh60/satan/keymaps/addcninblue/readme.md
diff --git a/keyboards/satan/keymaps/addcninblue/rules.mk b/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
index fd7f34300..fd7f34300 100644
--- a/keyboards/satan/keymaps/addcninblue/rules.mk
+++ b/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
diff --git a/keyboards/satan/keymaps/admiralStrokers/config.h b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
index c8d40730f..c8d40730f 100644
--- a/keyboards/satan/keymaps/admiralStrokers/config.h
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/config.h
diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
index a3626dff8..a3626dff8 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/keymap.c
diff --git a/keyboards/satan/keymaps/admiralStrokers/readme.md b/keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
index eb3a20bb9..eb3a20bb9 100644
--- a/keyboards/satan/keymaps/admiralStrokers/readme.md
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/readme.md
diff --git a/keyboards/satan/keymaps/admiralStrokers/rules.mk b/keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
index 7c3f5bd90..7c3f5bd90 100644
--- a/keyboards/satan/keymaps/admiralStrokers/rules.mk
+++ b/keyboards/gh60/satan/keymaps/admiralStrokers/rules.mk
diff --git a/keyboards/satan/keymaps/ben_iso/config.h b/keyboards/gh60/satan/keymaps/ben_iso/config.h
index 84d55698c..84d55698c 100644
--- a/keyboards/satan/keymaps/ben_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/ben_iso/config.h
diff --git a/keyboards/satan/keymaps/ben_iso/keymap.c b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
index 5dfb2ae70..5dfb2ae70 100644
--- a/keyboards/satan/keymaps/ben_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
diff --git a/keyboards/satan/keymaps/ben_iso/readme.md b/keyboards/gh60/satan/keymaps/ben_iso/readme.md
index 74b7680b2..74b7680b2 100644
--- a/keyboards/satan/keymaps/ben_iso/readme.md
+++ b/keyboards/gh60/satan/keymaps/ben_iso/readme.md
diff --git a/keyboards/satan/keymaps/ben_iso/rules.mk b/keyboards/gh60/satan/keymaps/ben_iso/rules.mk
index 53644093d..53644093d 100644
--- a/keyboards/satan/keymaps/ben_iso/rules.mk
+++ b/keyboards/gh60/satan/keymaps/ben_iso/rules.mk
diff --git a/keyboards/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
index 1f9430a9f..1f9430a9f 100644
--- a/keyboards/satan/keymaps/bri/keymap.c
+++ b/keyboards/gh60/satan/keymaps/bri/keymap.c
diff --git a/keyboards/satan/keymaps/bri/readme.md b/keyboards/gh60/satan/keymaps/bri/readme.md
index bed305997..bed305997 100644
--- a/keyboards/satan/keymaps/bri/readme.md
+++ b/keyboards/gh60/satan/keymaps/bri/readme.md
diff --git a/keyboards/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
index edba9a309..edba9a309 100644
--- a/keyboards/satan/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/satan/keymaps/chaser/keymap.c
diff --git a/keyboards/satan/keymaps/chaser/readme.md b/keyboards/gh60/satan/keymaps/chaser/readme.md
index c6e70b188..c6e70b188 100644
--- a/keyboards/satan/keymaps/chaser/readme.md
+++ b/keyboards/gh60/satan/keymaps/chaser/readme.md
diff --git a/keyboards/satan/keymaps/chaser/rules.mk b/keyboards/gh60/satan/keymaps/chaser/rules.mk
index 53644093d..53644093d 100644
--- a/keyboards/satan/keymaps/chaser/rules.mk
+++ b/keyboards/gh60/satan/keymaps/chaser/rules.mk
diff --git a/keyboards/satan/keymaps/colemak/keymap.c b/keyboards/gh60/satan/keymaps/colemak/keymap.c
index 08d456d6c..08d456d6c 100644
--- a/keyboards/satan/keymaps/colemak/keymap.c
+++ b/keyboards/gh60/satan/keymaps/colemak/keymap.c
diff --git a/keyboards/satan/keymaps/colemak/readme.md b/keyboards/gh60/satan/keymaps/colemak/readme.md
index 59bd4d124..59bd4d124 100644
--- a/keyboards/satan/keymaps/colemak/readme.md
+++ b/keyboards/gh60/satan/keymaps/colemak/readme.md
diff --git a/keyboards/satan/keymaps/colemak/rules.mk b/keyboards/gh60/satan/keymaps/colemak/rules.mk
index 53644093d..53644093d 100644
--- a/keyboards/satan/keymaps/colemak/rules.mk
+++ b/keyboards/gh60/satan/keymaps/colemak/rules.mk
diff --git a/keyboards/satan/keymaps/dbroqua/keymap.c b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
index d1dc4c3c3..d1dc4c3c3 100644
--- a/keyboards/satan/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
diff --git a/keyboards/satan/keymaps/dbroqua/readme.md b/keyboards/gh60/satan/keymaps/dbroqua/readme.md
index 39e71beed..39e71beed 100644
--- a/keyboards/satan/keymaps/dbroqua/readme.md
+++ b/keyboards/gh60/satan/keymaps/dbroqua/readme.md
diff --git a/keyboards/satan/keymaps/default/keymap.c b/keyboards/gh60/satan/keymaps/default/keymap.c
index 77c1b5005..77c1b5005 100644
--- a/keyboards/satan/keymaps/default/keymap.c
+++ b/keyboards/gh60/satan/keymaps/default/keymap.c
diff --git a/keyboards/satan/keymaps/default/readme.md b/keyboards/gh60/satan/keymaps/default/readme.md
index c366147df..c366147df 100644
--- a/keyboards/satan/keymaps/default/readme.md
+++ b/keyboards/gh60/satan/keymaps/default/readme.md
diff --git a/keyboards/satan/keymaps/default/rules.mk b/keyboards/gh60/satan/keymaps/default/rules.mk
index 53644093d..53644093d 100644
--- a/keyboards/satan/keymaps/default/rules.mk
+++ b/keyboards/gh60/satan/keymaps/default/rules.mk
diff --git a/keyboards/satan/keymaps/dende_iso/keymap.c b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
index e6187c161..e6187c161 100644
--- a/keyboards/satan/keymaps/dende_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
diff --git a/keyboards/satan/keymaps/dende_iso/readme.md b/keyboards/gh60/satan/keymaps/dende_iso/readme.md
index 238a2f725..238a2f725 100644
--- a/keyboards/satan/keymaps/dende_iso/readme.md
+++ b/keyboards/gh60/satan/keymaps/dende_iso/readme.md
diff --git a/keyboards/satan/keymaps/dende_iso/rules.mk b/keyboards/gh60/satan/keymaps/dende_iso/rules.mk
index 53644093d..53644093d 100644
--- a/keyboards/satan/keymaps/dende_iso/rules.mk
+++ b/keyboards/gh60/satan/keymaps/dende_iso/rules.mk
diff --git a/keyboards/satan/keymaps/denolfe/README.md b/keyboards/gh60/satan/keymaps/denolfe/README.md
index 147ea4288..147ea4288 100644
--- a/keyboards/satan/keymaps/denolfe/README.md
+++ b/keyboards/gh60/satan/keymaps/denolfe/README.md
diff --git a/keyboards/satan/keymaps/denolfe/keymap.c b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
index 98fcd9b98..98fcd9b98 100644
--- a/keyboards/satan/keymaps/denolfe/keymap.c
+++ b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
diff --git a/keyboards/satan/keymaps/denolfe/rules.mk b/keyboards/gh60/satan/keymaps/denolfe/rules.mk
index 5a8745b68..5a8745b68 100644
--- a/keyboards/satan/keymaps/denolfe/rules.mk
+++ b/keyboards/gh60/satan/keymaps/denolfe/rules.mk
diff --git a/keyboards/satan/keymaps/dkrieger/config.h b/keyboards/gh60/satan/keymaps/dkrieger/config.h
index faea4d660..faea4d660 100644
--- a/keyboards/satan/keymaps/dkrieger/config.h
+++ b/keyboards/gh60/satan/keymaps/dkrieger/config.h
diff --git a/keyboards/satan/keymaps/dkrieger/keymap.c b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
index ac688d7ea..ac688d7ea 100644
--- a/keyboards/satan/keymaps/dkrieger/keymap.c
+++ b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
diff --git a/keyboards/satan/keymaps/dkrieger/readme.md b/keyboards/gh60/satan/keymaps/dkrieger/readme.md
index 894113239..894113239 100644
--- a/keyboards/satan/keymaps/dkrieger/readme.md
+++ b/keyboards/gh60/satan/keymaps/dkrieger/readme.md
diff --git a/keyboards/satan/keymaps/dkrieger/rules.mk b/keyboards/gh60/satan/keymaps/dkrieger/rules.mk
index d91b0edbf..d91b0edbf 100644
--- a/keyboards/satan/keymaps/dkrieger/rules.mk
+++ b/keyboards/gh60/satan/keymaps/dkrieger/rules.mk
diff --git a/keyboards/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
index dc182753d..dc182753d 100644
--- a/keyboards/satan/keymaps/fakb/config.h
+++ b/keyboards/gh60/satan/keymaps/fakb/config.h
diff --git a/keyboards/satan/keymaps/fakb/keymap.c b/keyboards/gh60/satan/keymaps/fakb/keymap.c
index 93e11a5de..93e11a5de 100644
--- a/keyboards/satan/keymaps/fakb/keymap.c
+++ b/keyboards/gh60/satan/keymaps/fakb/keymap.c
diff --git a/keyboards/satan/keymaps/fakb/readme.md b/keyboards/gh60/satan/keymaps/fakb/readme.md
index b02b41816..b02b41816 100644
--- a/keyboards/satan/keymaps/fakb/readme.md
+++ b/keyboards/gh60/satan/keymaps/fakb/readme.md
diff --git a/keyboards/satan/keymaps/fakb/rules.mk b/keyboards/gh60/satan/keymaps/fakb/rules.mk
index a0d244799..a0d244799 100644
--- a/keyboards/satan/keymaps/fakb/rules.mk
+++ b/keyboards/gh60/satan/keymaps/fakb/rules.mk
diff --git a/keyboards/satan/keymaps/hhkb_7u/keymap.c b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
index b0bc48b45..b0bc48b45 100644
--- a/keyboards/satan/keymaps/hhkb_7u/keymap.c
+++ b/keyboards/gh60/satan/keymaps/hhkb_7u/keymap.c
diff --git a/keyboards/satan/keymaps/hhkb_7u/readme.md b/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
index 39e71beed..39e71beed 100644
--- a/keyboards/satan/keymaps/hhkb_7u/readme.md
+++ b/keyboards/gh60/satan/keymaps/hhkb_7u/readme.md
diff --git a/keyboards/satan/keymaps/isoHHKB/keymap.c b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
index 46d66e5db..46d66e5db 100644
--- a/keyboards/satan/keymaps/isoHHKB/keymap.c
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/keymap.c
diff --git a/keyboards/satan/keymaps/isoHHKB/readme.md b/keyboards/gh60/satan/keymaps/isoHHKB/readme.md
index 64911a043..64911a043 100644
--- a/keyboards/satan/keymaps/isoHHKB/readme.md
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/readme.md
diff --git a/keyboards/satan/keymaps/isoHHKB/rules.mk b/keyboards/gh60/satan/keymaps/isoHHKB/rules.mk
index 08e77f9eb..08e77f9eb 100644
--- a/keyboards/satan/keymaps/isoHHKB/rules.mk
+++ b/keyboards/gh60/satan/keymaps/isoHHKB/rules.mk
diff --git a/keyboards/satan/keymaps/iso_split_rshift/.gitignore b/keyboards/gh60/satan/keymaps/iso_split_rshift/.gitignore
index 4d652661c..4d652661c 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/.gitignore
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/.gitignore
diff --git a/keyboards/satan/keymaps/iso_split_rshift/build.sh b/keyboards/gh60/satan/keymaps/iso_split_rshift/build.sh
index 6b4b4568f..6b4b4568f 100755
--- a/keyboards/satan/keymaps/iso_split_rshift/build.sh
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/build.sh
diff --git a/keyboards/satan/keymaps/iso_split_rshift/config.h b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
index 27c1372da..27c1372da 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/config.h
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
diff --git a/keyboards/satan/keymaps/iso_split_rshift/keymap.c b/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c
index a21f83505..a21f83505 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/keymap.c
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c
diff --git a/keyboards/satan/keymaps/iso_split_rshift/readme.md b/keyboards/gh60/satan/keymaps/iso_split_rshift/readme.md
index 480491f5a..480491f5a 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/readme.md
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/readme.md
diff --git a/keyboards/satan/keymaps/iso_split_rshift/rules.mk b/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
index 15cabfcd8..15cabfcd8 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/rules.mk
+++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
diff --git a/keyboards/satan/keymaps/jarred/keymap.c b/keyboards/gh60/satan/keymaps/jarred/keymap.c
index c6852e4eb..c6852e4eb 100644
--- a/keyboards/satan/keymaps/jarred/keymap.c
+++ b/keyboards/gh60/satan/keymaps/jarred/keymap.c
diff --git a/keyboards/satan/keymaps/jarred/readme.md b/keyboards/gh60/satan/keymaps/jarred/readme.md
index 522cb19b6..522cb19b6 100644
--- a/keyboards/satan/keymaps/jarred/readme.md
+++ b/keyboards/gh60/satan/keymaps/jarred/readme.md
diff --git a/keyboards/satan/keymaps/lepa/keymap.c b/keyboards/gh60/satan/keymaps/lepa/keymap.c
index 85fdb743d..85fdb743d 100644
--- a/keyboards/satan/keymaps/lepa/keymap.c
+++ b/keyboards/gh60/satan/keymaps/lepa/keymap.c
diff --git a/keyboards/satan/keymaps/lepa/readme.md b/keyboards/gh60/satan/keymaps/lepa/readme.md
index a53693d03..a53693d03 100644
--- a/keyboards/satan/keymaps/lepa/readme.md
+++ b/keyboards/gh60/satan/keymaps/lepa/readme.md
diff --git a/keyboards/satan/keymaps/lepa/rules.mk b/keyboards/gh60/satan/keymaps/lepa/rules.mk
index 74a42b647..74a42b647 100644
--- a/keyboards/satan/keymaps/lepa/rules.mk
+++ b/keyboards/gh60/satan/keymaps/lepa/rules.mk
diff --git a/keyboards/satan/keymaps/mark1/keymap.c b/keyboards/gh60/satan/keymaps/mark1/keymap.c
index 565a83fa9..565a83fa9 100644
--- a/keyboards/satan/keymaps/mark1/keymap.c
+++ b/keyboards/gh60/satan/keymaps/mark1/keymap.c
diff --git a/keyboards/satan/keymaps/mark1/readme.md b/keyboards/gh60/satan/keymaps/mark1/readme.md
index 060faf80c..060faf80c 100644
--- a/keyboards/satan/keymaps/mark1/readme.md
+++ b/keyboards/gh60/satan/keymaps/mark1/readme.md
diff --git a/keyboards/satan/keymaps/midi/config.h b/keyboards/gh60/satan/keymaps/midi/config.h
index 8e10b04ec..8e10b04ec 100644
--- a/keyboards/satan/keymaps/midi/config.h
+++ b/keyboards/gh60/satan/keymaps/midi/config.h
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/gh60/satan/keymaps/midi/keymap.c
index 141bef3d6..141bef3d6 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/gh60/satan/keymaps/midi/keymap.c
diff --git a/keyboards/satan/keymaps/midi/readme.md b/keyboards/gh60/satan/keymaps/midi/readme.md
index 87844a854..87844a854 100644
--- a/keyboards/satan/keymaps/midi/readme.md
+++ b/keyboards/gh60/satan/keymaps/midi/readme.md
diff --git a/keyboards/satan/keymaps/midi/rules.mk b/keyboards/gh60/satan/keymaps/midi/rules.mk
index 87025ed6f..87025ed6f 100644
--- a/keyboards/satan/keymaps/midi/rules.mk
+++ b/keyboards/gh60/satan/keymaps/midi/rules.mk
diff --git a/keyboards/satan/keymaps/no_caps_lock/keymap.c b/keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c
index 48659bb66..48659bb66 100644
--- a/keyboards/satan/keymaps/no_caps_lock/keymap.c
+++ b/keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c
diff --git a/keyboards/satan/keymaps/no_caps_lock/readme.md b/keyboards/gh60/satan/keymaps/no_caps_lock/readme.md
index b3bfe7988..b3bfe7988 100644
--- a/keyboards/satan/keymaps/no_caps_lock/readme.md
+++ b/keyboards/gh60/satan/keymaps/no_caps_lock/readme.md
diff --git a/keyboards/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
index eab4c8e97..eab4c8e97 100644
--- a/keyboards/satan/keymaps/olligranlund_iso/config.h
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
diff --git a/keyboards/satan/keymaps/olligranlund_iso/keymap.c b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
index 789543b56..789543b56 100644
--- a/keyboards/satan/keymaps/olligranlund_iso/keymap.c
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
diff --git a/keyboards/satan/keymaps/olligranlund_iso/readme.md b/keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md
index e0801ef85..e0801ef85 100644
--- a/keyboards/satan/keymaps/olligranlund_iso/readme.md
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md
diff --git a/keyboards/satan/keymaps/olligranlund_iso/rules.mk b/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
index 3d886f14f..3d886f14f 100644
--- a/keyboards/satan/keymaps/olligranlund_iso/rules.mk
+++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
diff --git a/keyboards/satan/keymaps/poker/keymap.c b/keyboards/gh60/satan/keymaps/poker/keymap.c
index 13251a564..13251a564 100644
--- a/keyboards/satan/keymaps/poker/keymap.c
+++ b/keyboards/gh60/satan/keymaps/poker/keymap.c
diff --git a/keyboards/satan/keymaps/rask63/keymap.c b/keyboards/gh60/satan/keymaps/rask63/keymap.c
index bbe15fde8..bbe15fde8 100644
--- a/keyboards/satan/keymaps/rask63/keymap.c
+++ b/keyboards/gh60/satan/keymaps/rask63/keymap.c
diff --git a/keyboards/satan/keymaps/sethbc/keymap.c b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
index 2a25b2b6b..2a25b2b6b 100644
--- a/keyboards/satan/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
diff --git a/keyboards/satan/keymaps/sethbc/readme.md b/keyboards/gh60/satan/keymaps/sethbc/readme.md
index ed0eb8701..ed0eb8701 100644
--- a/keyboards/satan/keymaps/sethbc/readme.md
+++ b/keyboards/gh60/satan/keymaps/sethbc/readme.md
diff --git a/keyboards/satan/keymaps/sethbc/rules.mk b/keyboards/gh60/satan/keymaps/sethbc/rules.mk
index 53644093d..53644093d 100644
--- a/keyboards/satan/keymaps/sethbc/rules.mk
+++ b/keyboards/gh60/satan/keymaps/sethbc/rules.mk
diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/gh60/satan/keymaps/smt/keymap.c
index 8546211d5..8546211d5 100644
--- a/keyboards/satan/keymaps/smt/keymap.c
+++ b/keyboards/gh60/satan/keymaps/smt/keymap.c
diff --git a/keyboards/satan/keymaps/smt/readme.md b/keyboards/gh60/satan/keymaps/smt/readme.md
index 7b706d601..7b706d601 100644
--- a/keyboards/satan/keymaps/smt/readme.md
+++ b/keyboards/gh60/satan/keymaps/smt/readme.md
diff --git a/keyboards/satan/keymaps/smt/rules.mk b/keyboards/gh60/satan/keymaps/smt/rules.mk
index 3fe140adc..3fe140adc 100644
--- a/keyboards/satan/keymaps/smt/rules.mk
+++ b/keyboards/gh60/satan/keymaps/smt/rules.mk
diff --git a/keyboards/satan/keymaps/spacemanspiff/keymap.c b/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
index 8caa70e02..8caa70e02 100644
--- a/keyboards/satan/keymaps/spacemanspiff/keymap.c
+++ b/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
diff --git a/keyboards/satan/keymaps/spacemanspiff/readme.md b/keyboards/gh60/satan/keymaps/spacemanspiff/readme.md
index 1d592509d..1d592509d 100644
--- a/keyboards/satan/keymaps/spacemanspiff/readme.md
+++ b/keyboards/gh60/satan/keymaps/spacemanspiff/readme.md
diff --git a/keyboards/satan/keymaps/stanleylai/config.h b/keyboards/gh60/satan/keymaps/stanleylai/config.h
index 7f4bb441c..7f4bb441c 100644
--- a/keyboards/satan/keymaps/stanleylai/config.h
+++ b/keyboards/gh60/satan/keymaps/stanleylai/config.h
diff --git a/keyboards/satan/keymaps/stanleylai/keymap.c b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
index 633719a88..633719a88 100644
--- a/keyboards/satan/keymaps/stanleylai/keymap.c
+++ b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
diff --git a/keyboards/satan/keymaps/unxmaal/README.md b/keyboards/gh60/satan/keymaps/unxmaal/README.md
index 50ad0cf1f..50ad0cf1f 100644
--- a/keyboards/satan/keymaps/unxmaal/README.md
+++ b/keyboards/gh60/satan/keymaps/unxmaal/README.md
diff --git a/keyboards/satan/keymaps/unxmaal/keymap.c b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
index f311ebeeb..f311ebeeb 100644
--- a/keyboards/satan/keymaps/unxmaal/keymap.c
+++ b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
diff --git a/keyboards/satan/keymaps/unxmaal/rules.mk b/keyboards/gh60/satan/keymaps/unxmaal/rules.mk
index e72478251..e72478251 100644
--- a/keyboards/satan/keymaps/unxmaal/rules.mk
+++ b/keyboards/gh60/satan/keymaps/unxmaal/rules.mk
diff --git a/keyboards/satan/readme.md b/keyboards/gh60/satan/readme.md
index 7eb272cf3..f6a56e4a8 100644
--- a/keyboards/satan/readme.md
+++ b/keyboards/gh60/satan/readme.md
@@ -8,7 +8,9 @@ Hardware Availability: https://www.1upkeyboards.com/shop/controllers/gh60-satan-
 
 Make example for this keyboard (after setting up your build environment):
 
-    make satan:default
+    make gh60/satan:default
+
+**Note:** This GH60 Satan firmware will not be compatible with the GH60 Rev C PCB. Conversely, the GH60 Rev C firmware will not be compatible with this PCB. Please ensure you have the correct firmware/pcb combination before flashing. 
 
 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/satan/rules.mk b/keyboards/gh60/satan/rules.mk
index 51161490e..b6bb68391 100644
--- a/keyboards/satan/rules.mk
+++ b/keyboards/gh60/satan/rules.mk
@@ -47,7 +47,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = lite   # 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)
diff --git a/keyboards/satan/satan.c b/keyboards/gh60/satan/satan.c
index 8542a57c4..8542a57c4 100644
--- a/keyboards/satan/satan.c
+++ b/keyboards/gh60/satan/satan.c
diff --git a/keyboards/satan/satan.h b/keyboards/gh60/satan/satan.h
index baa669fc9..baa669fc9 100644
--- a/keyboards/satan/satan.h
+++ b/keyboards/gh60/satan/satan.h
diff --git a/keyboards/satan/keymaps/iso_split_rshift/resetboard.sh b/keyboards/satan/keymaps/iso_split_rshift/resetboard.sh
deleted file mode 100755
index d955ccf54..000000000
--- a/keyboards/satan/keymaps/iso_split_rshift/resetboard.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-sudo dfu-programmer atmega32u4 erase --force
-sudo dfu-programmer atmega32u4 flash clear_flash.hex
-sudo dfu-programmer atmega32u4 reset