Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

2 files changed, 20 insertions, 1 deletions

diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index 055d7d0d1e..a35ba55a55 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@@ -35,6 +35,25 @@
 #define NEO_UE DE_Y
 #define NEO_SS DE_UE
 
+#define NEO_DOT DE_DOT
+#define NEO_COMM DE_COMM
+
+#define NEO_1 DE_1
+#define NEO_2 DE_2
+#define NEO_3 DE_3
+#define NEO_4 DE_4
+#define NEO_5 DE_5
+#define NEO_6 DE_6
+#define NEO_7 DE_7
+#define NEO_8 DE_8
+#define NEO_9 DE_9
+#define NEO_0 DE_0
+#define NEO_MINS DE_SS
+
+#define NEO_ACUT DE_PLUS
+#define NEO_GRV DE_ACUT
+#define NEO_CIRC DE_CIRC
+
 #define NEO_L1_L KC_CAPS
 #define NEO_L1_R DE_HASH
 
diff --git a/quantum/template/template.h b/quantum/template/template.h
index d4d78e4c91..a15061b267 100644
--- a/quantum/template/template.h
+++ b/quantum/template/template.h
@@ -12,7 +12,7 @@
 // The second converts the arguments into a two-dimensional array
 #define KEYMAP( \
     k00, k01, k02, \
-      k10,  k11,   \
+      k10,  k11   \
 ) \
 { \
     { k00, k01,   k02 }, \