diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json
new file mode 100644
index 00000000000..e8d03a43fd1
--- /dev/null
+++ b/keyboards/puck/info.json
@@ -0,0 +1,25 @@
+{
+  "keyboard_name": "Puck", 
+  "url": "", 
+  "maintainer": "john-pettigrew", 
+  "width": 3, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label":"SW1", "x":0, "y":0}, 
+        {"label":"SW2", "x":1, "y":0}, 
+        {"label":"SW3", "x":2, "y":0}, 
+        {"label":"SW4", "x":0, "y":1}, 
+        {"label":"SW5", "x":1, "y":1}, 
+        {"label":"SW6", "x":2, "y":1}, 
+        {"label":"SW7", "x":0, "y":2}, 
+        {"label":"SW8", "x":1, "y":2}, 
+        {"label":"SW9", "x":2, "y":2}, 
+        {"label":"SW10", "x":0, "y":3}, 
+        {"label":"SW11", "x":1, "y":3}, 
+        {"label":"SW12", "x":2, "y":3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/puck/puck.h b/keyboards/puck/puck.h
index 4467614fdb8..0f2a284a67f 100644
--- a/keyboards/puck/puck.h
+++ b/keyboards/puck/puck.h
@@ -4,7 +4,10 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B \
+    K00, K01, K02, \
+    K03, K04, K05, \
+    K06, K07, K08, \
+    K09, K0A, K0B  \
 ) { \
     { K00, K01, K02 }, \
     { K03, K04, K05 }, \
diff --git a/keyboards/puck/readme.md b/keyboards/puck/readme.md
index 45e438c4719..fe1bd1668f6 100644
--- a/keyboards/puck/readme.md
+++ b/keyboards/puck/readme.md
@@ -1,8 +1,10 @@
-A 4 x 3 macropad.
+# Puck
 
-Keyboard Maintainer: [john-pettigrew](https://github.com/john-pettigrew)
-Hardware Supported: Puck PCB.
-Hardware Availability: [OkKeebs.com](https://okkeebs.com/products/puck-pcb)
+A 4x3 macropad.
+
+Keyboard Maintainer: [John Pettigrew](https://github.com/john-pettigrew)  
+Hardware Supported: Puck PCB  
+Hardware Availability: [OKKeebs.com](https://okkeebs.com/products/puck-pcb)
 
 Make example for this keyboard (after setting up your build environment):