handwired/qc60: refactor, Configurator update, and readme update (#4878)

* handwired/qc60: refactor and Configurator update

- correct layout macro name (LAYOUT_ANSI_DEFAULT to LAYOUT_ansi_default)
- add layout data for remaining layout macros
- correct ISO layout macros (neither had a split left Shift)
- refactor LAYOUT_iso_alt (place KC_NUHS key on home row; consistent with LAYOUT_iso_default)
- proto.h refactored to use #pragma once include guard

* handwired/qc60: keymap refactor

- delete redundant KC_TRNS and KC_NO aliases

* handwired/qc60: readme update

- update header (made consistent with QMK template)
- update Docs links (Newbs Guide; grammar)

5 files changed, 606 insertions, 65 deletions

diff --git a/keyboards/handwired/qc60/README.md b/keyboards/handwired/qc60/README.md
index 8477bb04de..4fdd9ba6ef 100644
--- a/keyboards/handwired/qc60/README.md
+++ b/keyboards/handwired/qc60/README.md
@@ -1,5 +1,4 @@
-QC60
-========
+# QC60
 
 ![qc60 layout](https://i.imgur.com/BAW1VGc.png)
 
@@ -19,4 +18,4 @@ Example of flashing this keyboard:
 
     make handwired/qc60/proto:avrdude
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+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).
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index b39ec587bc..c047d50307 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -1,11 +1,93 @@
 {
-  "keyboard_name": "QC60", 
-  "url": "", 
-  "maintainer": "coarse", 
-  "width": 15, 
-  "height": 5, 
+  "keyboard_name": "QC60",
+  "url": "",
+  "maintainer": "coarse",
+  "width": 16,
+  "height": 5,
   "layouts": {
-    "LAYOUT_ANSI_DEFAULT": {
+    "LAYOUT": {
+      "key_count": 67,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R06", "x":14, "y":0},
+        {"label":"R07", "x":15, "y":0},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+        {"label":"R17", "x":14.5, "y":1, "w":1.5},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R27", "x":13.75, "y":2, "w":2.25},
+
+        {"label":"L30", "x":0, "y":3, "w":1.25},
+        {"label":"L31", "x":1.25, "y":3},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":1.75},
+        {"label":"R37", "x":15, "y":3},
+
+        {"label":"L40", "x":0, "y":4, "w":1.25},
+        {"label":"L41", "x":1.25, "y":4, "w":1.25},
+        {"label":"L42", "x":2.5, "y":4, "w":1.25},
+        {"label":"L43", "x":3.75, "y":4, "w":2.75},
+        {"label":"L44", "x":6.5, "y":4, "w":1.25},
+
+        {"label":"R43", "x":8.75, "y":4, "w":1.25},
+        {"label":"R44", "x":10, "y":4, "w":2},
+        {"label":"R42", "x":12, "y":4},
+        {"label":"R45", "x":13, "y":4},
+        {"label":"R46", "x":14, "y":4},
+        {"label":"R47", "x":15, "y":4}
+      ]
+    },
+
+    "LAYOUT_ansi_default": {
       "key_count": 64,
       "layout": [
         {"label":"Esc", "x":0, "y":0},
@@ -16,13 +98,13 @@
         {"label":"5", "x":5, "y":0},
         {"label":"6", "x":6, "y":0},
 
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"-", "x":11, "y":0},
-        {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2.0},
+        {"label":"7", "x":8, "y":0},
+        {"label":"8", "x":9, "y":0},
+        {"label":"9", "x":10, "y":0},
+        {"label":"0", "x":11, "y":0},
+        {"label":"-", "x":12, "y":0},
+        {"label":"=", "x":13, "y":0},
+        {"label":"Backspace", "x":14, "y":0, "w":2.0},
 
         {"label":"Tab", "x":0, "y":1, "w":1.5},
         {"label":"Q", "x":1.5, "y":1},
@@ -31,14 +113,14 @@
         {"label":"R", "x":4.5, "y":1},
         {"label":"T", "x":5.5, "y":1},
 
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":"[", "x":11.5, "y":1},
-        {"label":"]", "x":12.5, "y":1},
-        {"label":"\\", "x":13.5, "y":1, "w":1.5},
+        {"label":"Y", "x":7.5, "y":1},
+        {"label":"U", "x":8.5, "y":1},
+        {"label":"I", "x":9.5, "y":1},
+        {"label":"O", "x":10.5, "y":1},
+        {"label":"P", "x":11.5, "y":1},
+        {"label":"[", "x":12.5, "y":1},
+        {"label":"]", "x":13.5, "y":1},
+        {"label":"\\", "x":14.5, "y":1, "w":1.5},
 
         {"label":"CapsLock", "x":0, "y":2, "w":1.75},
         {"label":"A", "x":1.75, "y":2},
@@ -47,13 +129,13 @@
         {"label":"F", "x":4.75, "y":2},
         {"label":"G", "x":5.75, "y":2},
 
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":";", "x":10.75, "y":2},
-        {"label":"'", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"label":"H", "x":7.75, "y":2},
+        {"label":"J", "x":8.75, "y":2},
+        {"label":"K", "x":9.75, "y":2},
+        {"label":"L", "x":10.75, "y":2},
+        {"label":";", "x":11.75, "y":2},
+        {"label":"'", "x":12.75, "y":2},
+        {"label":"Enter", "x":13.75, "y":2, "w":2.25},
 
         {"label":"Shift", "x":0, "y":3, "w":2.25},
         {"label":"Z", "x":2.25, "y":3},
@@ -62,12 +144,12 @@
         {"label":"V", "x":5.25, "y":3},
         {"label":"B", "x":6.25, "y":3},
 
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":",", "x":9.25, "y":3},
-        {"label":".", "x":10.25, "y":3},
-        {"label":"/", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+        {"label":"N", "x":8.25, "y":3},
+        {"label":"M", "x":9.25, "y":3},
+        {"label":",", "x":10.25, "y":3},
+        {"label":".", "x":11.25, "y":3},
+        {"label":"/", "x":12.25, "y":3},
+        {"label":"Shift", "x":13.25, "y":3, "w":2.75},
 
         {"label":"Ctrl", "x":0, "y":4, "w":1.25},
         {"label":"Win", "x":1.25, "y":4, "w":1.25},
@@ -75,13 +157,483 @@
         {"x":3.75, "y":4, "w":2.75},
         {"x":6.5, "y":4, "w":1.25},
 
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9, "y":4, "w":2.0},
-        {"label":"Alt", "x":11, "y":4},
-        {"label":"Win", "x":12, "y":4},
-        {"label":"Menu", "x":13, "y":4},
-        {"label":"Ctrl", "x":14, "y":4}
+        {"x":8.75, "y":4, "w":1.25},
+        {"x":10, "y":4, "w":2.0},
+        {"label":"Alt", "x":12, "y":4},
+        {"label":"Win", "x":13, "y":4},
+        {"label":"Menu", "x":14, "y":4},
+        {"label":"Ctrl", "x":15, "y":4}
+      ]
+    },
+
+    "LAYOUT_ansi_alt": {
+      "key_count": 63,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R07", "x":14, "y":0, "w":2},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+        {"label":"R17", "x":14.5, "y":1, "w":1.5},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R27", "x":13.75, "y":2, "w":2.25},
+
+        {"label":"L31", "x":0, "y":3, "w":2.25},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":2.75},
+
+        {"label":"L40", "x":0, "y":4, "w":1.5},
+        {"label":"L41", "x":1.5, "y":4},
+        {"label":"L42", "x":2.5, "y":4, "w":1.5},
+        {"label":"L43", "x":4, "y":4, "w":2.75},
+        {"label":"L44", "x":6.75, "y":4},
+
+        {"label":"R43", "x":8.75, "y":4},
+        {"label":"R44", "x":9.75, "y":4, "w":2.25},
+        {"label":"R45", "x":12, "y":4, "w":1.5},
+        {"label":"R46", "x":13.5, "y":4},
+        {"label":"R47", "x":14.5, "y":4, "w":1.5}
+      ]
+    },
+
+    "LAYOUT_iso_default": {
+      "key_count": 65,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R07", "x":14, "y":0, "w":2},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R17", "x":13.75, "y":2},
+        {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2},
+
+        {"label":"L30", "x":0, "y":3, "w":1.25},
+        {"label":"L31", "x":1.25, "y":3},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":2.75},
+
+        {"label":"L40", "x":0, "y":4, "w":1.25},
+        {"label":"L41", "x":1.25, "y":4, "w":1.25},
+        {"label":"L42", "x":2.5, "y":4, "w":1.25},
+        {"label":"L43", "x":3.75, "y":4, "w":2.75},
+        {"label":"L44", "x":6.5, "y":4, "w":1.25},
+
+        {"label":"R43", "x":8.75, "y":4, "w":1.25},
+        {"label":"R44", "x":10, "y":4, "w":2},
+        {"label":"R42", "x":12, "y":4},
+        {"label":"R45", "x":13, "y":4},
+        {"label":"R46", "x":14, "y":4},
+        {"label":"R47", "x":15, "y":4}
+      ]
+    },
+
+    "LAYOUT_iso_alt": {
+      "key_count": 64,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R07", "x":14, "y":0, "w":2},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R17", "x":13.75, "y":2},
+        {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2},
+
+        {"label":"L30", "x":0, "y":3, "w":1.25},
+        {"label":"L31", "x":1.25, "y":3},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":2.75},
+
+        {"label":"L40", "x":0, "y":4, "w":1.5},
+        {"label":"L41", "x":1.5, "y":4},
+        {"label":"L42", "x":2.5, "y":4, "w":1.5},
+        {"label":"L43", "x":4, "y":4, "w":2.75},
+        {"label":"L44", "x":6.75, "y":4},
+
+        {"label":"R43", "x":8.75, "y":4},
+        {"label":"R44", "x":9.75, "y":4, "w":2.25},
+        {"label":"R45", "x":12, "y":4, "w":1.5},
+        {"label":"R46", "x":13.5, "y":4},
+        {"label":"R47", "x":14.5, "y":4, "w":1.5}
+      ]
+    },
+
+    "LAYOUT_hhkb_default": {
+      "key_count": 63,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R06", "x":14, "y":0},
+        {"label":"R07", "x":15, "y":0},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+        {"label":"R17", "x":14.5, "y":1, "w":1.5},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R27", "x":13.75, "y":2, "w":2.25},
+
+        {"label":"L31", "x":0, "y":3, "w":2.25},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":1.75},
+        {"label":"R37", "x":15, "y":3},
+
+        {"label":"L41", "x":1.5, "y":4},
+        {"label":"L42", "x":2.5, "y":4, "w":1.5},
+        {"label":"L43", "x":4, "y":4, "w":2.75},
+        {"label":"L44", "x":6.75, "y":4},
+
+        {"label":"R43", "x":8.75, "y":4},
+        {"label":"R44", "x":9.75, "y":4, "w":2.25},
+        {"label":"R45", "x":12, "y":4, "w":1.5},
+        {"label":"R46", "x":13.5, "y":4}
+      ]
+    },
+
+    "LAYOUT_hhkb_split_lshift": {
+      "key_count": 64,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R06", "x":14, "y":0},
+        {"label":"R07", "x":15, "y":0},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+        {"label":"R17", "x":14.5, "y":1, "w":1.5},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R27", "x":13.75, "y":2, "w":2.25},
+
+        {"label":"L30", "x":0, "y":3, "w":1.25},
+        {"label":"L31", "x":1.25, "y":3},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":1.75},
+        {"label":"R37", "x":15, "y":3},
+
+        {"label":"L41", "x":1.5, "y":4},
+        {"label":"L42", "x":2.5, "y":4, "w":1.5},
+        {"label":"L43", "x":4, "y":4, "w":2.75},
+        {"label":"L44", "x":6.75, "y":4},
+
+        {"label":"R43", "x":8.75, "y":4},
+        {"label":"R44", "x":9.75, "y":4, "w":2.25},
+        {"label":"R45", "x":12, "y":4, "w":1.5},
+        {"label":"R46", "x":13.5, "y":4}
+      ]
+    },
+
+    "LAYOUT_wkl_default": {
+      "key_count": 61,
+      "layout": [
+        {"label":"L00", "x":0, "y":0},
+        {"label":"L01", "x":1, "y":0},
+        {"label":"L02", "x":2, "y":0},
+        {"label":"L03", "x":3, "y":0},
+        {"label":"L04", "x":4, "y":0},
+        {"label":"L05", "x":5, "y":0},
+        {"label":"L06", "x":6, "y":0},
+
+        {"label":"R00", "x":8, "y":0},
+        {"label":"R01", "x":9, "y":0},
+        {"label":"R02", "x":10, "y":0},
+        {"label":"R03", "x":11, "y":0},
+        {"label":"R04", "x":12, "y":0},
+        {"label":"R05", "x":13, "y":0},
+        {"label":"R07", "x":14, "y":0, "w":2},
+
+        {"label":"L10", "x":0, "y":1, "w":1.5},
+        {"label":"L11", "x":1.5, "y":1},
+        {"label":"L12", "x":2.5, "y":1},
+        {"label":"L13", "x":3.5, "y":1},
+        {"label":"L14", "x":4.5, "y":1},
+        {"label":"L15", "x":5.5, "y":1},
+
+        {"label":"R10", "x":7.5, "y":1},
+        {"label":"R11", "x":8.5, "y":1},
+        {"label":"R12", "x":9.5, "y":1},
+        {"label":"R13", "x":10.5, "y":1},
+        {"label":"R14", "x":11.5, "y":1},
+        {"label":"R15", "x":12.5, "y":1},
+        {"label":"R16", "x":13.5, "y":1},
+        {"label":"R17", "x":14.5, "y":1, "w":1.5},
+
+        {"label":"L20", "x":0, "y":2, "w":1.75},
+        {"label":"L21", "x":1.75, "y":2},
+        {"label":"L22", "x":2.75, "y":2},
+        {"label":"L23", "x":3.75, "y":2},
+        {"label":"L24", "x":4.75, "y":2},
+        {"label":"L25", "x":5.75, "y":2},
+
+        {"label":"R21", "x":7.75, "y":2},
+        {"label":"R22", "x":8.75, "y":2},
+        {"label":"R23", "x":9.75, "y":2},
+        {"label":"R24", "x":10.75, "y":2},
+        {"label":"R25", "x":11.75, "y":2},
+        {"label":"R26", "x":12.75, "y":2},
+        {"label":"R27", "x":13.75, "y":2, "w":2.25},
+
+        {"label":"L31", "x":0, "y":3, "w":2.25},
+        {"label":"L32", "x":2.25, "y":3},
+        {"label":"L33", "x":3.25, "y":3},
+        {"label":"L34", "x":4.25, "y":3},
+        {"label":"L35", "x":5.25, "y":3},
+        {"label":"L36", "x":6.25, "y":3},
+
+        {"label":"R31", "x":8.25, "y":3},
+        {"label":"R32", "x":9.25, "y":3},
+        {"label":"R33", "x":10.25, "y":3},
+        {"label":"R34", "x":11.25, "y":3},
+        {"label":"R35", "x":12.25, "y":3},
+        {"label":"R36", "x":13.25, "y":3, "w":2.75},
+
+        {"label":"L40", "x":0, "y":4, "w":1.5},
+        {"label":"L42", "x":2.5, "y":4, "w":1.5},
+        {"label":"L43", "x":4, "y":4, "w":2.75},
+        {"label":"L44", "x":6.75, "y":4},
+
+        {"label":"R43", "x":8.75, "y":4},
+        {"label":"R44", "x":9.75, "y":4, "w":2.25},
+        {"label":"R45", "x":12, "y":4, "w":1.5},
+        {"label":"R47", "x":14.5, "y":4, "w":1.5}
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/qc60/keymaps/default/keymap.c b/keyboards/handwired/qc60/keymaps/default/keymap.c
index bafaf5058e..88062d4ed4 100644
--- a/keyboards/handwired/qc60/keymaps/default/keymap.c
+++ b/keyboards/handwired/qc60/keymaps/default/keymap.c
@@ -24,9 +24,6 @@ extern keymap_config_t keymap_config;
 // entirely and just use numbers.
 #define _BASE 0
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_ansi_default(
     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, \
diff --git a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
index f99635d531..f024ddb4b9 100644
--- a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
+++ b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
@@ -25,9 +25,6 @@ extern keymap_config_t keymap_config;
 #define _BASE 0
 #define _FN 1
 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #define FN MO(_FN)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h
index 191e8150a7..7e7755d0e2 100644
--- a/keyboards/handwired/qc60/proto/proto.h
+++ b/keyboards/handwired/qc60/proto/proto.h
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PROTO_H
-#define PROTO_H
+#pragma once
 
 #include "qc60.h"
 
@@ -26,10 +25,10 @@
 
 /* Split Backspace
  * {R07, XXX, R05, R04, R03, R02, R01, R00}
- * 
+ *
  * Split Right Shift
  * {R37, R36, R35, R34, R33, R32, R31, XXX}
- * 
+ *
  * Split Left Shift
  * {L30, L31, L32, L33, L34, L35, L36, XXX}
  *
@@ -101,14 +100,14 @@
     L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,           R07, \
     L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16,           \
     L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R17, R27, \
-         L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,           \
+    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,           \
     L40, L41, L42, L43, L44,                     R43, R44, R42, R45, R46,      R47  \
 ) \
 { \
     {L00, L01, L02, L03, L04, L05, L06, XXX}, \
     {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
     {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
+    {L30, L31, L32, L33, L34, L35, L36, XXX}, \
     {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
     {R07, XXX, R05, R04, R03, R02, R01, R00}, \
     {R17, R16, R15, R14, R13, R12, R11, R10}, \
@@ -118,17 +117,17 @@
 }
 
 #define LAYOUT_iso_alt( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,      R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-         L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,      \
-    L40, L41, L42, L43, L44,                     R43, R44,      R45, R46, R47  \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,           R07, \
+    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16,           \
+    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R17, R27, \
+    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,           \
+    L40, L41, L42, L43, L44,                     R43, R44,      R45, R46,      R47  \
 ) \
 { \
     {L00, L01, L02, L03, L04, L05, L06, XXX}, \
     {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
     {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
+    {L30, L31, L32, L33, L34, L35, L36, XXX}, \
     {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
     {R07, XXX, R05, R04, R03, R02, R01, R00}, \
     {R17, R16, R15, R14, R13, R12, R11, R10}, \
@@ -196,6 +195,3 @@
     {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
     {R47, XXX, R45, R44, R43, XXX, XXX, XXX}, \
 }
-
-
-#endif