3 files changed, 9 insertions, 59 deletions
diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json
index b0fbe9f9ed..1cbffbd568 100644
--- a/keyboards/kiwikeebs/macro/info.json
+++ b/keyboards/kiwikeebs/macro/info.json
@@ -23,14 +23,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "k00", "x": 0, "y": 0 },
-                { "label": "k01", "x": 1, "y": 0 },
-                { "label": "k02", "x": 2, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2}
 
-                { "label": "k03", "x": 0, "y": 1 },
-                { "label": "k04", "x": 1, "y": 1 },
-                { "label": "k05", "x": 2, "y": 1 },
-                { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
             ]
         }
     }
diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/macro/macro.c
deleted file mode 100644
index cc854cf139..0000000000
--- a/keyboards/kiwikeebs/macro/macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 "macro.h"
diff --git a/keyboards/kiwikeebs/macro/macro.h b/keyboards/kiwikeebs/macro/macro.h
deleted file mode 100644
index ee7c6bd47d..0000000000
--- a/keyboards/kiwikeebs/macro/macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-    k03, k04, k05, k06    \
-) { \
-    { k00, k01, k02, KC_NO }, \
-    { k03, k04, k05, k06 }  \
-}