5 files changed, 28 insertions, 62 deletions
diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h
index 7bbf6be429..4ead2dc6f2 100644
--- a/keyboards/yeehaw/config.h
+++ b/keyboards/yeehaw/config.h
@@ -15,20 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 14
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-{ D2, D4, C6, E6, F5, B1, D3, D7, B4, F6, B3, B5, F7, F4 } \
-}
-
-#define ENCODERS_PAD_A { D1 }
-#define ENCODERS_PAD_B { D0 }
-
 #define RGB_DI_PIN B2
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 7
diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json
index b0358618a0..6c0a2b165e 100644
--- a/keyboards/yeehaw/info.json
+++ b/keyboards/yeehaw/info.json
@@ -8,9 +8,36 @@
     "pid": "0x5458",
     "device_version": "1.0.0"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D1", "pin_b": "D0"}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["D2", "D4", "C6", "E6", "F5", "B1", "D3", "D7", "B4", "F6", "B3", "B5", "F7", "F4"]
+    ]
+  },
   "layouts": {
       "LAYOUT": {
-          "layout": [{"label":"VOLU", "x":1, "y":0}, {"label":"VOLD", "x":1, "y":1}, {"label":"M1", "x":2, "y":1.5}, {"label":"UP", "x":3, "y":1.5}, {"label":"MNXT", "x":1, "y":2}, {"label":"M2", "x":4, "y":2}, {"label":"LEFT", "x":2, "y":2.5}, {"label":"DOWN", "x":3, "y":2.5}, {"label":"MO(1)", "x":0, "y":2.75}, {"label":"MPRV", "x":1, "y":3}, {"label":"RIGHT", "x":4, "y":3}, {"label":"MPLY", "x":2, "y":3.5}, {"label":"CTL S", "x":3, "y":3.5}, {"label":"RGB TOG", "x":2.5, "y":4.5}]
+          "layout": [
+            {"x":1, "y":0, "matrix": [0, 0]},
+            {"x":1, "y":1, "matrix": [0, 1]},
+            {"x":2, "y":1.5, "matrix": [0, 2]},
+            {"x":3, "y":1.5, "matrix": [0, 3]},
+            {"x":1, "y":2, "matrix": [0, 4]},
+            {"x":4, "y":2, "matrix": [0, 5]},
+            {"x":2, "y":2.5, "matrix": [0, 6]},
+            {"x":3, "y":2.5, "matrix": [0, 7]},
+            {"x":0, "y":2.75, "matrix": [0, 8]},
+            {"x":1, "y":3, "matrix": [0, 9]},
+            {"x":4, "y":3, "matrix": [0, 10]},
+            {"x":2, "y":3.5, "matrix": [0, 11]},
+            {"x":3, "y":3.5, "matrix": [0, 12]},
+            {"x":2.5, "y":4.5, "matrix": [0, 13]}
+          ]
       }
   }
 }
diff --git a/keyboards/yeehaw/rules.mk b/keyboards/yeehaw/rules.mk
index 43904f80cf..be11c03df9 100644
--- a/keyboards/yeehaw/rules.mk
+++ b/keyboards/yeehaw/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/yeehaw/yeehaw.c b/keyboards/yeehaw/yeehaw.c
deleted file mode 100644
index 3c8a29cade..0000000000
--- a/keyboards/yeehaw/yeehaw.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Caleb Lightfoot
- *
- * 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/>.
- */
-#include "yeehaw.h"
diff --git a/keyboards/yeehaw/yeehaw.h b/keyboards/yeehaw/yeehaw.h
deleted file mode 100644
index 0d63efab97..0000000000
--- a/keyboards/yeehaw/yeehaw.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Caleb Lightfoot
- *
- * 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( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 }  \
- }
-