4 files changed, 8 insertions, 12 deletions
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index 8bd73e135e..d13ea1c845 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D3, B7, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, B3, B2, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 //#define EE_HANDS
 
 #define SPLIT_USB_DETECT
@@ -37,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #ifdef RGBLIGHT_ENABLE
-  #define RGB_DI_PIN B5
   #define RGBLED_NUM 18    // Number of LEDs */
 #endif
 /*
diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json
index e2aa377324..21774d1e82 100644
--- a/keyboards/fortitude60/rev1/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -8,10 +8,18 @@
     "pid": "0x1156",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "B3", "B2", "B1"],
+    "rows": ["D1", "D0", "D3", "B7", "B6"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B5",
     "levels": 9
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "split": {
     "soft_serial_pin": "D2"
   },
diff --git a/keyboards/fortitude60/rev1/rev1.c b/keyboards/fortitude60/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/fortitude60/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/fortitude60/rev1/rev1.h b/keyboards/fortitude60/rev1/rev1.h
index ed62b2683e..7445cfa906 100644
--- a/keyboards/fortitude60/rev1/rev1.h
+++ b/keyboards/fortitude60/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "fortitude60.h"
-
 #include "quantum.h"
 
 // Standard Keymap