5 files changed, 37 insertions, 49 deletions
diff --git a/keyboards/clueboard/california/california.h b/keyboards/clueboard/california/california.h
index 853b360e2e..ef5b3f3e04 100644
--- a/keyboards/clueboard/california/california.h
+++ b/keyboards/clueboard/california/california.h
@@ -1,21 +1,3 @@
 #pragma once
 
 #include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT( \
-    K00, K01, \
-    K10, K11, \
-         K21, \
-    K30, K31, \
-    K40, K41, \
-         K51 \
-) { \
-    { K00, K01 }, \
-    { K10, K11 }, \
-    { KC_NO, K21 }, \
-    { K30, K31 }, \
-    { K40, K41 }, \
-    { KC_NO, K51 }  \
-}
diff --git a/keyboards/clueboard/california/config.h b/keyboards/clueboard/california/config.h
index ed9fc17f9c..017f1ddf66 100644
--- a/keyboards/clueboard/california/config.h
+++ b/keyboards/clueboard/california/config.h
@@ -2,22 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xC1ED
-#define PRODUCT_ID      0x23B0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Clueboard
-#define PRODUCT         California Macropad
-
-/* key matrix pins */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 2
-#define DIRECT_PINS { \
-    { A10, A9 }, \
-    { A0, B8 }, \
-    { NO_PIN, B11 }, \
-    { B9, A8 }, \
-    { A7, B1 }, \
-    { NO_PIN, B2 } \
-}
-#define UNUSED_PINS
+#define AUDIO_PIN A5
+#define AUDIO_PIN_ALT A4
+#define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json
index 2a9ced6e9a..e40b2338cd 100644
--- a/keyboards/clueboard/california/info.json
+++ b/keyboards/clueboard/california/info.json
@@ -2,9 +2,40 @@
     "keyboard_name": "Clueboard California",
     "url": "",
     "maintainer": "skullydazed",
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "matrix_pins": {
+        "direct": [
+            ["A10", "A9"],
+            ["A0", "B8"],
+            [null, "B11"],
+            ["B9", "A8"],
+            ["A7", "B1"],
+            [null, "B2"]
+        ]
+    },
+    "features": {
+        "mousekey": true,
+	"extrakey": true,
+	"console": true,
+	"command": true,
+	"audio": true
+    },
+    "usb": {"pid": "0x23B0"},
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":1, "y":2}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":3.75, "y":5}]
+            "layout": [
+                {"x": 0, "y": 0, "w": 1, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "w": 1, "matrix": [0, 1]},
+                {"x": 0, "y": 1, "w": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "w": 1, "matrix": [1, 1]},
+                {"x": 1, "y": 2, "w": 1, "matrix": [2, 1]},
+                {"x": 1.25, "y": 3, "w": 1, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "w": 1, "matrix": [3, 1]},
+                {"x": 2, "y": 4, "w": 1, "matrix": [4, 0]},
+                {"x": 3, "y": 4, "w": 1, "matrix": [4, 1]},
+                {"x": 3.75, "y": 5, "w": 1, "matrix": [5, 1]}
+            ]
         }
     }
 }
diff --git a/keyboards/clueboard/california/keymaps/default/readme.md b/keyboards/clueboard/california/keymaps/default/readme.md
new file mode 100644
index 0000000000..f79b015f75
--- /dev/null
+++ b/keyboards/clueboard/california/keymaps/default/readme.md
@@ -0,0 +1 @@
+Default keymap for the Clueboard California Macropad.
diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk
index e96afd8135..6e7633bfe0 100644
--- a/keyboards/clueboard/california/rules.mk
+++ b/keyboards/clueboard/california/rules.mk
@@ -1,11 +1 @@
-# MCU name
-MCU = STM32F303
-
-## Features
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = yes   # Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes      # USB Nkey Rollover
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = yes
+# This file intentionally left blank