Merge pull request #5 from jackhumbert/master

Merge from jackhumbert

1 files changed, 33 insertions, 99 deletions

diff --git a/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.ADORE.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.ADORE.json
index 4dfa877a78..502d1e6ea4 100644
--- a/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.ADORE.json
+++ b/keyboards/ergodox/keymaps/algernon/tools/heatmap-layout.ADORE.json
@@ -13,18 +13,15 @@
   [
     {
       "x": 3.5,
-      "c": "#a7d0db",
       "fa": [
         0,
         0,
         2
       ]
     },
-    "#\n3\nF3",
+    "*\n5\nF5",
     {
       "x": 10.5,
-      "c": "#a7d0db",
-      "t": "#000000",
       "a": 4,
       "fa": [
         0,
@@ -32,54 +29,44 @@
         2
       ]
     },
-    "*\n8\nF8"
+    "#\n4\nF4"
   ],
   [
     {
       "y": -0.875,
-      "x": 2.5,
-      "c": "#bfbad1",
-      "t": "#0d0d0b"
+      "x": 2.5
     },
-    "@\n2\nF2",
+    "@\n7\nF7",
     {
-      "x": 1,
-      "c": "#7adabd",
-      "t": "#000000"
+      "x": 1
     },
-    "$\n4\nF4",
+    "^\n3\nF3",
     {
       "x": 8.5
     },
-    "&\n7\nF7",
+    "!\n2\nF2",
     {
-      "x": 1,
-      "c": "#bfbad1",
-      "t": "#0d0d0b"
+      "x": 1
     },
-    "(\n9\nF9"
+    "&\n6\nF6"
   ],
   [
     {
       "y": -0.875,
-      "x": 5.5,
-      "c": "#7adabd",
-      "t": "#000000"
+      "x": 5.5
     },
-    "%\n5\nF5",
+    "$\n1\nF1",
     {
-      "c": "#f9cd31",
       "a": 7,
-      "f": 2
+      "f": 3
     },
-    "STENO",
+    "F11",
     {
       "x": 4.5,
       "f": 3
     },
     "F12",
     {
-      "c": "#7adabd",
       "a": 4,
       "f": 3,
       "fa": [
@@ -88,19 +75,17 @@
         2
       ]
     },
-    "^\n6\nF6"
+    "%\n0\nF10"
   ],
   [
     {
       "y": -0.875,
-      "c": "#ffb2d2",
       "f": 9,
       "a": 6,
       "w": 1.5
     },
     "\n\n<i class='kb kb-Multimedia-Play-Pause'></i>",
     {
-      "t": "#0d0d0b",
       "f": 3,
       "a": 4,
       "fa": [
@@ -109,23 +94,21 @@
           2
       ]
     },
-    "!\n1\nF1",
+    " \n9\nF9",
     {
       "x": 14.5
     },
-    ")\n0\nF10",
+    " \n8\nF8",
     {
       "a": 7,
       "w": 1.5
     },
-    "F11"
+    "STENO"
   ],
   [
     {
       "y": -0.375,
       "x": 3.5,
-      "c": "#a7d0db",
-      "t": "#000000",
       "a": 6
     },
     "G",
@@ -138,15 +121,11 @@
     {
       "y": -0.875,
       "x": 2.5,
-      "c": "#bfbad1",
-      "t": "#0d0d0b",
       "a": 6
     },
     "W",
     {
       "x": 1,
-      "c": "#7adabd",
-      "t": "#000000",
       "a": 6
     },
     "L",
@@ -155,22 +134,17 @@
     },
     "H",
     {
-      "x": 1,
-      "c": "#bfbad1",
-      "t": "#0d0d0b"
+      "x": 1
     },
     "P"
   ],
   [
     {
       "y": -0.875,
-      "x": 5.5,
-      "c": "#7adabd",
-      "t": "#000000"
+      "x": 5.5
     },
     "M",
     {
-      "c": "#93c9b7",
       "a": 4,
       "fa": [0, 0, 0],
       "h": 1.5
@@ -182,7 +156,6 @@
     },
     "}\n)\n]",
     {
-      "c": "#7adabd",
       "a": 6
     },
     "F"
@@ -190,24 +163,21 @@
   [
     {
       "y": -0.875,
-      "c": "#ffb07b",
-      "t": "#0d0d0b",
       "f": 3,
       "a": 4,
       "w": 1.5
     },
     "\n\n~\n`",
     {
-      "c": "#ffb2d2",
       "a": 6,
       "f": 3
     },
-    "Y",
+    "X",
     {
       "x": 14.5,
       "a": 6
     },
-    "X",
+    "Y",
     {
       "a": 4,
       "w": 1.5
@@ -218,8 +188,6 @@
     {
       "y": -0.375,
       "x": 3.5,
-      "c": "#a7d0db",
-      "t": "#000000",
       "a": 6
     },
     "E",
@@ -231,15 +199,11 @@
   [
     {
       "y": -0.875,
-      "x": 2.5,
-      "c": "#bfbad1",
-      "t": "#0d0d0b"
+      "x": 2.5
     },
     "O",
     {
       "x": 1,
-      "c": "#7adabd",
-      "t": "#000000",
       "n": true
     },
     "I",
@@ -249,18 +213,14 @@
     },
     "R",
     {
-      "x": 1,
-      "c": "#bfbad1",
-      "t": "#0d0d0b"
+      "x": 1
     },
     "N"
   ],
   [
     {
       "y": -0.875,
-      "x": 5.5,
-      "c": "#7adabd",
-      "t": "#000000"
+      "x": 5.5
     },
     "U",
     {
@@ -271,8 +231,6 @@
   [
     {
       "y": -0.875,
-      "c": "#ffb2d2",
-      "t": "#0d0d0b",
       "fa": [
         6
       ],
@@ -308,22 +266,21 @@
     {
       "y": -0.625,
       "x": 6.5,
-      "c": "#93c9b7",
-      "t": "#000000",
+      "a": 7,
+      "f": 9,
       "h": 1.5
     },
-    ";\n:",
+    "<i class='fa fa-columns'></i>",
     {
       "x": 4.5,
       "h": 1.5
     },
-    "_\n-"
+    "<i class='fa fa-table'></i>"
   ],
   [
     {
       "y": -0.75,
       "x": 3.5,
-      "c": "#a7d0db",
       "a": 4,
       "f": 3
     },
@@ -339,15 +296,11 @@
     {
       "y": -0.875,
       "x": 2.5,
-      "c": "#bfbad1",
-      "t": "#0d0d0b",
       "a": 6
     },
     "Q",
     {
       "x": 1,
-      "c": "#7adabd",
-      "t": "#000000",
       "a": 4
     },
     "<\n,",
@@ -357,9 +310,7 @@
     },
     "K",
     {
-      "x": 1,
-      "c": "#bfbad1",
-      "t": "#0d0d0b"
+      "x": 1
     },
     "J"
   ],
@@ -367,8 +318,6 @@
     {
       "y": -0.875,
       "x": 5.5,
-      "c": "#7adabd",
-      "t": "#000000",
       "a": 4
     },
     ">\n.",
@@ -381,15 +330,12 @@
   [
     {
       "y": -0.875,
-      "c": "#ffb07b",
       "f": 9,
       "w": 1.5,
       "g": true
     },
     "",
     {
-      "c": "#ffb2d2",
-      "t": "#0d0d0b",
       "a": 6,
       "f": 3,
       "g": false
@@ -401,8 +347,6 @@
     },
     "?\n/",
     {
-      "c": "#ffb07b",
-      "t": "#000000",
       "f": 9,
       "g": true,
       "w": 1.5,
@@ -414,7 +358,6 @@
     {
       "y": -0.375,
       "x": 3.5,
-      "c": "#d9dae0",
       "g": true,
       "a": 7,
       "f": 3
@@ -433,18 +376,16 @@
     "",
     {
       "x": 1,
-      "c": "#d4872a",
-      "g": true,
+      "g": false,
       "a": 5
     },
-    "",
+    ";\n:",
     {
       "x": 8.5
     },
-    "",
+    "_\n-",
     {
       "x": 1,
-      "c": "#d9dae0",
       "g": true,
       "a": 7
     },
@@ -472,7 +413,6 @@
       "ry": 4.25,
       "y": -1,
       "x": 1,
-      "c": "#f9cd31",
       "g": false
     },
     "Alt",
@@ -489,7 +429,6 @@
   ],
   [
     {
-      "c": "#d4872a",
       "a": 7,
       "f": 9,
       "h": 2
@@ -500,15 +439,13 @@
     },
     "<i class='fa fa-angle-double-up'></i>",
     {
-      "c": "#f9cd31",
       "f": 3
     },
     "Ctrl"
   ],
   [
     {
-      "x": 2,
-      "c": "#e26757"
+      "x": 2
     },
     "ESC"
   ],
@@ -518,7 +455,6 @@
       "rx": 13,
       "y": -1,
       "x": -3,
-      "c": "#f9cd31",
       "f": 2
     },
     "MEDIA",
@@ -531,7 +467,6 @@
     },
     "HUN",
     {
-      "c": "#d4872a",
       "f": 9,
       "h": 2
     },
@@ -545,7 +480,6 @@
   [
     {
       "x": -3,
-      "c": "#f9cd31",
       "f": 2
     },
     "LEAD"