AEBoards Aegis Layout Additions (#20960)

* add matrix_diagram.md

* rename LAYOUT_aegis to LAYOUT_all

* info.json: apply friendly formatting

* add LAYOUT_numpad with reference keymap

* add LAYOUT_2u_bs_275u_rshift with reference keymap

6 files changed, 543 insertions, 126 deletions

diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json
index 5fe143318f..823e45c8e2 100644
--- a/keyboards/aeboards/aegis/info.json
+++ b/keyboards/aeboards/aegis/info.json
@@ -15,126 +15,367 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_aegis": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT_aegis": {
+        "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-
-                {"matrix": [0, 2], "x": 4.5, "y": 0},
-
-                {"matrix": [1, 2], "x": 6.5, "y": 0},
-                {"matrix": [0, 3], "x": 7.5, "y": 0},
-                {"matrix": [1, 3], "x": 8.5, "y": 0},
-                {"matrix": [0, 4], "x": 9.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 11, "y": 0},
-                {"matrix": [0, 5], "x": 12, "y": 0},
-                {"matrix": [1, 5], "x": 13, "y": 0},
-                {"matrix": [0, 6], "x": 14, "y": 0},
-
-                {"matrix": [1, 6], "x": 15.5, "y": 0},
-                {"matrix": [0, 7], "x": 16.5, "y": 0},
-                {"matrix": [1, 7], "x": 17.5, "y": 0},
-                {"matrix": [0, 8], "x": 18.5, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.5},
-                {"matrix": [3, 0], "x": 1, "y": 1.5},
-                {"matrix": [2, 1], "x": 2, "y": 1.5},
-                {"matrix": [3, 1], "x": 3, "y": 1.5},
-
-                {"matrix": [2, 2], "x": 4.5, "y": 1.5},
-                {"matrix": [3, 2], "x": 5.5, "y": 1.5},
-                {"matrix": [2, 3], "x": 6.5, "y": 1.5},
-                {"matrix": [3, 3], "x": 7.5, "y": 1.5},
-                {"matrix": [2, 4], "x": 8.5, "y": 1.5},
-                {"matrix": [3, 4], "x": 9.5, "y": 1.5},
-                {"matrix": [2, 5], "x": 10.5, "y": 1.5},
-                {"matrix": [3, 5], "x": 11.5, "y": 1.5},
-                {"matrix": [2, 6], "x": 12.5, "y": 1.5},
-                {"matrix": [3, 6], "x": 13.5, "y": 1.5},
-                {"matrix": [2, 7], "x": 14.5, "y": 1.5},
-                {"matrix": [3, 7], "x": 15.5, "y": 1.5},
-                {"matrix": [2, 8], "x": 16.5, "y": 1.5},
-                {"matrix": [3, 8], "x": 17.5, "y": 1.5},
-                {"matrix": [1, 8], "x": 18.5, "y": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.5},
-                {"matrix": [5, 0], "x": 1, "y": 2.5},
-                {"matrix": [4, 1], "x": 2, "y": 2.5},
-                {"matrix": [5, 1], "x": 3, "y": 2.5},
-
-                {"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 6, "y": 2.5},
-                {"matrix": [4, 3], "x": 7, "y": 2.5},
-                {"matrix": [5, 3], "x": 8, "y": 2.5},
-                {"matrix": [4, 4], "x": 9, "y": 2.5},
-                {"matrix": [5, 4], "x": 10, "y": 2.5},
-                {"matrix": [4, 5], "x": 11, "y": 2.5},
-                {"matrix": [5, 5], "x": 12, "y": 2.5},
-                {"matrix": [4, 6], "x": 13, "y": 2.5},
-                {"matrix": [5, 6], "x": 14, "y": 2.5},
-                {"matrix": [4, 7], "x": 15, "y": 2.5},
-                {"matrix": [5, 7], "x": 16, "y": 2.5},
-                {"matrix": [4, 8], "x": 17, "y": 2.5},
-                {"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.5},
-                {"matrix": [7, 0], "x": 1, "y": 3.5},
-                {"matrix": [6, 1], "x": 2, "y": 3.5},
-                {"matrix": [7, 1], "x": 3, "y": 3.5},
-
-                {"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
-                {"matrix": [7, 2], "x": 6.25, "y": 3.5},
-                {"matrix": [6, 3], "x": 7.25, "y": 3.5},
-                {"matrix": [7, 3], "x": 8.25, "y": 3.5},
-                {"matrix": [6, 4], "x": 9.25, "y": 3.5},
-                {"matrix": [7, 4], "x": 10.25, "y": 3.5},
-                {"matrix": [6, 5], "x": 11.25, "y": 3.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 3.5},
-                {"matrix": [6, 6], "x": 13.25, "y": 3.5},
-                {"matrix": [7, 6], "x": 14.25, "y": 3.5},
-                {"matrix": [6, 7], "x": 15.25, "y": 3.5},
-                {"matrix": [7, 7], "x": 16.25, "y": 3.5},
-                {"matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.5},
-                {"matrix": [9, 0], "x": 1, "y": 4.5},
-                {"matrix": [8, 1], "x": 2, "y": 4.5},
-                {"matrix": [9, 1], "x": 3, "y": 4.5},
-
-                {"matrix": [8, 2], "x": 4.25, "y": 4.75},
-
-                {"matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
-                {"matrix": [8, 3], "x": 6.75, "y": 4.5},
-                {"matrix": [9, 3], "x": 7.75, "y": 4.5},
-                {"matrix": [8, 4], "x": 8.75, "y": 4.5},
-                {"matrix": [9, 4], "x": 9.75, "y": 4.5},
-                {"matrix": [8, 5], "x": 10.75, "y": 4.5},
-                {"matrix": [9, 5], "x": 11.75, "y": 4.5},
-                {"matrix": [8, 6], "x": 12.75, "y": 4.5},
-                {"matrix": [9, 6], "x": 13.75, "y": 4.5},
-                {"matrix": [8, 7], "x": 14.75, "y": 4.5},
-                {"matrix": [9, 7], "x": 15.75, "y": 4.5},
-                {"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
-                {"matrix": [9, 8], "x": 18.5, "y": 4.5},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.5},
-                {"matrix": [11, 0], "x": 1, "y": 5.5},
-                {"matrix": [10, 1], "x": 2, "y": 5.5},
-
-                {"matrix": [11, 1], "x": 3.25, "y": 5.75},
-                {"matrix": [10, 2], "x": 4.25, "y": 5.75},
-                {"matrix": [11, 2], "x": 5.25, "y": 5.75},
-
-                {"matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
-                {"matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
-                {"matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
-                {"matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
+                {"label": "End", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Home", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "Page Down", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "Page Up", "matrix": [1, 1], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [1, 2], "x": 6.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 7.5, "y": 0},
+                {"label": "F3", "matrix": [1, 3], "x": 8.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"label": "F5", "matrix": [1, 4], "x": 11, "y": 0},
+                {"label": "F6", "matrix": [0, 5], "x": 12, "y": 0},
+                {"label": "F7", "matrix": [1, 5], "x": 13, "y": 0},
+                {"label": "F8", "matrix": [0, 6], "x": 14, "y": 0},
+
+                {"label": "F9", "matrix": [1, 6], "x": 15.5, "y": 0},
+                {"label": "F10", "matrix": [0, 7], "x": 16.5, "y": 0},
+                {"label": "F11", "matrix": [1, 7], "x": 17.5, "y": 0},
+                {"label": "F12", "matrix": [0, 8], "x": 18.5, "y": 0},
+
+                {"label": "-", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "*", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "/", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "Backspace", "matrix": [3, 1], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [2, 2], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [3, 2], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [2, 3], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [3, 3], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [2, 4], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [3, 4], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [2, 5], "x": 10.5, "y": 1.5},
+                {"label": "7", "matrix": [3, 5], "x": 11.5, "y": 1.5},
+                {"label": "8", "matrix": [2, 6], "x": 12.5, "y": 1.5},
+                {"label": "9", "matrix": [3, 6], "x": 13.5, "y": 1.5},
+                {"label": "0", "matrix": [2, 7], "x": 14.5, "y": 1.5},
+                {"label": "-", "matrix": [3, 7], "x": 15.5, "y": 1.5},
+                {"label": "=", "matrix": [2, 8], "x": 16.5, "y": 1.5},
+                {"label": "\\", "matrix": [3, 8], "x": 17.5, "y": 1.5},
+                {"label": "Delete", "matrix": [1, 8], "x": 18.5, "y": 1.5},
+
+                {"label": "+", "matrix": [4, 0], "x": 0, "y": 2.5},
+                {"label": "9", "matrix": [5, 0], "x": 1, "y": 2.5},
+                {"label": "8", "matrix": [4, 1], "x": 2, "y": 2.5},
+                {"label": "7", "matrix": [5, 1], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 2], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [4, 3], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [5, 3], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [4, 4], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [5, 4], "x": 10, "y": 2.5},
+                {"label": "Y", "matrix": [4, 5], "x": 11, "y": 2.5},
+                {"label": "U", "matrix": [5, 5], "x": 12, "y": 2.5},
+                {"label": "I", "matrix": [4, 6], "x": 13, "y": 2.5},
+                {"label": "O", "matrix": [5, 6], "x": 14, "y": 2.5},
+                {"label": "P", "matrix": [4, 7], "x": 15, "y": 2.5},
+                {"label": "[", "matrix": [5, 7], "x": 16, "y": 2.5},
+                {"label": "]", "matrix": [4, 8], "x": 17, "y": 2.5},
+                {"label": "Backspace", "matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+                {"label": "+", "matrix": [6, 0], "x": 0, "y": 3.5},
+                {"label": "6", "matrix": [7, 0], "x": 1, "y": 3.5},
+                {"label": "5", "matrix": [6, 1], "x": 2, "y": 3.5},
+                {"label": "4", "matrix": [7, 1], "x": 3, "y": 3.5},
+
+                {"label": "Ctrl", "matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 2], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [6, 3], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [7, 3], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [6, 4], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [7, 4], "x": 10.25, "y": 3.5},
+                {"label": "H", "matrix": [6, 5], "x": 11.25, "y": 3.5},
+                {"label": "J", "matrix": [7, 5], "x": 12.25, "y": 3.5},
+                {"label": "K", "matrix": [6, 6], "x": 13.25, "y": 3.5},
+                {"label": "L", "matrix": [7, 6], "x": 14.25, "y": 3.5},
+                {"label": ";", "matrix": [6, 7], "x": 15.25, "y": 3.5},
+                {"label": "'", "matrix": [7, 7], "x": 16.25, "y": 3.5},
+                {"label": "Enter", "matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+                {"label": "Enter", "matrix": [8, 0], "x": 0, "y": 4.5},
+                {"label": "3", "matrix": [9, 0], "x": 1, "y": 4.5},
+                {"label": "2", "matrix": [8, 1], "x": 2, "y": 4.5},
+                {"label": "1", "matrix": [9, 1], "x": 3, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+                {"label": "Shift", "matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+                {"label": "Z", "matrix": [8, 3], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [9, 3], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [8, 4], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [9, 4], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [8, 5], "x": 10.75, "y": 4.5},
+                {"label": "N", "matrix": [9, 5], "x": 11.75, "y": 4.5},
+                {"label": "M", "matrix": [8, 6], "x": 12.75, "y": 4.5},
+                {"label": ",", "matrix": [9, 6], "x": 13.75, "y": 4.5},
+                {"label": ".", "matrix": [8, 7], "x": 14.75, "y": 4.5},
+                {"label": "/", "matrix": [9, 7], "x": 15.75, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 8], "x": 18.5, "y": 4.5},
+
+                {"label": "Enter", "matrix": [10, 0], "x": 0, "y": 5.5},
+                {"label": ".", "matrix": [11, 0], "x": 1, "y": 5.5},
+                {"label": "0", "matrix": [10, 1], "x": 2, "y": 5.5},
+
+                {"label": "\u2190", "matrix": [11, 1], "x": 3.25, "y": 5.75},
+                {"label": "\u2193", "matrix": [10, 2], "x": 4.25, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+                {"label": "Fn", "matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
+            ]
+        },
+        "LAYOUT_2u_bs_275u_rshift": {
+            "layout": [
+                {"label": "End", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Home", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "Page Down", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "Page Up", "matrix": [1, 1], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [1, 2], "x": 6.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 7.5, "y": 0},
+                {"label": "F3", "matrix": [1, 3], "x": 8.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"label": "F5", "matrix": [1, 4], "x": 11, "y": 0},
+                {"label": "F6", "matrix": [0, 5], "x": 12, "y": 0},
+                {"label": "F7", "matrix": [1, 5], "x": 13, "y": 0},
+                {"label": "F8", "matrix": [0, 6], "x": 14, "y": 0},
+
+                {"label": "F9", "matrix": [1, 6], "x": 15.5, "y": 0},
+                {"label": "F10", "matrix": [0, 7], "x": 16.5, "y": 0},
+                {"label": "F11", "matrix": [1, 7], "x": 17.5, "y": 0},
+                {"label": "F12", "matrix": [0, 8], "x": 18.5, "y": 0},
+
+                {"label": "-", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "*", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "/", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "Backspace", "matrix": [3, 1], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [2, 2], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [3, 2], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [2, 3], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [3, 3], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [2, 4], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [3, 4], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [2, 5], "x": 10.5, "y": 1.5},
+                {"label": "7", "matrix": [3, 5], "x": 11.5, "y": 1.5},
+                {"label": "8", "matrix": [2, 6], "x": 12.5, "y": 1.5},
+                {"label": "9", "matrix": [3, 6], "x": 13.5, "y": 1.5},
+                {"label": "0", "matrix": [2, 7], "x": 14.5, "y": 1.5},
+                {"label": "-", "matrix": [3, 7], "x": 15.5, "y": 1.5},
+                {"label": "=", "matrix": [2, 8], "x": 16.5, "y": 1.5},
+                {"label": "Backspace", "matrix": [3, 8], "x": 17.5, "y": 1.5, "w": 2},
+
+                {"label": "+", "matrix": [4, 0], "x": 0, "y": 2.5},
+                {"label": "9", "matrix": [5, 0], "x": 1, "y": 2.5},
+                {"label": "8", "matrix": [4, 1], "x": 2, "y": 2.5},
+                {"label": "7", "matrix": [5, 1], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 2], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [4, 3], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [5, 3], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [4, 4], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [5, 4], "x": 10, "y": 2.5},
+                {"label": "Y", "matrix": [4, 5], "x": 11, "y": 2.5},
+                {"label": "U", "matrix": [5, 5], "x": 12, "y": 2.5},
+                {"label": "I", "matrix": [4, 6], "x": 13, "y": 2.5},
+                {"label": "O", "matrix": [5, 6], "x": 14, "y": 2.5},
+                {"label": "P", "matrix": [4, 7], "x": 15, "y": 2.5},
+                {"label": "[", "matrix": [5, 7], "x": 16, "y": 2.5},
+                {"label": "]", "matrix": [4, 8], "x": 17, "y": 2.5},
+                {"label": "Backspace", "matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+                {"label": "+", "matrix": [6, 0], "x": 0, "y": 3.5},
+                {"label": "6", "matrix": [7, 0], "x": 1, "y": 3.5},
+                {"label": "5", "matrix": [6, 1], "x": 2, "y": 3.5},
+                {"label": "4", "matrix": [7, 1], "x": 3, "y": 3.5},
+
+                {"label": "Ctrl", "matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 2], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [6, 3], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [7, 3], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [6, 4], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [7, 4], "x": 10.25, "y": 3.5},
+                {"label": "H", "matrix": [6, 5], "x": 11.25, "y": 3.5},
+                {"label": "J", "matrix": [7, 5], "x": 12.25, "y": 3.5},
+                {"label": "K", "matrix": [6, 6], "x": 13.25, "y": 3.5},
+                {"label": "L", "matrix": [7, 6], "x": 14.25, "y": 3.5},
+                {"label": ";", "matrix": [6, 7], "x": 15.25, "y": 3.5},
+                {"label": "'", "matrix": [7, 7], "x": 16.25, "y": 3.5},
+                {"label": "Enter", "matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+                {"label": "Enter", "matrix": [8, 0], "x": 0, "y": 4.5},
+                {"label": "3", "matrix": [9, 0], "x": 1, "y": 4.5},
+                {"label": "2", "matrix": [8, 1], "x": 2, "y": 4.5},
+                {"label": "1", "matrix": [9, 1], "x": 3, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+                {"label": "Shift", "matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+                {"label": "Z", "matrix": [8, 3], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [9, 3], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [8, 4], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [9, 4], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [8, 5], "x": 10.75, "y": 4.5},
+                {"label": "N", "matrix": [9, 5], "x": 11.75, "y": 4.5},
+                {"label": "M", "matrix": [8, 6], "x": 12.75, "y": 4.5},
+                {"label": ",", "matrix": [9, 6], "x": 13.75, "y": 4.5},
+                {"label": ".", "matrix": [8, 7], "x": 14.75, "y": 4.5},
+                {"label": "/", "matrix": [9, 7], "x": 15.75, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 2.75},
+
+                {"label": "Enter", "matrix": [10, 0], "x": 0, "y": 5.5},
+                {"label": ".", "matrix": [11, 0], "x": 1, "y": 5.5},
+                {"label": "0", "matrix": [10, 1], "x": 2, "y": 5.5},
+
+                {"label": "\u2190", "matrix": [11, 1], "x": 3.25, "y": 5.75},
+                {"label": "\u2193", "matrix": [10, 2], "x": 4.25, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+                {"label": "Fn", "matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
+            ]
+        },
+        "LAYOUT_numpad": {
+            "layout": [
+                {"label": "End", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Home", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "Page Down", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "Page Up", "matrix": [1, 1], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 4.5, "y": 0},
+
+                {"label": "F1", "matrix": [1, 2], "x": 6.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 7.5, "y": 0},
+                {"label": "F3", "matrix": [1, 3], "x": 8.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 9.5, "y": 0},
+
+                {"label": "F5", "matrix": [1, 4], "x": 11, "y": 0},
+                {"label": "F6", "matrix": [0, 5], "x": 12, "y": 0},
+                {"label": "F7", "matrix": [1, 5], "x": 13, "y": 0},
+                {"label": "F8", "matrix": [0, 6], "x": 14, "y": 0},
+
+                {"label": "F9", "matrix": [1, 6], "x": 15.5, "y": 0},
+                {"label": "F10", "matrix": [0, 7], "x": 16.5, "y": 0},
+                {"label": "F11", "matrix": [1, 7], "x": 17.5, "y": 0},
+                {"label": "F12", "matrix": [0, 8], "x": 18.5, "y": 0},
+
+                {"label": "-", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "*", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "/", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "Backspace", "matrix": [3, 1], "x": 3, "y": 1.5},
+
+                {"label": "`", "matrix": [2, 2], "x": 4.5, "y": 1.5},
+                {"label": "1", "matrix": [3, 2], "x": 5.5, "y": 1.5},
+                {"label": "2", "matrix": [2, 3], "x": 6.5, "y": 1.5},
+                {"label": "3", "matrix": [3, 3], "x": 7.5, "y": 1.5},
+                {"label": "4", "matrix": [2, 4], "x": 8.5, "y": 1.5},
+                {"label": "5", "matrix": [3, 4], "x": 9.5, "y": 1.5},
+                {"label": "6", "matrix": [2, 5], "x": 10.5, "y": 1.5},
+                {"label": "7", "matrix": [3, 5], "x": 11.5, "y": 1.5},
+                {"label": "8", "matrix": [2, 6], "x": 12.5, "y": 1.5},
+                {"label": "9", "matrix": [3, 6], "x": 13.5, "y": 1.5},
+                {"label": "0", "matrix": [2, 7], "x": 14.5, "y": 1.5},
+                {"label": "-", "matrix": [3, 7], "x": 15.5, "y": 1.5},
+                {"label": "=", "matrix": [2, 8], "x": 16.5, "y": 1.5},
+                {"label": "\\", "matrix": [3, 8], "x": 17.5, "y": 1.5},
+                {"label": "Delete", "matrix": [1, 8], "x": 18.5, "y": 1.5},
+
+                {"label": "+", "matrix": [6, 0], "x": 0, "y": 2.5, "h": 2},
+                {"label": "9", "matrix": [5, 0], "x": 1, "y": 2.5},
+                {"label": "8", "matrix": [4, 1], "x": 2, "y": 2.5},
+                {"label": "7", "matrix": [5, 1], "x": 3, "y": 2.5},
+
+                {"label": "Tab", "matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 2], "x": 6, "y": 2.5},
+                {"label": "W", "matrix": [4, 3], "x": 7, "y": 2.5},
+                {"label": "E", "matrix": [5, 3], "x": 8, "y": 2.5},
+                {"label": "R", "matrix": [4, 4], "x": 9, "y": 2.5},
+                {"label": "T", "matrix": [5, 4], "x": 10, "y": 2.5},
+                {"label": "Y", "matrix": [4, 5], "x": 11, "y": 2.5},
+                {"label": "U", "matrix": [5, 5], "x": 12, "y": 2.5},
+                {"label": "I", "matrix": [4, 6], "x": 13, "y": 2.5},
+                {"label": "O", "matrix": [5, 6], "x": 14, "y": 2.5},
+                {"label": "P", "matrix": [4, 7], "x": 15, "y": 2.5},
+                {"label": "[", "matrix": [5, 7], "x": 16, "y": 2.5},
+                {"label": "]", "matrix": [4, 8], "x": 17, "y": 2.5},
+                {"label": "Backspace", "matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+                {"label": "6", "matrix": [7, 0], "x": 1, "y": 3.5},
+                {"label": "5", "matrix": [6, 1], "x": 2, "y": 3.5},
+                {"label": "4", "matrix": [7, 1], "x": 3, "y": 3.5},
+
+                {"label": "Ctrl", "matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 2], "x": 6.25, "y": 3.5},
+                {"label": "S", "matrix": [6, 3], "x": 7.25, "y": 3.5},
+                {"label": "D", "matrix": [7, 3], "x": 8.25, "y": 3.5},
+                {"label": "F", "matrix": [6, 4], "x": 9.25, "y": 3.5},
+                {"label": "G", "matrix": [7, 4], "x": 10.25, "y": 3.5},
+                {"label": "H", "matrix": [6, 5], "x": 11.25, "y": 3.5},
+                {"label": "J", "matrix": [7, 5], "x": 12.25, "y": 3.5},
+                {"label": "K", "matrix": [6, 6], "x": 13.25, "y": 3.5},
+                {"label": "L", "matrix": [7, 6], "x": 14.25, "y": 3.5},
+                {"label": ";", "matrix": [6, 7], "x": 15.25, "y": 3.5},
+                {"label": "'", "matrix": [7, 7], "x": 16.25, "y": 3.5},
+                {"label": "Enter", "matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+                {"label": "Enter", "matrix": [8, 0], "x": 0, "y": 4.5, "h": 2},
+                {"label": "3", "matrix": [9, 0], "x": 1, "y": 4.5},
+                {"label": "2", "matrix": [8, 1], "x": 2, "y": 4.5},
+                {"label": "1", "matrix": [9, 1], "x": 3, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+                {"label": "Shift", "matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+                {"label": "Z", "matrix": [8, 3], "x": 6.75, "y": 4.5},
+                {"label": "X", "matrix": [9, 3], "x": 7.75, "y": 4.5},
+                {"label": "C", "matrix": [8, 4], "x": 8.75, "y": 4.5},
+                {"label": "V", "matrix": [9, 4], "x": 9.75, "y": 4.5},
+                {"label": "B", "matrix": [8, 5], "x": 10.75, "y": 4.5},
+                {"label": "N", "matrix": [9, 5], "x": 11.75, "y": 4.5},
+                {"label": "M", "matrix": [8, 6], "x": 12.75, "y": 4.5},
+                {"label": ",", "matrix": [9, 6], "x": 13.75, "y": 4.5},
+                {"label": ".", "matrix": [8, 7], "x": 14.75, "y": 4.5},
+                {"label": "/", "matrix": [9, 7], "x": 15.75, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 8], "x": 18.5, "y": 4.5},
+
+                {"label": ".", "matrix": [11, 0], "x": 1, "y": 5.5},
+                {"label": "0", "matrix": [10, 1], "x": 2, "y": 5.5},
+
+                {"label": "\u2190", "matrix": [11, 1], "x": 3.25, "y": 5.75},
+                {"label": "\u2193", "matrix": [10, 2], "x": 4.25, "y": 5.75},
+                {"label": "\u2192", "matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+                {"label": "Fn", "matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/aeboards/aegis/keymaps/default/keymap.c b/keyboards/aeboards/aegis/keymaps/default/keymap.c
index 8437ffeb4e..0aa14fdea8 100644
--- a/keyboards/aeboards/aegis/keymaps/default/keymap.c
+++ b/keyboards/aeboards/aegis/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    | 0       | left |Dn| rhgt | FN  | Alt |      Space           |Alt |Gui| ctrl|  |
    * `------------------------------------------------------------------------------------'
    */
-  [0] = LAYOUT_aegis(
+  [0] = LAYOUT_all(
     KC_END , KC_HOME, KC_PGDN, KC_PGUP, KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
     KC_PMNS, KC_PAST, KC_PSLS, KC_BSPC, KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_DEL,
     KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, 
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PENT, KC_PDOT, KC_P0  , KC_LEFT, KC_DOWN, KC_RGHT, MO(1),   KC_LALT,          KC_SPC,                                               KC_RALT, KC_RGUI,  KC_RCTL
   ),
 
-  [1] = LAYOUT_aegis(
+  [1] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP  , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT_aegis(
+  [2] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT_aegis(
+  [3] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/aeboards/aegis/keymaps/default_2u_bs_275u_rshift/keymap.c b/keyboards/aeboards/aegis/keymaps/default_2u_bs_275u_rshift/keymap.c
new file mode 100644
index 0000000000..f43df66f23
--- /dev/null
+++ b/keyboards/aeboards/aegis/keymaps/default_2u_bs_275u_rshift/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------.
+   * |End |Home|PgDn|PgUp|  |Esc| F1| F2| F3| F4|    | F5| F6| F7| F8|    | F9|F10|F11|F12|
+   * `-------------------'  `-------------------------------------------------------------'
+   *
+   * |-------------------|  ,-------------------------------------------------------------.
+   * | -  | *  | /  |BSPC|  | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Bcksp   |
+   * |-------------------|  |-------------------------------------------------------------|
+   * | +  | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \    |
+   * |-------------------|  |-------------------------------------------------------------|
+   * | +  | 6  | 5  | 4  |  |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   |
+   * |-------------------|  |-------------------------------------------------------------|
+   * |Ent | 3  | 2  | 1  | |Up| |Shift|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|   Shift   |
+   * |------------------------------------------------------------------------------------|
+   * |Ent | .  | 0  | left |Dn| rhgt | FN  | Alt |          Space          |Alt |Gui| ctrl|
+   * `------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_2u_bs_275u_rshift(
+    KC_END , KC_HOME, KC_PGDN, KC_PGUP, KC_ESC ,          KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,
+    KC_PMNS, KC_PAST, KC_PSLS, KC_BSPC, KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_PPLS, KC_P6  , KC_P5  , KC_P4  , KC_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_PENT, KC_P3  , KC_P2  , KC_P1  , KC_UP  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          KC_RSFT,
+    KC_PENT, KC_PDOT, KC_P0  , KC_LEFT, KC_DOWN, KC_RGHT, MO(1),   KC_LALT,          KC_SPC,                                               KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [1] = LAYOUT_2u_bs_275u_rshift(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP  , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_2u_bs_275u_rshift(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT_2u_bs_275u_rshift(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
+  )
+
+};
diff --git a/keyboards/aeboards/aegis/keymaps/default_numpad/keymap.c b/keyboards/aeboards/aegis/keymaps/default_numpad/keymap.c
new file mode 100644
index 0000000000..3ee23cf8c2
--- /dev/null
+++ b/keyboards/aeboards/aegis/keymaps/default_numpad/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------.     
+   * |End |Home|PgDn|PgUp|  |Esc| F1| F2| F3| F4|    | F5| F6| F7| F8|    | F9|F10|F11|F12|
+   * `-------------------'  `-------------------------------------------------------------'
+   *           
+   * |-------------------|  ,-------------------------------------------------------------. 
+   * |-   | *  | /  |BSPC|  | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|pipe| del| 
+   * |-------------------|  |-------------------------------------------------------------| 
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| BSPC  | 
+   * |  + |--------------|  |-------------------------------------------------------------| 
+   * |    | 6  | 5  | 4  |  |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | 
+   * |-------------------|  |-------------------------------------------------------------|
+   * |    | 3  | 2  | 1  | |Up| |Shift|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | FN |
+   * | ENT|-------------------------------------------------------------------------------|
+   * |    | .  | 0  | left |Dn| rhgt | FN  | Alt |      Space           |Alt |Gui| ctrl|  |
+   * `------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_numpad(
+    KC_END , KC_HOME, KC_PGDN, KC_PGUP, KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
+    KC_PMNS, KC_PAST, KC_PSLS, KC_BSPC, KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_DEL,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, 
+             KC_P6  , KC_P5  , KC_P4  , KC_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , 
+    KC_PENT, KC_P3  , KC_P2  , KC_P1  , KC_UP  , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1), 
+             KC_PDOT, KC_P0  , KC_LEFT, KC_DOWN, KC_RGHT, MO(1),   KC_LALT,          KC_SPC,                                               KC_RALT, KC_RGUI, KC_RCTL
+  ),
+
+  [1] = LAYOUT_numpad(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP  , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_numpad(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT_numpad(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
+  )
+
+};
diff --git a/keyboards/aeboards/aegis/keymaps/via/keymap.c b/keyboards/aeboards/aegis/keymaps/via/keymap.c
index 8437ffeb4e..0aa14fdea8 100644
--- a/keyboards/aeboards/aegis/keymaps/via/keymap.c
+++ b/keyboards/aeboards/aegis/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    | 0       | left |Dn| rhgt | FN  | Alt |      Space           |Alt |Gui| ctrl|  |
    * `------------------------------------------------------------------------------------'
    */
-  [0] = LAYOUT_aegis(
+  [0] = LAYOUT_all(
     KC_END , KC_HOME, KC_PGDN, KC_PGUP, KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
     KC_PMNS, KC_PAST, KC_PSLS, KC_BSPC, KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_DEL,
     KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, 
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_PENT, KC_PDOT, KC_P0  , KC_LEFT, KC_DOWN, KC_RGHT, MO(1),   KC_LALT,          KC_SPC,                                               KC_RALT, KC_RGUI,  KC_RCTL
   ),
 
-  [1] = LAYOUT_aegis(
+  [1] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP  , KC_PGDN, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT_aegis(
+  [2] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT_aegis(
+  [3] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/aeboards/aegis/matrix_diagram.md b/keyboards/aeboards/aegis/matrix_diagram.md
new file mode 100644
index 0000000000..d768f66153
--- /dev/null
+++ b/keyboards/aeboards/aegis/matrix_diagram.md
@@ -0,0 +1,32 @@
+# Matrix Diagram for AEboards Aegis
+
+```
+┌───┬───┬───┬───┐ ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │10 │01 │11 │ │02 │   │12 │03 │13 │04 │ │14 │05 │15 │06 │ │16 │07 │17 │08 │
+└───┴───┴───┴───┘ └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
+┌───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+│20 │30 │21 │31 │ │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │37 │28 │38 │18 │   │38     │ 2u Backspace
+├───┼───┼───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+│40 │50 │41 │51 │ │42   │52 │43 │53 │44 │54 │45 │55 │46 │56 │47 │57 │48 │58   │
+├───┼───┼───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│60 │70 │61 │71 │ │62    │72 │63 │73 │64 │74 │65 │75 │66 │76 │67 │77 │68      │
+├───┼───┼───┼───┤ └───┬──┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+│80 │90 │81 │91 │┌───┐│92  │83 │93 │84 │94 │85 │95 │86 │96 │87 │97 │88    │98 │   │88        │ 2.75u RShift
+├───┼───┼───┼───┘│82 │└───┬┴───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴───┼────┬─┴───┤   └──────────┘
+│A0 │B0 │A1 │┌───┼───┼───┐│A3  │B3  │B5                      │B7   │A8  │B8   │
+└───┴───┴───┘│B1 │A2 │B2 │└────┴────┴────────────────────────┴─────┴────┴─────┘
+             └───┴───┴───┘
+                          ┌───┬───┬───────────────────────────┬─────┬───┬─────┐
+                          │A3 │B3 │B5                         │B7   │A8 │B8   │ 7u Space
+                          └───┴───┴───────────────────────────┴─────┴───┴─────┘
+[NUMPAD OPTIONS]───────────────────
+┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│40 │50 │41 │51 │ │   │50 │41 │51 │
+├───┼───┼───┼───┤ │60 ├───┼───┼───┤
+│60 │70 │61 │   │ │   │70 │61 │71 │
+├───┼───┼───┤91 │ ├───┼───┼───┼───┤
+│80 │90 │81 │   │ │   │90 │81 │91 │
+├───┴───┼───┼───┘ │80 ├───┴───┼───┘
+│A0     │A1 │     │   │A1     │
+└───────┴───┘     └───┴───────┘
+```