diff --git a/keyboards/macrocat/info.json b/keyboards/macrocat/info.json
index bf3edb084db..421f1283e13 100644
--- a/keyboards/macrocat/info.json
+++ b/keyboards/macrocat/info.json
@@ -1,7 +1,7 @@
 {
     "manufacturer": "Catmunch",
     "keyboard_name": "MacroCat Keyboard",
-    "maintainer": "Catmunch",
+    "maintainer": "Catmunch, starcatmeow",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
     "features": {
@@ -24,8 +24,11 @@
         "pid": "0x8086",
         "vid": "0x2022"
     },
+    "layout_aliases": {
+        "LAYOUT_numpad_4x4": "LAYOUT_ortho_4x4"
+    },
     "layouts": {
-        "LAYOUT_numpad_4x4": {
+        "LAYOUT_ortho_4x4": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 1], "x": 1, "y": 0 },
@@ -46,4 +49,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/macrocat/keymaps/default/keymap.c b/keyboards/macrocat/keymaps/default/keymap.c
index b173938b702..538dd03295e 100644
--- a/keyboards/macrocat/keymaps/default/keymap.c
+++ b/keyboards/macrocat/keymaps/default/keymap.c
@@ -4,16 +4,16 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = {
-        {KC_PLUS,   KC_9,       KC_8,   KC_7 },
-        {KC_MINS,   KC_6,       KC_5,   KC_4 },
-        {KC_DOT,    KC_3,       KC_2,   KC_1 },
-        {KC_ENT,    KC_SPACE,   KC_0,   MO(1)}
-    },
-    [1] = {
-        {KC_ASTR,   KC_MPRV,    KC_MPLY,KC_MNXT},
-        {KC_SLSH,   KC_LPRN,    KC_UP,  KC_RPRN},
-        {KC_COMM,   KC_LEFT,    KC_DOWN,KC_RIGHT},
-        {KC_TAB,    KC_BSPC,    KC_0,   KC_TRNS}
-    }
+    [0] = LAYOUT_ortho_4x4(
+        KC_PLUS,   KC_9,       KC_8,   KC_7 ,
+        KC_MINS,   KC_6,       KC_5,   KC_4 ,
+        KC_DOT,    KC_3,       KC_2,   KC_1 ,
+        KC_ENT,    KC_SPACE,   KC_0,   MO(1)
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        KC_ASTR,   KC_MPRV,    KC_MPLY,KC_MNXT,
+        KC_SLSH,   KC_LPRN,    KC_UP,  KC_RPRN,
+        KC_COMM,   KC_LEFT,    KC_DOWN,KC_RIGHT,
+        KC_TAB,    KC_BSPC,    KC_0,   KC_TRNS
+    )
 };
diff --git a/keyboards/macrocat/keymaps/oled/keymap.c b/keyboards/macrocat/keymaps/oled/keymap.c
index b9d5d9a9df8..c9864c1dc79 100644
--- a/keyboards/macrocat/keymaps/oled/keymap.c
+++ b/keyboards/macrocat/keymaps/oled/keymap.c
@@ -4,28 +4,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = {
-        {KC_PLUS,   KC_9,       KC_8,   KC_7 },
-        {KC_MINS,   KC_6,       KC_5,   KC_4 },
-        {KC_DOT,    KC_3,       KC_2,   KC_1 },
-        {KC_ENT,    KC_SPACE,   KC_0,   MO(1)}
-    },
-    [1] = {
-        {KC_ASTR,   KC_MPRV,    KC_MPLY,KC_MNXT},
-        {KC_SLSH,   KC_LPRN,    KC_UP,  KC_RPRN},
-        {KC_COMM,   KC_LEFT,    KC_DOWN,KC_RIGHT},
-        {KC_TAB,    KC_BSPC,    KC_0,   KC_TRNS}
-    },
-    [2] = {
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO}
-    },
-    [3] = {
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO}
-    }
+    [0] = LAYOUT_ortho_4x4(
+        KC_PLUS,   KC_9,       KC_8,   KC_7 ,
+        KC_MINS,   KC_6,       KC_5,   KC_4 ,
+        KC_DOT,    KC_3,       KC_2,   KC_1 ,
+        KC_ENT,    KC_SPACE,   KC_0,   MO(1)
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        KC_ASTR,   KC_MPRV,    KC_MPLY,KC_MNXT,
+        KC_SLSH,   KC_LPRN,    KC_UP,  KC_RPRN,
+        KC_COMM,   KC_LEFT,    KC_DOWN,KC_RIGHT,
+        KC_TAB,    KC_BSPC,    KC_0,   KC_TRNS
+    ),
+    [2] = LAYOUT_ortho_4x4(
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO
+    ),
+    [3] = LAYOUT_ortho_4x4(
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO
+    )
 };
