Merge remote-tracking branch 'origin/master' into develop

3 files changed, 153 insertions, 31 deletions

diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 14aafb3235..0dcadc7823 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -5,21 +5,73 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"#", "x":3, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"@", "x":2, "y":0.13}, {"label":"$", "x":4, "y":0.13}, {"label":"&", "x":10.5, "y":0.13},
-                {"label":"(", "x":12.5, "y":0.13}, {"label":"%", "x":5, "y":0.25}, {"label":"^", "x":9.5, "y":0.25}, {"label":"!", "x":1, "y":0.38}, {"label":")", "x":13.5, "y":0.38},
-                {"label":"Esc", "x":0, "y":0.5}, {"label":"<i class='fa fa-trash'></i>", "x":14.5, "y":0.5}, {"label":"E", "x":3, "y":1}, {"label":"I", "x":11.5, "y":1},
-                {"label":"W", "x":2, "y":1.13}, {"label":"R", "x":4, "y":1.13}, {"label":"U", "x":10.5, "y":1.13}, {"label":"O", "x":12.5, "y":1.13}, {"label":"T", "x":5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25}, {"label":"Q", "x":1, "y":1.38}, {"label":"P", "x":13.5, "y":1.38}, {"label":"<i class='fa fa-arrow-left'></i>", "x":0, "y":1.5},
-                {"label":"~", "x":14.5, "y":1.5}, {"label":"D", "x":3, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"S", "x":2, "y":2.13}, {"label":"F", "x":4, "y":2.13},
-                {"label":"J", "x":10.5, "y":2.13}, {"label":"L", "x":12.5, "y":2.13}, {"label":"G", "x":5, "y":2.25}, {"label":"H", "x":9.5, "y":2.25}, {"label":"A", "x":1, "y":2.38},
-                {"label":":", "x":13.5, "y":2.38}, {"label":"<i class='fa fa-lock'></i>", "x":0, "y":2.5}, {"label":"\"", "x":14.5, "y":2.5}, {"label":"C", "x":3, "y":3},
-                {"label":"<", "x":11.5, "y":3}, {"label":"X", "x":2, "y":3.13}, {"label":"V", "x":4, "y":3.13}, {"label":"M", "x":10.5, "y":3.13}, {"label":">", "x":12.5, "y":3.13},
-                {"label":"B", "x":5, "y":3.25}, {"label":"Joystick", "x":6, "y":3.25}, {"label":"Encoder", "x":8.5, "y":3.25}, {"label":"N", "x":9.5, "y":3.25},
-                {"label":"Z", "x":1, "y":3.38}, {"label":"?", "x":13.5, "y":3.38}, {"label":"<i class='fa fa-arrow-up'></i>", "x":0, "y":3.5}, {"label":"|", "x":14.5, "y":3.5},
-                {"label":"Alt", "x":2.35, "y":4.13}, {"label":"Del", "x":3.35, "y":4.13}, {"label":"{", "x":11.15, "y":4.13}, {"label":"}", "x":12.15, "y":4.13},
-                {"label":"OS", "x":1.35, "y":4.35}, {"label":"_", "x":13.15, "y":4.38}, {"label":"Lower", "x":0.35, "y":4.5}, {"label":"+", "x":14.15, "y":4.5},
-                {"label":"Ctrl", "x":5.55, "y":2.85}, {"label":"Enter", "x":-0.4, "y":4.1, "h":1.25}, {"label":"Space", "x":-4.1, "y":3.35, "h":1.25}, {"label":"Raise", "x":8.4, "y":11.2}
-                ]
-            }
+                {"label":"Esc", "x":0, "y":0.5},
+                {"label":"1!", "x":1, "y":0.38},
+                {"label":"2@", "x":2, "y":0.13},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0.13},
+                {"label":"5%", "x":5, "y":0.25},
+                {"label":"6^", "x":9, "y":0.25},
+                {"label":"7&", "x":10, "y":0.13},
+                {"label":"8*", "x":11, "y":0},
+                {"label":"9(", "x":12, "y":0.13},
+                {"label":"0)", "x":13, "y":0.38},
+                {"label":"Backspace", "x":14, "y":0.5},
+
+                {"label":"Tab", "x":0, "y":1.5},
+                {"label":"Q", "x":1, "y":1.38},
+                {"label":"W", "x":2, "y":1.13},
+                {"label":"E", "x":3, "y":1},
+                {"label":"R", "x":4, "y":1.13},
+                {"label":"T", "x":5, "y":1.25},
+                {"label":"Y", "x":9, "y":1.25},
+                {"label":"U", "x":10, "y":1.13},
+                {"label":"I", "x":11, "y":1},
+                {"label":"O", "x":12, "y":1.13},
+                {"label":"P", "x":13, "y":1.38},
+                {"label":"`~", "x":14, "y":1.5},
+
+                {"label":"Caps Lock", "x":0, "y":2.5},
+                {"label":"A", "x":1, "y":2.38},
+                {"label":"S", "x":2, "y":2.13},
+                {"label":"D", "x":3, "y":2},
+                {"label":"F", "x":4, "y":2.13},
+                {"label":"G", "x":5, "y":2.25},
+                {"label":"H", "x":9, "y":2.25},
+                {"label":"J", "x":10, "y":2.13},
+                {"label":"K", "x":11, "y":2},
+                {"label":"L", "x":12, "y":2.13},
+                {"label":";:", "x":13, "y":2.38},
+                {"label":"'\"", "x":14, "y":2.5},
+
+                {"label":"Shift", "x":0, "y":3.5},
+                {"label":"Z", "x":1, "y":3.38},
+                {"label":"X", "x":2, "y":3.13},
+                {"label":"C", "x":3, "y":3},
+                {"label":"V", "x":4, "y":3.13},
+                {"label":"B", "x":5, "y":3.25},
+                {"label":"Joystick", "x":6, "y":3.25},
+                {"label":"Encoder", "x":8, "y":3.25},
+                {"label":"N", "x":9, "y":3.25},
+                {"label":"M", "x":10, "y":3.13},
+                {"label":",<", "x":11, "y":3},
+                {"label":".>", "x":12, "y":3.13},
+                {"label":"/?", "x":13, "y":3.38},
+                {"label":"\\|", "x":14, "y":3.5},
+
+                {"label":"Lower", "x":0.35, "y":4.5},
+                {"label":"OS", "x":1.35, "y":4.38},
+                {"label":"Alt", "x":2.35, "y":4.13},
+                {"label":"Del", "x":3.35, "y":4.13},
+                {"label":"Ctrl", "x":4.55, "y":4.5},
+                {"label":"Enter", "x":5.75, "y":4.25, "h":1.25},
+                {"label":"Space", "x":8.25, "y":4.25, "h":1.25},
+                {"label":"Raise", "x":9.45, "y":4.5},
+                {"label":"[{", "x":10.65, "y":4.13},
+                {"label":"]}", "x":11.65, "y":4.13},
+                {"label":"-_", "x":12.65, "y":4.38},
+                {"label":"=+", "x":13.65, "y":4.5}
+            ]
         }
