5 files changed, 26 insertions, 62 deletions
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index 4b437a01e4..c4b27e4324 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 12
-
-/* key matrix pins */
-#define DIRECT_PINS { \
-    { F4, B6, B5, B4, E6, D7, F6, F7, B1, B3, B2, F5 } \
-}
-
-#define ENCODERS_PAD_A { D1, D4 }
-#define ENCODERS_PAD_B { D0, C6 }
-
 /* WS2812 RGB LED */
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
@@ -104,7 +90,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 #endif
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index 0a45edc35f..028332b5f4 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -8,21 +8,34 @@
         "pid": "0x111C",
         "device_version": "1.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"},
+            {"pin_a": "D4", "pin_b": "C6"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F2", "x": 1, "y": 0 },
-                { "label": "F3", "x": 2, "y": 0 },
-                { "label": "F4", "x": 3, "y": 0 },
-                { "label": "F5", "x": 4, "y": 0 },
-                { "label": "F6", "x": 5, "y": 0 },
-                { "label": "F7", "x": 6, "y": 0 },
-                { "label": "F8", "x": 7, "y": 0 },
-                { "label": "F9", "x": 8, "y": 0 },
-                { "label": "F10", "x": 9, "y": 0 },
-                { "label": "F11", "x": 10, "y": 0 },
-                { "label": "F12", "x": 11, "y": 0 }
+                { "x": 0, "y": 0, "matrix": [0, 0] },
+                { "x": 1, "y": 0, "matrix": [0, 1] },
+                { "x": 2, "y": 0, "matrix": [0, 2] },
+                { "x": 3, "y": 0, "matrix": [0, 3] },
+                { "x": 4, "y": 0, "matrix": [0, 4] },
+                { "x": 5, "y": 0, "matrix": [0, 5] },
+                { "x": 6, "y": 0, "matrix": [0, 6] },
+                { "x": 7, "y": 0, "matrix": [0, 7] },
+                { "x": 8, "y": 0, "matrix": [0, 8] },
+                { "x": 9, "y": 0, "matrix": [0, 9] },
+                { "x": 10, "y": 0, "matrix": [0, 10] },
+                { "x": 11, "y": 0, "matrix": [0, 11] }
             ]
         }
     }
diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk
index 996fef2ad1..d5f501196c 100644
--- a/keyboards/keebio/stick/rules.mk
+++ b/keyboards/keebio/stick/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/stick/stick.c b/keyboards/keebio/stick/stick.c
index 8db839de3b..6fac145091 100644
--- a/keyboards/keebio/stick/stick.c
+++ b/keyboards/keebio/stick/stick.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stick.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/keebio/stick/stick.h b/keyboards/keebio/stick/stick.h
deleted file mode 100644
index 758d7d5b97..0000000000
--- a/keyboards/keebio/stick/stick.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12 \
-    ) { \
-        {A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12} \
-    }