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

1 files changed, 45 insertions, 203 deletions

diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json
index 516464b7a6..86aee014ff 100755
--- a/keyboards/molecule/info.json
+++ b/keyboards/molecule/info.json
@@ -7,209 +7,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                   "label":"E",
-                   "x":2,
-                   "y":0
-                },
-                {
-                   "label":"I",
-                   "x":11.75,
-                   "y":0
-                },
-                {
-                   "label":"W",
-                   "x":1,
-                   "y":0.25
-                },
-                {
-                   "label":"O",
-                   "x":12.75,
-                   "y":0.25
-                },
-                {
-                   "label":"R",
-                   "x":3,
-                   "y":0.5
-                },
-                {
-                   "label":"U",
-                   "x":10.75,
-                   "y":0.5
-                },
-                {
-                   "label":"T",
-                   "x":4,
-                   "y":0.75
-                },
-                {
-                   "label":"Y",
-                   "x":9.75,
-                   "y":0.75
-                },
-                {
-                   "label":"Q",
-                   "x":0,
-                   "y":1
-                },
-                {
-                   "label":"D",
-                   "x":2,
-                   "y":1
-                },
-                {
-                   "label":"K",
-                   "x":11.75,
-                   "y":1
-                },
-                {
-                   "label":"P",
-                   "x":13.75,
-                   "y":1
-                },
-                {
-                   "label":"S",
-                   "x":1,
-                   "y":1.25
-                },
-                {
-                   "label":"L",
-                   "x":12.75,
-                   "y":1.25
-                },
-                {
-                   "label":"F",
-                   "x":3,
-                   "y":1.5
-                },
-                {
-                   "label":"J",
-                   "x":10.75,
-                   "y":1.5
-                },
-                {
-                   "label":"G",
-                   "x":4,
-                   "y":1.75
-                },
-                {
-                   "label":"H",
-                   "x":9.75,
-                   "y":1.75
-                },
-                {
-                   "label":"A",
-                   "x":0,
-                   "y":2
-                },
-                {
-                   "label":"C",
-                   "x":2,
-                   "y":2
-                },
-                {
-                   "label":",",
-                   "x":11.75,
-                   "y":2
-                },
-                {
-                   "label":";",
-                   "x":13.75,
-                   "y":2
-                },
-                {
-                   "label":"X",
-                   "x":1,
-                   "y":2.25
-                },
-                {
-                   "label":".",
-                   "x":12.75,
-                   "y":2.25
-                },
-                {
-                   "label":"V",
-                   "x":3,
-                   "y":2.5
-                },
-                {
-                   "label":"M",
-                   "x":10.75,
-                   "y":2.5
-                },
-                {
-                   "label":"B",
-                   "x":4,
-                   "y":2.75
-                },
-                {
-                   "label":"N",
-                   "x":9.75,
-                   "y":2.75
-                },
-                {
-                   "label":"Z",
-                   "x":0,
-                   "y":3
-                },
-                {
-                   "label":"Shift",
-                   "x":2,
-                   "y":3
-                },
-                {
-                   "label":"Alt",
-                   "x":5.25,
-                   "y":3
-                },
-                {
-                   "label":"Super",
-                   "x":8.5,
-                   "y":3
-                },
-                {
-                   "label":"Shift",
-                   "x":11.75,
-                   "y":3
-                },
-                {
-                   "label":"/",
-                   "x":13.75,
-                   "y":3
-                },
-                {
-                   "label":"Ctrl",
-                   "x":1,
-                   "y":3.25
-                },
-                {
-                   "label":"Space",
-                   "x":6.25,
-                   "y":3.25,
-                   "h":1.5
-                },
-                {
-                   "label":"Enter",
-                   "x":7.5,
-                   "y":3.25,
-                   "h":1.5
-                },
-                {
-                   "label":"Ctrl",
-                   "x":12.75,
-                   "y":3.25
-                },
-                {
-                   "label":"Lower",
-                   "x":5.25,
-                   "y":4
-                },
-                {
-                   "label":"Raise",
-                   "x":8.5,
-                   "y":4
-                }
+                {"label":"Q", "x":0, "y":1},
+                {"label":"W", "x":1, "y":0.25},
+                {"label":"E", "x":2, "y":0},
+                {"label":"R", "x":3, "y":0.5},
+                {"label":"T", "x":4, "y":0.75},
+                {"label":"Y", "x":9.75, "y":0.75},
+                {"label":"U", "x":10.75, "y":0.5},
+                {"label":"I", "x":11.75, "y":0},
+                {"label":"O", "x":12.75, "y":0.25},
+                {"label":"P", "x":13.75, "y":1},
+
+                {"label":"A", "x":0, "y":2},
+                {"label":"S", "x":1, "y":1.25},
+                {"label":"D", "x":2, "y":1},
+                {"label":"F", "x":3, "y":1.5},
+                {"label":"G", "x":4, "y":1.75},
+                {"label":"H", "x":9.75, "y":1.75},
+                {"label":"J", "x":10.75, "y":1.5},
+                {"label":"K", "x":11.75, "y":1},
+                {"label":"L", "x":12.75, "y":1.25},
+                {"label":";", "x":13.75, "y":2},
+
+                {"label":"Z", "x":0, "y":3},
+                {"label":"X", "x":1, "y":2.25},
+                {"label":"C", "x":2, "y":2},
+                {"label":"V", "x":3, "y":2.5},
+                {"label":"B", "x":4, "y":2.75},
+                {"label":"N", "x":9.75, "y":2.75},
+                {"label":"M", "x":10.75, "y":2.5},
+                {"label":",", "x":11.75, "y":2},
+                {"label":".", "x":12.75, "y":2.25},
+                {"label":"/", "x":13.75, "y":3},
+
+                {"label":"Ctrl", "x":1, "y":3.25},
+                {"label":"Shift", "x":2, "y":3},
+                {"label":"Alt", "x":5.25, "y":3},
+                {"label":"Space", "x":6.25, "y":3.25, "h":1.5},
+                {"label":"Enter", "x":7.5, "y":3.25, "h":1.5},
+                {"label":"Super", "x":8.5, "y":3},
+                {"label":"Shift", "x":11.75, "y":3},
+                {"label":"Ctrl", "x":12.75, "y":3.25},
+
+                {"label":"Lower", "x":5.25, "y":4},
+                {"label":"Raise", "x":8.5, "y":4}
             ]
         }
     }
-}
\ No newline at end of file
+}