4 files changed, 17 insertions, 24 deletions
diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h
index a2eb9712f9..d3b3c44222 100644
--- a/keyboards/nullbitsco/scramble/v2/config.h
+++ b/keyboards/nullbitsco/scramble/v2/config.h
@@ -19,24 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-#define DIRECT_PINS {{GP6,GP8,GP10}, {GP29,GP28,GP22}}
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 10
-
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { GP24 }
-#define ENCODERS_PAD_B { GP25 }
 #define TAP_CODE_DELAY 10
 
 /* RP2040-specific defines*/
 #define RP2040_FLASH_GENERIC_03H
 #define I2C1_SDA_PIN GP26
 #define I2C1_SCL_PIN GP27
-#define I2C_DRIVER I2CD2
+#define I2C_DRIVER I2CD1
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json
new file mode 100644
index 0000000000..5255c32205
--- /dev/null
+++ b/keyboards/nullbitsco/scramble/v2/info.json
@@ -0,0 +1,15 @@
+{
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP24", "pin_b": "GP25"}
+        ]
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP8", "GP10"],
+            ["GP29", "GP28", "GP22"]
+        ]
+    }
+}
diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk
index f93963285b..f917d68f4e 100644
--- a/keyboards/nullbitsco/scramble/v2/rules.mk
+++ b/keyboards/nullbitsco/scramble/v2/rules.mk
@@ -1,11 +1,3 @@
-# NOTE: This file is is specific to RP2040 builds.
-
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/nullbitsco/scramble/v2/v2.h b/keyboards/nullbitsco/scramble/v2/v2.h
index d278c0a86a..c86282f658 100644
--- a/keyboards/nullbitsco/scramble/v2/v2.h
+++ b/keyboards/nullbitsco/scramble/v2/v2.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "scramble.h"
+#include "quantum.h"
 #include <hal.h>
 
 enum led_mode {