+    }
 }
diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json
index e1fd210aab..5032974857 100644
--- a/keyboards/mechanickeys/undead60m/info.json
+++ b/keyboards/mechanickeys/undead60m/info.json
@@ -1,16 +1,86 @@
 {
-  "keyboard_name": "Undead-60M",
-  "url": "",
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label": "F1", "x": 0, "y": 0}, {"label": "F2", "x": 1, "y": 0}, {"label": "Esc", "x": 2.5, "y": 0}, {"label": "1", "x": 3.5, "y": 0}, {"label": "2", "x": 4.5, "y": 0}, {"label": "3", "x": 5.5, "y": 0}, {"label": "4", "x": 6.5, "y": 0}, {"label": "5", "x": 7.5, "y": 0}, {"label": "6", "x": 8.5, "y": 0}, {"label": "7", "x": 9.5, "y": 0}, {"label": "8", "x": 10.5, "y": 0}, {"label": "9", "x": 11.5, "y": 0}, {"label": "0", "x": 12.5, "y": 0}, {"label": "-", "x": 13.5, "y": 0}, {"label": "=", "x": 14.5, "y": 0}, {"label": "Backspace", "x": 15.5, "y": 0, "w": 2},
-        {"label": "F2", "x": 0, "y": 1}, {"label": "F3", "x": 1, "y": 1}, {"label": "Tab", "x": 2.5, "y": 1, "w": 1.5} , {"label": "Q", "x": 4, "y": 1}, {"label": "W", "x": 5, "y": 1}, {"label": "E", "x": 6, "y": 1}, {"label": "R", "x": 7, "y": 1}, {"label": "T", "x": 8, "y": 1}, {"label": "Y", "x": 9, "y": 1}, {"label": "U", "x": 10, "y": 1}, {"label": "I", "x": 11, "y": 1}, {"label": "O", "x": 12, "y": 1}, {"label": "P", "x": 13, "y": 1}, {"label": "[", "x": 14, "y": 1}, {"label": "]", "x": 15, "y": 1}, {"label": "|", "x": 16, "y": 1, "w": 1.5},
-        {"label": "F4", "x": 0, "y": 2}, {"label": "F5", "x": 1, "y": 2}, {"label": "Caps", "x": 2.5, "y": 2, "w": 1.75}, {"label": "A", "x": 4.25, "y": 2}, {"label": "S", "x": 5.25, "y": 2}, {"label": "D", "x": 6.25, "y": 2}, {"label": "F", "x": 7.25, "y": 2}, {"label": "G", "x": 8.25, "y": 2}, {"label": "H", "x": 9.25, "y": 2}, {"label": "J", "x": 10.25, "y": 2}, {"label": "K", "x": 11.25, "y": 2}, {"label": "L", "x": 12.25, "y": 2}, {"label": ";", "x": 13.25, "y": 2}, {"label": "'", "x": 14.25, "y": 2}, {"label": "Enter", "x": 15.25, "y": 2, "w": 2.25},
-        {"label": "F6", "x": 0, "y": 3}, {"label": "F7", "x": 1, "y": 3}, {"label": "Shift", "x": 2.5, "y": 3, "w": 2.25}, {"label": "Z", "x": 4.5, "y": 3}, {"label": "X", "x": 5.5, "y": 3}, {"label": "C", "x": 6.5, "y": 3}, {"label": "V", "x": 7.5, "y": 3}, {"label": "B", "x": 8.5, "y": 3}, {"label": "N", "x": 9.5, "y": 3}, {"label": "M", "x": 10.5, "y": 3}, {"label": ",", "x": 11.5, "y": 3}, {"label": ".", "x": 12.5, "y": 3}, {"label": "/", "x": 13.5, "y": 3}, {"label": "Shift", "x": 14.5, "y": 3, "w": 2.75},
-        {"label": "F1", "x": 0, "y": 4}, {"label": "F2", "x": 1, "y": 4}, {"label": "Ctrl", "x": 2.5, "y": 4, "w": 1.25}, {"label": "OS", "x": 3.75, "y": 4, "w": 1.25}, {"label": "Alt", "x": 5, "y": 4, "w": 1.25}, {"label": "Space", "x": 6.25, "y": 4}, {"label": "Alt", "x": 12.5, "y": 4, "w": 1.25}, {"label": "OS", "x": 13.75, "y": 4, "w": 1.25}, {"label": "Ctrl", "x": 15, "y": 4, "w": 1.25}, {"label": "Fn", "x": 16.25, "y": 4, "w": 1.25}
-      ]
+    "keyboard_name": "Undead-60M",
+    "url": "",
+    "maintainer": "jfescobar18",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"Esc", "x":2.5, "y":0},
+                {"label":"1!", "x":3.5, "y":0},
+                {"label":"2@", "x":4.5, "y":0},
+                {"label":"3#", "x":5.5, "y":0},
+                {"label":"4$", "x":6.5, "y":0},
+                {"label":"5%", "x":7.5, "y":0},
+                {"label":"6^", "x":8.5, "y":0},
+                {"label":"7&", "x":9.5, "y":0},
+                {"label":"8*", "x":10.5, "y":0},
+                {"label":"9(", "x":11.5, "y":0},
+                {"label":"0)", "x":12.5, "y":0},
+                {"label":"-_", "x":13.5, "y":0},
+                {"label":"=+", "x":14.5, "y":0},
+                {"label":"Backspace", "x":15.5, "y":0, "w":2},
+
+                {"label":"F2", "x":0, "y":1},
+                {"label":"F3", "x":1, "y":1},
+                {"label":"Tab", "x":2.5, "y":1, "w":1.5},
+                {"label":"Q", "x":4, "y":1},
+                {"label":"W", "x":5, "y":1},
+                {"label":"E", "x":6, "y":1},
+                {"label":"R", "x":7, "y":1},
+                {"label":"T", "x":8, "y":1},
+                {"label":"Y", "x":9, "y":1},
+                {"label":"U", "x":10, "y":1},
+                {"label":"I", "x":11, "y":1},
+                {"label":"O", "x":12, "y":1},
+                {"label":"P", "x":13, "y":1},
+                {"label":"[{", "x":14, "y":1},
+                {"label":"]}", "x":15, "y":1},
+                {"label":"\\|", "x":16, "y":1, "w":1.5},
+
+                {"label":"F4", "x":0, "y":2},
+                {"label":"F5", "x":1, "y":2},
+                {"label":"Caps", "x":2.5, "y":2, "w":1.75},
+                {"label":"A", "x":4.25, "y":2},
+                {"label":"S", "x":5.25, "y":2},
+                {"label":"D", "x":6.25, "y":2},
+                {"label":"F", "x":7.25, "y":2},
+                {"label":"G", "x":8.25, "y":2},
+                {"label":"H", "x":9.25, "y":2},
+                {"label":"J", "x":10.25, "y":2},
+                {"label":"K", "x":11.25, "y":2},
+                {"label":"L", "x":12.25, "y":2},
+                {"label":";:", "x":13.25, "y":2},
+                {"label":"'\"", "x":14.25, "y":2},
+                {"label":"Enter", "x":15.25, "y":2, "w":2.25},
+
+                {"label":"F6", "x":0, "y":3},
+                {"label":"F7", "x":1, "y":3},
+                {"label":"Shift", "x":2.5, "y":3, "w":2.25},
+                {"label":"Z", "x":4.75, "y":3},
+                {"label":"X", "x":5.75, "y":3},
+                {"label":"C", "x":6.75, "y":3},
+                {"label":"V", "x":7.75, "y":3},
+                {"label":"B", "x":8.75, "y":3},
+                {"label":"N", "x":9.75, "y":3},
+                {"label":"M", "x":10.75, "y":3},
+                {"label":",<", "x":11.75, "y":3},
+                {"label":".>", "x":12.75, "y":3},
+                {"label":"/?", "x":13.75, "y":3},
+                {"label":"Shift", "x":14.75, "y":3, "w":2.75},
+
+                {"label":"F1", "x":0, "y":4},
+                {"label":"F2", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.5, "y":4, "w":1.25},
+                {"label":"OS", "x":3.75, "y":4, "w":1.25},
+                {"label":"Alt", "x":5, "y":4, "w":1.25},
+                {"label":"Space", "x":6.25, "y":4, "w":6.25},
+                {"label":"Alt", "x":12.5, "y":4, "w":1.25},
+                {"label":"OS", "x":13.75, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":15, "y":4, "w":1.25},
+                {"label":"Fn", "x":16.25, "y":4, "w":1.25}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/mechanickeys/undead60m/readme.md b/keyboards/mechanickeys/undead60m/readme.md
index 6f62d30333..77deb26a99 100644
--- a/keyboards/mechanickeys/undead60m/readme.md
+++ b/keyboards/mechanickeys/undead60m/readme.md
@@ -18,10 +18,10 @@ A 60% PCB with some add-ons
 
 Make example for this keyboard (after setting up your build environment):
 
-    make undead60m/:default
+    make mechanickeys/undead60m:default
 
 Flashing example for this keyboard:
 
-    make undead60m:default:flash
+    make mechanickeys/undead60m:default:flash
     
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).