diff --git a/keyboards/binepad/candypad/keyboard.json b/keyboards/binepad/candypad/keyboard.json
index 1ad030d74e9..fbcc2647bb9 100644
--- a/keyboards/binepad/candypad/keyboard.json
+++ b/keyboards/binepad/candypad/keyboard.json
@@ -1,229 +1,56 @@
 {
     "manufacturer": "binepad",
     "keyboard_name": "CandyPad",
-    "url": "https://candykeys.com/product/candypad-keyboard",
     "maintainer": "binepad",
-    "processor": "RP2040",
     "bootloader": "rp2040",
-    "usb": {
-        "vid": "0x4249",
-        "pid": "0x4350",
-        "device_version": "1.0.0"
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP28", "pin_b": "GP27"},
+            {"pin_a": "GP1", "pin_b": "GP2"}
+        ]
     },
     "features": {
         "bootmagic": true,
+        "encoder": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "encoder": true,
         "oled": true
     },
-    "diode_direction": "COL2ROW",
     "matrix_pins": {
-        "cols": [
-            "GP15",
-            "GP14",
-            "GP13",
-            "GP10"
-        ],
-        "rows": [
-            "GP12",
-            "GP9",
-            "GP7",
-            "GP6",
-            "GP5",
-            null
-        ]
+        "cols": ["GP15", "GP14", "GP13", "GP10"],
+        "rows": ["GP12", "GP9", "GP7", "GP6", "GP5", null]
     },
-    "encoder": {
-        "rotary": [
-            {
-                "pin_a": "GP28",
-                "pin_b": "GP27"
-            },
-            {
-                "pin_a": "GP1",
-                "pin_b": "GP2"
-            }
-        ]
+    "processor": "RP2040",
+    "url": "https://candykeys.com/product/candypad-keyboard",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4350",
+        "vid": "0x4249"
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "label": "",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "label": "",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "label": "Num Lock",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "label": "/",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "label": "*",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "label": "-",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "label": "7",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "label": "8",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "label": "9",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "label": "+",
-                    "x": 3,
-                    "y": 2,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "label": "4",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "label": "5",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "label": "6",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "label": "1",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "label": "2",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "label": "3",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 4,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "label": "0",
-                    "x": 0,
-                    "y": 5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "label": ".",
-                    "x": 2,
-                    "y": 5
-                }
+                {"label": "", "matrix": [5, 0], "x": 2, "y": 0},
+                {"label": "", "matrix": [5, 1], "x": 3, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "/", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "*", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "-", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "7", "matrix": [1, 0], "x": 0, "y": 2},
+                {"label": "8", "matrix": [1, 1], "x": 1, "y": 2},
+                {"label": "9", "matrix": [1, 2], "x": 2, "y": 2},
+                {"label": "+", "matrix": [1, 3], "x": 3, "y": 2, "h": 2},
+                {"label": "4", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "5", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "6", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "1", "matrix": [3, 0], "x": 0, "y": 4},
+                {"label": "2", "matrix": [3, 1], "x": 1, "y": 4},
+                {"label": "3", "matrix": [3, 2], "x": 2, "y": 4},
+                {"label": "Enter", "matrix": [3, 3], "x": 3, "y": 4, "h": 2},
+                {"label": "0", "matrix": [4, 0], "x": 0, "y": 5, "w": 2},
+                {"label": ".", "matrix": [4, 2], "x": 2, "y": 5}
             ]
         }
     }
diff --git a/keyboards/binepad/candypad/keymaps/default/keymap.json b/keyboards/binepad/candypad/keymaps/default/keymap.json
index 9e90c12ccb8..d235bb4d84f 100644
--- a/keyboards/binepad/candypad/keymaps/default/keymap.json
+++ b/keyboards/binepad/candypad/keymaps/default/keymap.json
@@ -1,31 +1,4 @@
 {
-    "keyboard": "binepad/candypad",
-    "keymap": "default",
-    "version": 1,
-    "layout": "LAYOUT",
-    "layers": [
-        [
-            "KC_NUM",
-            "KC_PSLS",
-            "KC_PAST",
-            "KC_PMNS",
-            "KC_P7",
-            "KC_P8",
-            "KC_P9",
-            "KC_PPLS",
-            "KC_P4",
-            "KC_P5",
-            "KC_P6",
-            "KC_P1",
-            "KC_P2",
-            "KC_P3",
-            "KC_PENT",
-            "KC_P0",
-            "KC_PDOT",
-            "MO(1)",
-            "KC_MUTE"
-        ]
-    ],
     "config": {
         "features": {
             "encoder_map": true
@@ -42,5 +15,12 @@
                 "cw": "KC_VOLU"
             }
         ]
-    ]
+    ],
+    "keyboard": "binepad/candypad",
+    "keymap": "default",
+    "layers": [
+        ["KC_NUM", "KC_PSLS", "KC_PAST", "KC_PMNS", "KC_P7", "KC_P8", "KC_P9", "KC_PPLS", "KC_P4", "KC_P5", "KC_P6", "KC_P1", "KC_P2", "KC_P3", "KC_PENT", "KC_P0", "KC_PDOT", "MO(1)", "KC_MUTE"]
+    ],
+    "layout": "LAYOUT",
+    "version": 1
 }