12 files changed, 12 insertions, 22 deletions
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h
index b612e1587e..5df8b9c56b 100644
--- a/keyboards/xelus/dharma/config.h
+++ b/keyboards/xelus/dharma/config.h
@@ -21,5 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define FORCE_NKRO
diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json
index 66a037fa9c..f69b621f65 100644
--- a/keyboards/xelus/dharma/info.json
+++ b/keyboards/xelus/dharma/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5845",
         "pid": "0xDAAA",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B3", "B2", "B1", "D5", "D4", "E6", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index af6157aa93..1007f5b3de 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -97,5 +97,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define FORCE_NKRO
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
index 184dc1a67b..90ab8c19ef 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5845",
         "pid": "0x5052",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "custom"
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 5faab0f2d7..9ff25facc8 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -44,6 +44,3 @@
 
 // HSE CLK
 #define STM32_HSECLK 16000000
-
-//Force NKRO
-#define FORCE_NKRO
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
index a9436d4d14..62377018b6 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5845",
         "pid": "0x5208",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
index 20970a866a..3c53ebc8bc 100644
--- a/keyboards/xelus/rs60/rev1/config.h
+++ b/keyboards/xelus/rs60/rev1/config.h
@@ -20,6 +20,3 @@
 
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
-
-//Force NKRO
-#define FORCE_NKRO
diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json
index bfc36db1c4..9b8f0410fa 100644
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -1,6 +1,7 @@
 {
     "usb": {
-        "device_version": "0.1.0"
+        "device_version": "0.1.0",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["E6", "D5", "D3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index 5faab0f2d7..9ff25facc8 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -44,6 +44,3 @@
 
 // HSE CLK
 #define STM32_HSECLK 16000000
-
-//Force NKRO
-#define FORCE_NKRO
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
index 0e9e0d8e9b..ac976a4cb4 100644
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -1,6 +1,7 @@
 {
     "usb": {
-        "device_version": "0.2.0"
+        "device_version": "0.2.0",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
index a5910ae45c..1c5fe4a336 100644
--- a/keyboards/xelus/rs60/rev2_1/config.h
+++ b/keyboards/xelus/rs60/rev2_1/config.h
@@ -24,6 +24,3 @@
 // Emulated EEPROM
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2
-
-//Force NKRO
-#define FORCE_NKRO
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
index 6104631583..b8cda1a22a 100644
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ b/keyboards/xelus/rs60/rev2_1/info.json
@@ -1,6 +1,7 @@
 {
     "usb": {
-        "device_version": "0.2.1"
+        "device_version": "0.2.1",
+        "force_nkro": true
     },
     "matrix_pins": {
         "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],