12 files changed, 21 insertions, 53 deletions

diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h
deleted file mode 100644
index 6c8ce4c0ea..0000000000
--- a/keyboards/primekb/prime_e/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json
index 44b8227fb6..e7ed77e403 100644
--- a/keyboards/primekb/prime_e/info.json
+++ b/keyboards/primekb/prime_e/info.json
@@ -13,6 +13,12 @@
     "mousekey": false,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
     "rows": ["E6", "C7", "B5", "B4"]
diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/keyboard.json
index 998331ad89..f1cb67358c 100644
--- a/keyboards/primekb/prime_e/rgb/info.json
+++ b/keyboards/primekb/prime_e/rgb/keyboard.json
@@ -4,6 +4,9 @@
         "pid": "0x0052",
         "device_version": "0.0.1"
     },
+    "features": {
+        "rgblight": true
+    },
     "rgblight": {
         "led_count": 8,
         "animations": {
diff --git a/keyboards/primekb/prime_e/rgb/rules.mk b/keyboards/primekb/prime_e/rgb/rules.mk
deleted file mode 100644
index 725c0cebcc..0000000000
--- a/keyboards/primekb/prime_e/rgb/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/keyboard.json
index b6078c9d7a..989ff941b5 100644
--- a/keyboards/primekb/prime_e/std/info.json
+++ b/keyboards/primekb/prime_e/std/keyboard.json
@@ -4,6 +4,9 @@
         "pid": "0x0051",
         "device_version": "0.0.1"
     },
+    "features": {
+        "backlight": true
+    },
     "backlight": {
         "pin": "B7",
         "levels": 5
diff --git a/keyboards/primekb/prime_e/std/rules.mk b/keyboards/primekb/prime_e/std/rules.mk
deleted file mode 100644
index f938676f44..0000000000
--- a/keyboards/primekb/prime_e/std/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h
deleted file mode 100644
index 053bc6236a..0000000000
--- a/keyboards/primekb/prime_l/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat
-Copyright 2020 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json
index 52d6713914..ed905f2b0b 100644
--- a/keyboards/primekb/prime_l/info.json
+++ b/keyboards/primekb/prime_l/info.json
@@ -10,6 +10,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "usb": {
     "vid": "0x5052"
   },
diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/keyboard.json
index c68d992943..c14d18ece3 100644
--- a/keyboards/primekb/prime_l/v1/info.json
+++ b/keyboards/primekb/prime_l/v1/keyboard.json
@@ -6,6 +6,9 @@
     "pid": "0x504C",
     "device_version": "0.0.1"
   },
+  "features": {
+    "backlight": true
+  },
   "matrix_pins": {
     "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
     "rows": ["D1", "D0", "B7", "B3", "B2"]
diff --git a/keyboards/primekb/prime_l/v1/rules.mk b/keyboards/primekb/prime_l/v1/rules.mk
deleted file mode 100644
index 54a2685bf6..0000000000
--- a/keyboards/primekb/prime_l/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/keyboard.json
index 77e2a3a750..77e2a3a750 100644
--- a/keyboards/primekb/prime_l/v2/info.json
+++ b/keyboards/primekb/prime_l/v2/keyboard.json
diff --git a/keyboards/primekb/prime_l/v2/rules.mk b/keyboards/primekb/prime_l/v2/rules.mk
deleted file mode 100644
index f845616741..0000000000
--- a/keyboards/primekb/prime_l/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file