Demiurge Layout Macro Touch-Up (#20599)

4 files changed, 193 insertions, 88 deletions

diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 5e42c31833..3a6d6af13b 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -18,90 +18,177 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_xt_tsangan_hhkb"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_60_xt_ansi_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 16], "x": 16, "y": 1, "w": 1.5},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 2.75},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 3], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 14], "x": 15, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 16], "x": 16, "y": 4, "w": 1.5}
+            ]
+        },
+
+        "LAYOUT_60_xt_tsangan_hhkb": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-                {"matrix": [0, 10], "x": 10.5, "y": 0},
-                {"matrix": [0, 11], "x": 11.5, "y": 0},
-                {"matrix": [0, 12], "x": 12.5, "y": 0},
-                {"matrix": [0, 13], "x": 13.5, "y": 0},
-                {"matrix": [0, 14], "x": 14.5, "y": 0},
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-                {"matrix": [0, 16], "x": 16.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-
-                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-                {"matrix": [1, 12], "x": 13, "y": 1},
-                {"matrix": [1, 13], "x": 14, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 16], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-
-                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [2, 7], "x": 8.25, "y": 2},
-                {"matrix": [2, 8], "x": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-                {"matrix": [2, 12], "x": 13.25, "y": 2},
-                {"matrix": [2, 13], "x": 14.25, "y": 2},
-                {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 8.75, "y": 3},
-                {"matrix": [3, 8], "x": 9.75, "y": 3},
-                {"matrix": [3, 9], "x": 10.75, "y": 3},
-                {"matrix": [3, 10], "x": 11.75, "y": 3},
-                {"matrix": [3, 11], "x": 12.75, "y": 3},
-                {"matrix": [3, 12], "x": 13.75, "y": 3},
-                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 16], "x": 16.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
-                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 16], "x": 16, "y": 4, "w": 1.5}
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 16], "x": 16.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 16], "x": 16, "y": 1, "w": 1.5},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 16], "x": 16.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 3], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 14], "x": 15, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 16], "x": 16, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/demiurge/keymaps/default/keymap.c b/keyboards/demiurge/keymaps/default/keymap.c
index 233ae88cf5..dc93c4a2f1 100755
--- a/keyboards/demiurge/keymaps/default/keymap.c
+++ b/keyboards/demiurge/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_all(
+	[0] = LAYOUT_60_xt_tsangan_hhkb(
 		KC_F1,   KC_F2,   KC_ESC,  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_DEL,  
 		KC_F3,   KC_F4,   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_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI,          KC_RCTL
 	),
 
-	[1] = LAYOUT_all(
+	[1] = LAYOUT_60_xt_tsangan_hhkb(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, 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/demiurge/keymaps/via/keymap.c b/keyboards/demiurge/keymaps/via/keymap.c
index 4d707a3cac..15276f2513 100755
--- a/keyboards/demiurge/keymaps/via/keymap.c
+++ b/keyboards/demiurge/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_all(
+	[0] = LAYOUT_60_xt_tsangan_hhkb(
 		KC_F1,   KC_F2,   KC_ESC,  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_DEL,  
 		KC_F3,   KC_F4,   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_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI,          KC_RCTL
 	),
 
-	[1] = LAYOUT_all(
+	[1] = LAYOUT_60_xt_tsangan_hhkb(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          
@@ -35,7 +35,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
 	),
 
-	[2] = LAYOUT_all(
+	[2] = LAYOUT_60_xt_tsangan_hhkb(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          
@@ -43,7 +43,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
 	),
 
-	[3] = LAYOUT_all(
+	[3] = LAYOUT_60_xt_tsangan_hhkb(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, 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/demiurge/matrix_diagram.md b/keyboards/demiurge/matrix_diagram.md
new file mode 100644
index 0000000000..ce8d1c7e04
--- /dev/null
+++ b/keyboards/demiurge/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for Demiurge
+
+```
+┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+│00 │01 │ │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │0G │   │0F     │ 2u Backspace
+├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+│10 │11 │ │12   │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1G   │
+├───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│20 │21 │ │22    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F      │
+├───┼───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+│30 │31 │ │32      │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E    │3G │   │3E        │ 2.75u RShift
+├───┼───┤ ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤   └──────────┘
+│40 │41 │ │42   │43 │44   │48                         │4C   │4E │4G   │
+└───┴───┘ └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+          ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+          │42   │   │44   │48                         │4C   │   │4G   │ WKL
+          └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```