3 files changed, 22 insertions, 37 deletions
diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c
index 8048194bbc..25493d94c3 100644
--- a/keyboards/handwired/gamenum/gamenum.c
+++ b/keyboards/handwired/gamenum/gamenum.c
@@ -1,4 +1,4 @@
-#include "gamenum.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/handwired/gamenum/gamenum.h b/keyboards/handwired/gamenum/gamenum.h
deleted file mode 100644
index 48883b1185..0000000000
--- a/keyboards/handwired/gamenum/gamenum.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, \
-    k30, k31, k32, \
-         k41, k42, k43 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, XXX }, \
-    { k30, k31, k32, XXX }, \
-    { XXX, k41, k42, k43 } \
-}
diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json
index e35fb4a4e5..bb12b3b1f7 100644
--- a/keyboards/handwired/gamenum/info.json
+++ b/keyboards/handwired/gamenum/info.json
@@ -18,23 +18,27 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Fn", "x":0, "y":0}, 
-        {"label":"/", "x":1, "y":0}, 
-        {"label":"*", "x":2, "y":0}, 
-        {"label":"-", "x":3, "y":0}, 
-        {"label":"7", "x":0, "y":1}, 
-        {"label":"8", "x":1, "y":1}, 
-        {"label":"9", "x":2, "y":1}, 
-        {"label":"+", "x":3, "y":1, "h":2}, 
-        {"label":"4", "x":0, "y":2}, 
-        {"label":"5", "x":1, "y":2}, 
-        {"label":"6", "x":2, "y":2}, 
-        {"label":"1", "x":0, "y":3}, 
-        {"label":"2", "x":1, "y":3}, 
-        {"label":"3", "x":2, "y":3}, 
-        {"label":"0", "x":0, "y":4, "w":2}, 
-        {"label":".", "x":2, "y":4}, 
-        {"label":"Ent", "x":3, "y":3, "h":2}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "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": 1, "h": 2},
+
+        {"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},
+
+        {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
       ]
     }
   }