Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox

7 files changed, 747 insertions, 6 deletions

diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index fc39c7848..7470ab906 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -7,16 +7,98 @@
 
     "layouts": {
         "LAYOUT_ergodox": {
-            "layout": [{"x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0, "w":1.5}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1, "h":1.5}, {"x":9.5, "y":1, "h":1.5}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2}, {"x":15.5, "y":2, "w":1.5}, {"x":6.5, "y":2.5, "h":1.5}, {"x":9.5, "y":2.5, "h":1.5}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.5}, {"x":0.5, "y":4}, {"x":1.5, "y":4}, {"x":2.5, "y":4}, {"x":3.5, "y":4}, {"x":4.5, "y":4}, {"x":11.5, "y":4}, {"x":12.5, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}, {"x":7, "y":7}, {"x":9, "y":7}]
+            "layout": [
+              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
+              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
+              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
+              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
+                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+
+                                            {"x":6, "y":5}, {"x":7, "y":5},
+                                                            {"x":7, "y":6},
+              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+
+
+                         {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+                {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                                              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+
+
+              {"x":9, "y":5}, {"x":10, "y":5},
+              {"x":9, "y":6},
+              {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+            ]
         },
         "LAYOUT_ergodox_pretty": {
-            "layout": [{"x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0, "w":1.5}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1, "h":1.5}, {"x":9.5, "y":1, "h":1.5}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2}, {"x":15.5, "y":2, "w":1.5}, {"x":6.5, "y":2.5, "h":1.5}, {"x":9.5, "y":2.5, "h":1.5}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.5}, {"x":0.5, "y":4}, {"x":1.5, "y":4}, {"x":2.5, "y":4}, {"x":3.5, "y":4}, {"x":4.5, "y":4}, {"x":11.5, "y":4}, {"x":12.5, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}, {"x":7, "y":7}, {"x":9, "y":7}]
+            "layout": [
+              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
+              {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+
+              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
+              {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+
+              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
+              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+
+              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
+              {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+
+                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+
+                                            {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
+                                                            {"x":7, "y":6},      {"x":9, "y":6},
+              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+            ]
         },
         "LAYOUT_ergodox_80": {
-            "layout": [{"x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0, "w":1.5}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1, "h":1.5}, {"x":9.5, "y":1, "h":1.5}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2}, {"x":15.5, "y":2, "w":1.5}, {"x":6.5, "y":2.5, "h":1.5}, {"x":9.5, "y":2.5, "h":1.5}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.5}, {"x":0.5, "y":4}, {"x":1.5, "y":4}, {"x":2.5, "y":4}, {"x":3.5, "y":4}, {"x":4.5, "y":4}, {"x":11.5, "y":4}, {"x":12.5, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}]
-        },
+          "layout": [
+            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
+            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
+            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
+            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
+                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+
+                                          {"x":6, "y":5}, {"x":7, "y":5},
+                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},
+                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},
+
+
+                          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+                          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                                                        {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                                                                              {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+
+
+            {"x":9, "y":5}, {"x":10, "y":5},
+            {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
+            {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
+          ]
+      },
         "LAYOUT_ergodox_pretty_80": {
-            "layout": [{"x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0, "w":1.5}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1, "h":1.5}, {"x":9.5, "y":1, "h":1.5}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1}, {"x":15.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2}, {"x":15.5, "y":2, "w":1.5}, {"x":6.5, "y":2.5, "h":1.5}, {"x":9.5, "y":2.5, "h":1.5}, {"x":0, "y":3, "w":1.5}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.5}, {"x":0.5, "y":4}, {"x":1.5, "y":4}, {"x":2.5, "y":4}, {"x":3.5, "y":4}, {"x":4.5, "y":4}, {"x":11.5, "y":4}, {"x":12.5, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}]
-        }
+          "layout": [
+            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
+            {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+
+            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
+            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+
+            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
+            {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+
+            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
+            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+
+                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+                                                                  {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+
+                                          {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
+                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
+                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
+          ]
+      }
     }
 }
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
new file mode 100644
index 000000000..11c81f2eb
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
@@ -0,0 +1,28 @@
+#include "../../config.h"
+
+// Sets good default for the speed of the mouse.
+#undef MOUSEKEY_INTERVAL
+#undef MOUSEKEY_DELAY
+#undef MOUSEKEY_TIME_TO_MAX
+#undef MOUSEKEY_MAX_SPEED
+
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          100
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+
+#undef MOUSEKEY_WHEEL_MAX_SPEED
+#undef MOUSEKEY_WHEEL_TIME_TO_MAX
+#undef MOUSEKEY_WHEEL_DELAY
+
+#define MOUSEKEY_WHEEL_MAX_SPEED    5
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
+#define MOUSEKEY_WHEEL_DELAY        100
+
+#undef TAPPING_TOGGLE
+#undef TAPPING_TERM
+#undef IGNORE_MOD_TAP_INTERRUPT
+
+#define TAPPING_TOGGLE  1
+#define TAPPING_TERM    150
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
new file mode 100644
index 000000000..ec77b6aa0
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
@@ -0,0 +1,234 @@
+// An Ergodox EZ keymap mostly following the programmer's dvorak layout.
+// There is a standard QWERTY layer as well
+//
+// See the README.md file for an image of this keymap.
+
+#include QMK_KEYBOARD_H
+
+// The layers that we are defining for this keyboards.
+#define BASE 0
+#define NUM 1
+#define QWERTY 2
+#define MAC 3
+
+// The Tap Dance identifiers, used in the TD keycode and tap_dance_actions array.
+#define TAP_MACRO 0
+
+// SAFE_RANGE must be used to tag the first element of the enum.
+// DYNAMIC_MACRO_RANGE must always be the last element of the enum if other
+// values are added (as its value is used to create a couple of other keycodes
+// after it).
+enum custom_keycodes {
+    MC_ARROW = SAFE_RANGE,
+    DYNAMIC_MACRO_RANGE
+};
+
+// A 'transparent' key code (that falls back to the layers below it).
+#define ___ KC_TRANSPARENT
+
+// A 'blocking' key code. Does nothing but prevent falling back to another layer.
+#define XXX KC_NO
+
+// Some combined keys (one normal keycode when tapped and one modifier or layer
+// toggle when held).
+#define SPC_RALT  MT(MOD_RALT, KC_SPC)  // SPACE key and right alt modifier.
+
+// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
+#define MK_CUT    LSFT(KC_DEL)  // shift + delete
+#define MK_COPY   LCTL(KC_INS)  // ctrl + insert
+#define MK_PASTE  LSFT(KC_INS)  // shift + insert
+//Move mac desktop spaces
+#define MAC_L     LGUI(LSFT(KC_UP)) // cmd + shift + up
+#define MAC_R     LGUI(LSFT(KC_DOWN)) // cmd + shift + down
+
+// This file must be included after DYNAMIC_MACRO_RANGE is defined...
+#include "dynamic_macro.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // Layer 0: basic keys.
+  [BASE] = LAYOUT_ergodox_pretty(
+    KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLASH, KC_PLUS, KC_RBRACKET, KC_EXLM,
+    GUI_T(KC_BSLASH), KC_SCOLON,KC_COMMA, KC_DOT,  KC_P,    KC_Y,    KC_PERC,           KC_DELETE,    KC_F,    KC_G,    KC_C,      KC_R,    KC_L,        KC_SLASH,
+    MO(NUM),          KC_A,     KC_O,     KC_E,    KC_U,    KC_I,                                     KC_D,    KC_H,    KC_T,      KC_N,    KC_S,        KC_MINUS,
+    KC_LSPO,          KC_QUOTE, KC_Q,     KC_J,    KC_K,    KC_X,    KC_LALT,           TD(TAP_MACRO),KC_B,    KC_M,    KC_W,      KC_V,    KC_Z,        KC_RSPC,
+    KC_AT,            KC_HASH,  KC_GRAVE, KC_LEFT, KC_RIGHT,                                                   KC_UP,   KC_DOWN,   KC_HOME, KC_END,      TO(QWERTY),
+                                         ALT_T(KC_APPLICATION), ALL_T(KC_NO),           KC_PGUP, KC_LGUI,
+                                                                   KC_BSLASH,           TO(MAC),
+                                          KC_ENTER, KC_TAB, CTL_T(KC_ESCAPE),           CTL_T(KC_ESCAPE), KC_BSPACE,  KC_SPACE),
+
+  // Layer 1: function and numpad keys.
+  [NUM] = LAYOUT_ergodox_pretty(
+    ___,  KC_F1,   KC_F2,    KC_F3,       KC_F4,       KC_F5,      ___,         ___, KC_F6,   KC_F7,  KC_F8,  KC_F9,      KC_F10,       KC_F11,
+    ___,  KC_EXLM, KC_COMMA, KC_DOT,      KC_MS_BTN1,  KC_MS_BTN2, ___,         ___, KC_UP,   KC_7,   KC_8,   KC_9,       KC_ASTR,      KC_F12,
+    XXX,  ___,     KC_LCBR,  KC_RCBR,     MC_ARROW,    KC_GRAVE,                     KC_DOWN, KC_4,   KC_5,   KC_6,       KC_PLUS,      KC_UNDS,
+    ___,  ___,     KC_CIRC,  KC_LBRACKET, KC_RBRACKET, KC_TILD,    ___,         ___, KC_0,    KC_1,   KC_2,   KC_3,       KC_KP_SLASH,  KC_BSLASH,
+    ___,  ___,     ___,      ___,         ___,                                                ___,    KC_0,   KC_KP_DOT,  KC_EQUAL,     ___,
+                                                           ___,    ___,         KC_KP_ASTERISK, KC_KP_SLASH,
+                                                               KC_LCTL,         ___,
+                                      KC_KP_PLUS,  KC_KP_MINUS, KC_DLR,         KC_DELETE, KC_BSPACE,  KC_SPACE),
+
+  // Layer 2: QWERTY control.
+  [QWERTY] = LAYOUT_ergodox_pretty(
+    /* left hand */
+    KC_EQUAL,   KC_1,     KC_2,         KC_3,     KC_4,     KC_5,    KC_LEFT,           KC_RIGHT,     KC_6,   KC_7,   KC_8,     KC_9,         KC_0,         KC_MINUS,
+    KC_DELETE,  KC_Q,     KC_W,         KC_E,     KC_R,     KC_T,    KC_Y,              TO(BASE),     KC_Y,   KC_U,   KC_I,     KC_O,         KC_P,         KC_BSLASH,
+    MO(NUM),    KC_A,     KC_S,         KC_D,     KC_F,     KC_G,                                     KC_H,   KC_J,   KC_K,     KC_L,         KC_SCLN,      GUI_T(KC_QUOT),
+    KC_LSFT,    KC_Z,     KC_X,         KC_C,     KC_V,     KC_B, ALT_T(KC_NO),         MEH_T(KC_NO), KC_N,   KC_M,   KC_COMMA, KC_DOT,       KC_SLASH,     KC_RSPC,
+    KC_GRAVE,   KC_QUOTE, LALT(KC_TAB), KC_LEFT,  KC_RIGHT,                                                   KC_UP,  KC_DOWN,  KC_LBRACKET,  KC_RBRACKET,  TO(BASE),
+                                                  ___, KC_LGUI,                         ___, KC_ESCAPE,
+                                                       KC_HOME,                         KC_PGUP,
+                                      KC_ENTER, KC_TAB, KC_END,                         KC_PGDOWN, KC_BSPACE, KC_SPACE),
+
+    // Layer 3: Mac layer
+    [MAC] = LAYOUT_ergodox_pretty(
+      /* left hand */
+      ___,  KC_1, KC_2, KC_3,   KC_4,   KC_5, ___,        ___, KC_6,  KC_7, KC_8, KC_9, KC_0, ___,
+      ___,  ___,  ___,  ___,    ___,    ___,  ___,        ___, ___,   ___,  ___,  ___,  ___,  ___,
+      ___,  ___,  ___,  ___,    ___,    ___,                   ___,   ___,  ___,  ___,  ___,  ___,
+      ___,  ___,  ___,  ___,    ___,    ___,  ___,        ___, ___,   ___,  ___,  ___,  ___,  ___,
+      ___,  ___,  ___,  MAC_L,  MAC_R,                                ___,  ___,  ___,  ___,  ___,
+                                        ___,  ___,        ___, ___,
+                                              ___,        TO(BASE),
+                      KC_LGUI,  KC_LALT,  KC_LGUI,        KC_LGUI, KC_LALT, KC_LGUI),
+};
+
+// Whether the macro 1 is currently being recorded.
+static bool is_macro1_recording = false;
+
+// The current set of active layers (as a bitmask).
+// There is a global 'layer_state' variable but it is set after the call
+// to layer_state_set_user().
+static uint32_t current_layer_state = 0;
+uint32_t layer_state_set_user(uint32_t state);
+
+// Method called at the end of the tap dance on the TAP_MACRO key. That key is
+// used to start recording a macro (double tap or more), to stop recording (any
+// number of tap), or to play the recorded macro (1 tap).
+void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) {
+  uint16_t keycode;
+  keyrecord_t record;
+  dprintf("macro_tap_dance_fn %d\n", state->count);
+  if (is_macro1_recording) {
+    keycode = DYN_REC_STOP;
+    is_macro1_recording = false;
+    layer_state_set_user(current_layer_state);
+  } else if (state->count == 1) {
+    keycode = DYN_MACRO_PLAY1;
+  } else {
+    keycode = DYN_REC_START1;
+    is_macro1_recording = true;
+    layer_state_set_user(current_layer_state);
+  }
+
+  record.event.pressed = true;
+  process_record_dynamic_macro(keycode, &record);
+  record.event.pressed = false;
+  process_record_dynamic_macro(keycode, &record);
+}
+
+// The definition of the tap dance actions:
+qk_tap_dance_action_t tap_dance_actions[] = {
+  // This Tap dance plays the macro 1 on TAP and records it on double tap.
+  [TAP_MACRO] = ACTION_TAP_DANCE_FN(macro_tapdance_fn)
+};
+
+// Runs for each key down or up event.
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (keycode != TD(TAP_MACRO)) {
+    // That key is processed by the macro_tapdance_fn. Not ignoring it here is
+    // mostly a no-op except that it is recorded in the macros (and uses space).
+    // We can't just return false when the key is a tap dance, because
+    // process_record_user, is called before the tap dance processing (and
+    // returning false would eat the tap dance).
+    if (!process_record_dynamic_macro(keycode, record)) {
+      return false;
+    }
+
+    if(record->event.pressed) {
+      switch(keycode) {
+        case MC_ARROW:
+          SEND_STRING("=>");
+          return false;
+          break;
+      }
+    }
+  }
+
+  return true; // Let QMK send the enter press/release events
+}
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+  ergodox_right_led_1_off();
+  ergodox_right_led_2_off();
+  ergodox_right_led_3_off();
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+};
+
+// Value to use to switch LEDs on. The default value of 255 is far too bright.
+static const uint8_t max_led_value = 20;
+
+// Whether the given layer (one of the constant defined at the top) is active.
+#define LAYER_ON(layer) (current_layer_state & (1<<layer))
+
+void led_1_on(void) {
+  ergodox_right_led_1_on();
+  ergodox_right_led_1_set(max_led_value);
+}
+
+void led_2_on(void) {
+  ergodox_right_led_2_on();
+  ergodox_right_led_2_set(max_led_value);
+}
+
+void led_3_on(void) {
+  ergodox_right_led_3_on();
+  ergodox_right_led_3_set(max_led_value);
+}
+
+void led_1_off(void) {
+  ergodox_right_led_1_off();
+}
+
+void led_2_off(void) {
+  ergodox_right_led_2_off();
+}
+
+void led_3_off(void) {
+  ergodox_right_led_3_off();
+}
+
+uint32_t layer_state_set_user(uint32_t state) {
+  current_layer_state = state;
+
+  if (is_macro1_recording) {
+    led_1_on();
+    led_2_on();
+    led_3_on();
+    return state;
+  }
+
+  if (LAYER_ON(NUM)) {
+    led_1_on();
+  } else {
+    led_1_off();
+  }
+
+  if (LAYER_ON(MAC)) {
+    led_2_on();
+  } else {
+    led_2_off();
+  }
+
+  if (LAYER_ON(QWERTY)) {
+    led_3_on();
+  } else {
+    led_3_off();
+  }
+
+  return state;
+};
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md
new file mode 100644
index 000000000..33040800e
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md
@@ -0,0 +1,23 @@
+# Ergodox EZ Layout by bpruitt-goddard
+![Layout Image](https://i.imgur.com/kVPmpFG.png)
+
+[KLE link](http://www.keyboard-layout-editor.com/#/gists/5896c5a729a64633d3f63de71e7e0e79)
+
+## Layers
+| Layer | Legend |
+| ----- | ------ |
+| Base  |  Top (black) |
+| Num | Center (blue) |
+| QWERTY | Bottom (Red) |
+| MAC | Front/Bottom-most (Yellow) |
+
+## Features
+* Tap-dance dynamic macro key.
+  * Tap twice for starting macro. Then tap once to complete the macro
+  * Tap one for replaying macro
+* Numpad on right hand with momentary Num layer
+* QWERTY layer for non-dvorak users
+* Mac layer for changing thumbpad modifier keys with Command
+* Uses the following dual function keys
+    * Space Cadet shifts (shift/paren)
+    * Ctrl/Esc
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
new file mode 100644
index 000000000..6ed55e72b
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
@@ -0,0 +1,15 @@
+MOUSEKEY_ENABLE  = yes # Mouse keys
+EXTRAKEY_ENABLE  = yes # Audio control and System control
+COMMAND_ENABLE   = yes # Commands for debug and configuration
+NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
+KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
+TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
+CONSOLE_ENABLE   = yes  # Console for debug
+
+BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration
+UNICODE_ENABLE   = no
+SLEEP_LED_ENABLE = no
+API_SYSEX_ENABLE = no
+RGBLIGHT_ENABLE = no
+RGBLIGHT_ANIMATION = no
diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
new file mode 100644
index 000000000..bafa30eaf
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,354 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "keymap_bepo.h"
+#include "ericgebhart.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [DVORAK] = LAYOUT_wrapper (
+                             // left hand
+                             KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW,
+                             KC_LOCK,    ___DVORAK_L1___,  KC_LBRC,
+                             TAB_BKTAB,  ___DVORAK_L2___,
+                             KC_LSFT,    ___DVORAK_L3___,  KC_LPRN,
+
+                             ___ERGODOX_BOTTOM_LEFT___,
+                             ___ERGODOX_THUMB_LEFT___,
+
+                             // right hand
+                             MDIA_SYMB,  ___NUMBER_R___,   KC_EQL,
+                             KC_RBRC,    ___DVORAK_R1___,  KC_SLASH,
+                             /*    */    ___DVORAK_R2___,  KC_MINUS,
+                             KC_RPRN,    ___DVORAK_R3___,  KC_RSFT,
+
+                             ___ERGODOX_BOTTOM_RIGHT___,
+                             ___ERGODOX_THUMB_RIGHT___
+                             ),
+
+  [XMONAD] = LAYOUT_wrapper (
+                             // left hand
+                             ___,  ___FUNC_L___,     ___,
+                             ___,  ___DVORAK_L1___,  ___,
+                             ___,  ___DVORAK_L2___,
+                             ___,  ___DVORAK_L3___,  ___,
+
+                             ___ERGODOX_BOTTOM_LEFT___,
+                             ___ERGODOX_THUMB_LEFT___,
+
+                             // right hand
+                             ___,  ___FUNC_R___,     ___,
+                             ___,  ___DVORAK_R1___,  ___,
+                             /**/  ___DVORAK_R2___,  ___,
+                             ___,  ___DVORAK_R3___,  ___,
+
+                             ___ERGODOX_BOTTOM_RIGHT___,
+                             ___ERGODOX_THUMB_RIGHT___
+                             ),
+
+  [QWERTY] = LAYOUT_wrapper(
+                            // left hand
+                            KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW,
+                            KC_LOCK,    ___QWERTY_L1___,  KC_LBRC,
+                            TAB_BKTAB,  ___QWERTY_L2___,
+                            KC_LSFT,    ___QWERTY_L3___,  KC_LPRN,
+
+                            ___ERGODOX_BOTTOM_LEFT___,
+                            ___ERGODOX_THUMB_LEFT___,
+
+                            // right hand
+                            MDIA_SYMB,  ___NUMBER_R___,   KC_EQL,
+                            KC_RBRC,    ___QWERTY_R1___,  KC_SLASH,
+                            /*       */ ___QWERTY_R2___,  KC_MINUS,
+                            KC_RPRN,    ___QWERTY_R3___,  KC_RSFT,
+
+                            ___ERGODOX_BOTTOM_RIGHT___,
+                            ___ERGODOX_THUMB_RIGHT___
+                            ),
+
+  [COLEMAK] = LAYOUT_wrapper (
+                              // left hand
+                              KC_GRV,     ___NUMBER_L___,    DEF_OS_LAYER_SW,
+                              KC_LOCK,    ___COLEMAK_L1___,  KC_LBRC,
+                              TAB_BKTAB,  ___COLEMAK_L2___,
+                              KC_LSFT,    ___COLEMAK_L3___,  KC_LPRN,
+
+                              ___ERGODOX_BOTTOM_LEFT___,
+                              ___ERGODOX_THUMB_LEFT___,
+
+                              // right hand
+                              MDIA_SYMB,  ___NUMBER_R___,    KC_EQL,
+                              KC_RBRC,    ___COLEMAK_R1___,  KC_SLASH,
+                              /*       */ ___COLEMAK_R2___,  KC_MINUS,
+                              KC_RPRN,    ___COLEMAK_R3___,  KC_RSFT,
+
+                              ___ERGODOX_BOTTOM_RIGHT___,
+                              ___ERGODOX_THUMB_RIGHT___
+                              ),
+
+  [WORKMAN] = LAYOUT_wrapper (
+                              // left hand
+                              KC_GRV,     ___NUMBER_L___,    DEF_OS_LAYER_SW,
+                              KC_LOCK,    ___WORKMAN_L1___,  KC_LBRC,
+                              TAB_BKTAB,  ___WORKMAN_L2___,
+                              KC_LSFT,    ___WORKMAN_L3___,  KC_LPRN,
+
+                              ___ERGODOX_BOTTOM_LEFT___,
+                              ___ERGODOX_THUMB_LEFT___,
+
+                              // right hand
+                              MDIA_SYMB,  ___NUMBER_R___,    KC_EQL,
+                              KC_RBRC,    ___WORKMAN_R1___,  KC_SLASH,
+                              /*    */    ___WORKMAN_R2___,  KC_MINUS,
+                              KC_RPRN,    ___WORKMAN_R3___,  KC_RSFT,
+
+                              ___ERGODOX_BOTTOM_RIGHT___,
+                              ___ERGODOX_THUMB_RIGHT___
+                              ),
+
+  [NORMAN] = LAYOUT_wrapper(
+                            // left hand
+                            KC_GRV,     ___NUMBER_L___,   DEF_OS_LAYER_SW,
+                            KC_LOCK,    ___NORMAN_L1___,  KC_LBRC,
+                            TAB_BKTAB,  ___NORMAN_L2___,
+                            KC_LSFT,    ___NORMAN_L3___,  KC_LPRN,
+
+                            ___ERGODOX_BOTTOM_LEFT___,
+                            ___ERGODOX_THUMB_LEFT___,
+
+                            // right hand
+                            MDIA_SYMB,  ___NUMBER_R___,   KC_EQL,
+                            KC_RBRC,    ___NORMAN_R1___,  KC_SLASH,
+                            /*       */ ___NORMAN_R2___,  KC_MINUS,
+                            KC_RPRN,    ___NORMAN_R3___,  KC_RSFT,
+
+                            ___ERGODOX_BOTTOM_RIGHT___,
+                            ___ERGODOX_THUMB_RIGHT___
+                            ),
+
+  [DVORAK_ON_BEPO] = LAYOUT_wrapper(
+                                    // left hand
+                                    DB_GRV,     ___NUMBER_BEPO_L___,  DEF_OS_LAYER_SW,
+                                    KC_LOCK,    ___DVORAK_FR_L1___,   DB_LBRC,
+                                    TAB_BKTAB,  ___DVORAK_FR_L2___,
+                                    KC_LSFT,    ___DVORAK_FR_L3___,   DB_LPRN,
+
+                                    ___ERGODOX_BOTTOM_LEFT___,
+                                    ___ERGODOX_THUMB_LEFT___,
+
+
+                                    // right hand
+                                    MDIA_SYMB,   ___NUMBER_BEPO_R___,  DB_EQL,
+                                    DB_RBRC,     ___DVORAK_FR_R1___,   DB_SLASH,
+
+                                    /*      */   ___DVORAK_FR_R2___,   DB_MINUS,
+                                    DB_RPRN,     ___DVORAK_FR_R3___,   KC_RSFT,
+
+                                    ___ERGODOX_BOTTOM_RIGHT_FR___,
+                                    ___ERGODOX_THUMB_RIGHT___
+                                    ),
+
+  [XMONAD_FR] = LAYOUT_wrapper(
+                               // left hand
+                               ___,  ___FUNC_L___,        ___,
+                               ___,  ___DVORAK_FR_L1___,  ___,
+                               ___,  ___DVORAK_FR_L2___,
+                               ___,  ___DVORAK_FR_L3___,  ___,
+
+                               ___ERGODOX_BOTTOM_LEFT___,
+                               ___ERGODOX_THUMB_LEFT___,
+
+
+                               // right hand
+                               ___,  ___FUNC_R___,         ___,
+                               ___,  ___DVORAK_FR_R1___,   ___,
+                               /**/  ___DVORAK_FR_R2___,   ___,
+                               ___,  ___DVORAK_FR_R3___,   ___,
+
+                               ___ERGODOX_BOTTOM_RIGHT_FR___,
+                               ___ERGODOX_THUMB_RIGHT___
+                               ),
+
+  [BEPO] = LAYOUT_wrapper (
+                           // Left hand
+                           BP_DLR,         ___SYMBOL_BEPO_L___,  DEF_OS_LAYER_SW,
+                           KC_LOCK,        ___BEPO_FR_L1___,     DB_LBRC,
+                           TAB_BKTAB,      ___BEPO_FR_L2___,
+                           BP_SFT_T_ECRC,  ___BEPO_FR_L3___,     DB_RBRC,
+
+                           ___ERGODOX_BOTTOM_LEFT___,
+                           ___ERGODOX_THUMB_LEFT___,
+
+
+                           // Right hand
+                           MDIA_SYMB,  ___SYMBOL_BEPO_R___,  BP_EQL,
+                           BP_DCRC,    ___BEPO_FR_R1___,     BP_W,
+                           /*     */   ___BEPO_FR_R2___,     BP_CCED,
+                           BP_C,    ___BEPO_FR_R3___,        KC_RSFT,
+
+                           ___ERGODOX_BOTTOM_RIGHT___,
+                           ___ERGODOX_THUMB_RIGHT___
+                           ),
+
+  // SYMBOLS
+  [SYMB] = LAYOUT_wrapper(
+                          // left hand
+                          ___,  ___FUNC_L___,     ___,
+                          ___,  ___SYMBOLS_1___,  ___,
+                          ___,  ___SYMBOLS_2___,
+                          ___,  ___SYMBOLS_3___,  ___,
+
+                          ___ERGODOX_TRANS_BOTTOM___,
+                          ___ERGODOX_TRANS_THUMBS___,
+
+
+                          // right hand
+                          ___,  ___FUNC_R___, KC_F11,
+                          ___,  KC_UP,    ___KEYPAD_1___,  KC_F12,
+                          /**/  KC_DOWN,  ___KEYPAD_2___,  KC_TRNS,
+                          ___,  KC_AMPR,  ___KEYPAD_3___,  KC_PENT,
+                          /*    */        ___KEYPAD_4___,  ___,
+
+                          ___ERGODOX_TRANS_THUMBS___
+                          ),
+
+  [SYMB_ON_BEPO] = LAYOUT_wrapper(
+                                  // left hand
+                                  ___,  ___FUNC_L___,     ___,
+                                  ___,  ___SYMBOLS_1_BP___,  ___,
+                                  ___,  ___SYMBOLS_2_BP___,
+                                  ___,  ___SYMBOLS_3_BP___,  ___,
+
+                                  ___ERGODOX_TRANS_BOTTOM___,
+                                  ___ERGODOX_TRANS_THUMBS___,
+
+
+                                  // right hand
+                                  ___,  ___FUNC_R___, KC_F11,
+                                  ___,  KC_UP,    ___KEYPAD_1_BP___,  KC_F12,
+                                  /**/  KC_DOWN,  ___KEYPAD_2_BP___,  KC_TRNS,
+                                  ___,  KC_AMPR,  ___KEYPAD_3_BP___,  KC_PENT,
+                                  /*    */        ___KEYPAD_4_BP___,  ___,
+
+                                  ___ERGODOX_TRANS_THUMBS___
+                                  ),
+
+  // MEDIA AND MOUSE
+  [MDIA] = LAYOUT_wrapper(
+                          // left hand
+                          ___,  ___FUNC_L___,  ___,
+                          ___MOUSE_BTNS_L___,  ___, ___,
+                          ___,  ___MOUSE_LDUR___,   ___,
+                          ___,  ___MWHEEL_LDUR___,  XXX,  ___,
+                          ___,  ___,  ___MOUSE_ACCL_012___,
+                          ___ERGODOX_TRANS_THUMBS___,
+
+                          // right hand
+                          ___,      ___FUNC_R___,                    KC_F11,
+                          KC_VOLU,  ___, ___MUTE_PLAY_STOP___,  ___, KC_F12,
+                          /*    */  KC_PGUP, ___VI_ARROWS___,        ___,
+                          KC_VOLD,  KC_PGDN, ___MOUSE_BTNS_R___,
+                          ___ERGODOX_TRANS_BOTTOM___,
+                          ___ERGODOX_TRANS_THUMBS___
+                          ),
+
+  [LAYERS] = LAYOUT_wrapper(
+                            // left hand
+                            ___,  ___FUNC_L___,  ___,
+                            XXX,  XXX,  XXX, ___LAYERS_L1___,  XXX, XXX,
+                            XXX,  XXX,  XXX, ___LAYERS_L2___,  XXX,
+                            XXX,  XXX,  ___LAYERS_L3___,       XXX,  XXX,
+                            ___,  ___,  ___LAYERS_L4___,
+                            ___ERGODOX_TRANS_THUMBS___,
+
+                            // right hand
+                            ___,      ___FUNC_R___,                    KC_F11,
+                            KC_VOLU,  ___, ___MUTE_PLAY_STOP___,  ___, KC_F12,
+                            /*    */  KC_PGUP, ___VI_ARROWS___,        ___,
+                            KC_VOLD,  KC_PGDN, ___MOUSE_BTNS_R___,
+                            ___ERGODOX_TRANS_BOTTOM___,
+                            ___ERGODOX_TRANS_THUMBS___
+                            ),
+};
+
+
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+  uint8_t layer = biton32(layer_state);
+
+  ergodox_board_led_off();
+  ergodox_right_led_1_off();
+  ergodox_right_led_2_off();
+  ergodox_right_led_3_off();
+  if(!on_qwerty())
+    ergodox_right_led_1_on();
+  switch (layer) {
+    //case DVORAK:
+    //ergodox_right_led_1_off();
+    //break;
+    // first led on for a bepo software keyboard layer
+  case DVORAK_ON_BEPO:
+    ergodox_right_led_2_on();
+    break;
+  case BEPO:
+    ergodox_right_led_1_on();
+    ergodox_right_led_1_off();
+    ergodox_right_led_1_on();
+    ergodox_right_led_1_off();
+    ergodox_right_led_1_on();
+    break;
+  case SYMB:
+    ergodox_right_led_3_on();
+    break;
+  case MDIA:
+    ergodox_right_led_3_on();
+    break;
+  case LAYERS:
+    ergodox_right_led_1_on();
+    ergodox_right_led_2_on();
+    ergodox_right_led_3_on();
+    break;
+  default:
+    ergodox_board_led_off();
+    break;
+
+    /* default: */
+    /*   // none */
+    /*   break; */
+
+  }
+}
+
+
+/*
+  clear_oneshot_mods();
+  set_oneshot_locked_mods(mods);
+  register_mods(mods);
+
+  register_code(action.key.code);
+  unregister_code(action.key.code);
+
+  layer_on(action.layer_tap.val);
+  layer_off(action.layer_tap.val);
+
+  clear_oneshot_locked_mods();
+  clear_oneshot_mods();
+  unregister_mods(mods);
+
+*/
diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/readme.md b/keyboards/ergodox_ez/keymaps/ericgebhart/readme.md
new file mode 100644
index 000000000..4f71bf39e
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/ericgebhart/readme.md
@@ -0,0 +1,5 @@
+Overview
+========
+
+These are my ergodox_ez keymaps. There isn't much here. Go take a look at my Userspace readme.
+That's where all the code is.