diff --git a/keyboards/macrocat/keymaps/via/keymap.c b/keyboards/macrocat/keymaps/via/keymap.c
index c10d6e1357d..3a0df45fb78 100644
--- a/keyboards/macrocat/keymaps/via/keymap.c
+++ b/keyboards/macrocat/keymaps/via/keymap.c
@@ -4,28 +4,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = {
-        {KC_PPLS,   KC_9,       KC_8,   KC_7 },
-        {KC_PMNS,   KC_6,       KC_5,   KC_4 },
-        {KC_PDOT,   KC_3,       KC_2,   KC_1 },
-        {KC_PENT,   KC_SPACE,   KC_P0,  MO(1)}
-    },
-    [1] = {
-        {KC_PAST,   KC_NO,      KC_NO,  KC_NO},
-        {KC_PSLS,   KC_LPRN,    KC_UP,  KC_RPRN},
-        {KC_COMM,   KC_LEFT,    KC_DOWN,KC_RIGHT},
-        {KC_TAB,    KC_BSPC,    KC_P0,  KC_TRNS}
-    },
-    [2] = {
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO}
-    },
-    [3] = {
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO},
-        {KC_NO,     KC_NO,      KC_NO,  KC_NO}
-    }
+    [0] = LAYOUT_ortho_4x4(
+        KC_PPLS,   KC_9,       KC_8,   KC_7 ,
+        KC_PMNS,   KC_6,       KC_5,   KC_4 ,
+        KC_PDOT,   KC_3,       KC_2,   KC_1 ,
+        KC_PENT,   KC_SPACE,   KC_P0,  MO(1)
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        KC_PAST,   KC_NO,      KC_NO,  KC_NO,
+        KC_PSLS,   KC_LPRN,    KC_UP,  KC_RPRN,
+        KC_COMM,   KC_LEFT,    KC_DOWN,KC_RIGHT,
+        KC_TAB,    KC_BSPC,    KC_P0,  KC_TRNS
+    ),
+    [2] = LAYOUT_ortho_4x4(
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO
+    ),
+    [3] = LAYOUT_ortho_4x4(
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO,
+        KC_NO,     KC_NO,      KC_NO,  KC_NO
+    )
 };
diff --git a/keyboards/macrocat/readme.md b/keyboards/macrocat/readme.md
index 42cf36dc16f..da06c04f63a 100644
--- a/keyboards/macrocat/readme.md
+++ b/keyboards/macrocat/readme.md
@@ -4,7 +4,7 @@
 
 A cat like macro keyboard/numpad.
 
-* Keyboard Maintainer: [catmunch](https://github.com/catmunch)
+* Keyboard Maintainer: [catmunch](https://github.com/catmunch), [starcatmeow](https://github.com/starcatmeow)
 * Hardware Supported: Fully Supported
 * Hardware Availability: [MacroCat Keyboard](https://github.com/catmunch/macrocat)
 
@@ -16,8 +16,6 @@ Flashing example for this keyboard:
 
     make macrocat:default:flash
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
 ## Bootloader
 
 Enter the bootloader in 3 ways:
@@ -25,3 +23,5 @@ Enter the bootloader in 3 ways:
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
 * **Brand new atmega32u4 chip**: Plug the cable in, it will automatically boot into bootloader
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).