diff --git a/keyboards/rotary_numpad/info.json b/keyboards/rotary_numpad/info.json
index 0b49f6292722..ae1c05ab2ab7 100644
--- a/keyboards/rotary_numpad/info.json
+++ b/keyboards/rotary_numpad/info.json
@@ -2,8 +2,12 @@
     "manufacturer": "rabijl",
     "keyboard_name": "rotary_numpad",
     "maintainer": "rabijl",
-	"development_board": "promicro",
-    "diode_direction": "COL2ROW",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -13,51 +17,50 @@
         "nkro": true,
         "encoder": true
     },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["F5", "F4", "B5", "B4"],
         "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
     },
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "layouts": {
-        "LAYOUT_dense_6x4": {
-            "layout": [
-                {"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},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5}
-            ]
-        }
-    },
     "encoder": {
     	"rotary": [
     		{"pin_a": "D1", "pin_b": "D0", "resolution": 1},
     		{"pin_a": "D4", "pin_b": "C6", "resolution": 1},
     		{"pin_a": "D7", "pin_b": "E6", "resolution": 1}
     	]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0],"x":0, "y":0.4},
+                {"matrix": [0, 0], "x":2, "y":0},
+                {"matrix": [0, 1], "x":3, "y":0},
+                {"matrix": [0, 2], "x":4, "y":0},
+                {"matrix": [0, 3], "x":5, "y":0},
+                {"matrix": [1, 0], "x":2, "y":1.25},
+                {"matrix": [1, 1], "x":3, "y":1.25},
+                {"matrix": [1, 2], "x":4, "y":1.25},
+                {"matrix": [1, 3], "x":5, "y":1.25},
+                {"matrix": [2, 0], "x":2, "y":2.25},
+                {"matrix": [2, 1], "x":3, "y":2.25},
+                {"matrix": [2, 2], "x":4, "y":2.25},
+                {"matrix": [2, 3], "x":5, "y":2.25, "h":2},
+                
+                {"matrix": [3, 3], "x":0, "y":2.75},
+                {"matrix": [3, 0], "x":2, "y":3.25},
+                {"matrix": [3, 1], "x":3, "y":3.25},
+                {"matrix": [3, 2], "x":4, "y":3.25},
+                
+                {"matrix": [4, 0], "x":2, "y":4.25},
+                {"matrix": [4, 1], "x":3, "y":4.25},
+                {"matrix": [4, 2], "x":4, "y":4.25},
+                {"matrix": [4, 3], "x":5, "y":4.25, "h":2},
+                
+                {"matrix": [5, 3], "x":0, "y":5.05},
+                {"matrix": [5, 1], "x":2, "y":5.25, "w":2},
+                {"matrix": [5, 2], "x":4, "y":5.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/rotary_numpad/keymaps/default/keymap.c b/keyboards/rotary_numpad/keymaps/default/keymap.c
index 0b59ef30462d..7ad7f65d3e57 100644
--- a/keyboards/rotary_numpad/keymaps/default/keymap.c
+++ b/keyboards/rotary_numpad/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ r3│ 0 │ . │ r1│
      * └───┴───┴───┴───┘
      */
-    [0] = LAYOUT_dense_6x4(
+    [0] = LAYOUT(
         KC_ESC,  KC_TAB,  MO(1),   KC_BSPC,
         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Insert │Del│   │
      * └───────┴───┘───┘
      */
-    [1] = LAYOUT_dense_6x4(
+    [1] = LAYOUT(
         QK_BOOT,   _______, _______, _______,
         _______, _______, _______, _______,
         KC_HOME, KC_UP,   KC_PGUP, _______,