3 files changed, 19 insertions, 23 deletions
diff --git a/keyboards/ll3macorn/bongopad/bongopad.c b/keyboards/ll3macorn/bongopad/bongopad.c
index a53c7e9fbe..f6d03ded6c 100644
--- a/keyboards/ll3macorn/bongopad/bongopad.c
+++ b/keyboards/ll3macorn/bongopad/bongopad.c
@@ -1,6 +1,6 @@
 // Copyright 2021 Ll3macorn (@ll3macorn)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "bongopad.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/ll3macorn/bongopad/bongopad.h b/keyboards/ll3macorn/bongopad/bongopad.h
deleted file mode 100644
index 31fc0cc5c7..0000000000
--- a/keyboards/ll3macorn/bongopad/bongopad.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 Ll3macorn (@ll3macorn)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-	K00,           \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) { \
-	{ K00,   KC_NO, KC_NO }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}
-
diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
index ff276547ea..f7276d6e82 100644
--- a/keyboards/ll3macorn/bongopad/info.json
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -27,8 +27,22 @@
 	"processor": "atmega32u4",
 	"bootloader": "atmel-dfu",
 	"layouts": {
-	    "LAYOUT_default": {
-		"layout": [{"x":0, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
-	    }
+		"LAYOUT_default": {
+			"layout": [
+				{"matrix": [0, 0], "x": 0, "y": 0},
+
+				{"matrix": [1, 0], "x": 0, "y": 1},
+				{"matrix": [1, 1], "x": 1, "y": 1},
+				{"matrix": [1, 2], "x": 2, "y": 1},
+
+				{"matrix": [2, 0], "x": 0, "y": 2},
+				{"matrix": [2, 1], "x": 1, "y": 2},
+				{"matrix": [2, 2], "x": 2, "y": 2},
+
+				{"matrix": [3, 0], "x": 0, "y": 3},
+				{"matrix": [3, 1], "x": 1, "y": 3},
+				{"matrix": [3, 2], "x": 2, "y": 3}
+			]
+		}
 	}
-    }
-\ No newline at end of file
+}