From 4de9ed7eb0fde3fba69a334c5ff6ee2fa6ec7f17 Mon Sep 17 00:00:00 2001
From: Anthony
Date: Sat, 25 Aug 2018 17:45:42 +0200
Subject: Add a belgian keymap, partially based on keymap_french.h (#3737)

---
 quantum/keymap_extras/keymap_belgian.h | 117 +++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 quantum/keymap_extras/keymap_belgian.h

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
new file mode 100644
index 0000000000..764c561417
--- /dev/null
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -0,0 +1,117 @@
+/* Copyright 2015-2016 Jack Humbert
+ *
+ * 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/>.
+ */
+#ifndef KEYMAP_BELGIAN_H
+#define KEYMAP_BELGIAN_H
+
+#include "keymap.h"
+
+#define BE_LGUI KC_LALT
+#define BE_LALT KC_LGUI
+
+// Alt gr
+#ifndef ALGR
+#define ALGR(kc) RALT(kc)
+#endif
+#define NO_ALGR KC_RALT
+
+// Normal characters
+// Line 1
+#define BE_SUP2	KC_GRV
+#define BE_AMP	KC_1
+#define BE_EACU	KC_2
+#define BE_QUOT	KC_3
+#define BE_APOS	KC_4
+#define BE_LPRN	KC_5
+#define BE_PARA	KC_6
+#define BE_EGRV	KC_7
+#define BE_EXLM	KC_8
+#define BE_CCED	KC_9
+#define BE_AGRV	KC_0
+#define BE_RPRN	KC_MINS
+#define BE_MINS	KC_EQL
+
+// Line 2
+#define BE_A    KC_Q
+#define BE_Z	  KC_W
+#define	BE_CIRC	KC_LBRC
+#define BE_DLR	KC_RBRC
+
+// Line 3
+#define BE_Q 	  KC_A
+#define BE_M 	  KC_SCLN
+#define BE_UGRV	KC_QUOT
+#define BE_MU 	KC_NUHS
+
+// Line 4
+#define BE_LESS	KC_NUBS
+#define BE_W	  KC_Z
+#define BE_COMM	KC_M
+#define BE_SCLN	KC_COMM
+#define BE_COLN	KC_DOT
+#define BE_EQL	KC_SLSH
+
+// Shifted characters
+// Line 1
+#define BE_SUP3 KC_TILD
+#define BE_1  	LSFT(KC_1)
+#define BE_2 	  LSFT(KC_2)
+#define BE_3 	  LSFT(KC_3)
+#define BE_4 	  LSFT(KC_4)
+#define BE_5 	  LSFT(KC_5)
+#define BE_6 	  LSFT(KC_6)
+#define BE_7 	  LSFT(KC_7)
+#define BE_8 	  LSFT(KC_8)
+#define BE_9 	  LSFT(KC_9)
+#define BE_0 	  LSFT(KC_0)
+#define BE_OVRR	KC_UNDS
+#define BE_UNDS KC_PLUS
+
+// Line 2
+#define BE_UMLT	LSFT(BE_CIRC)
+#define BE_PND	LSFT(BE_DLR)
+
+// Line 3
+#define	BE_PERC	LSFT(BE_UGRV)
+
+// Line 4
+#define BE_GRTR	LSFT(BE_LESS)
+#define BE_QUES	LSFT(BE_COMM)
+#define BE_DOT	LSFT(BE_SCLN)
+#define BE_SLSH	LSFT(BE_COLN)
+#define BE_PLUS	LSFT(BE_EQL)
+
+// Alt Gr-ed characters
+// Line 1
+#define BE_PIPE ALGR(KC_1)
+#define BE_AT	  ALGR(KC_2)
+#define BE_HASH	ALGR(KC_3)
+#define BE_LCBR ALGR(KC_9)
+#define BE_RCBR	ALGR(KC_0)
+
+// Line 2
+#define BE_EURO	ALGR(KC_E)
+#define BE_LSBR ALGR(BE_CIRC)
+#define BE_RSBR ALGR(BE_DLR)
+
+// Line 3
+#define BE_ACUT ALGR(BE_UGRV)
+#define BE_GRV	ALGR(BE_MU)
+
+// Line 4
+#define BE_BSLS ALGR(BE_LESS)
+#define BE_TILT ALGR(BE_EQL)
+
+#endif
-- 
cgit v1.2.3


From 7d8f680b507ab16fdb1172a01a72a601694ba20a Mon Sep 17 00:00:00 2001
From: Peter Nguyen
Date: Mon, 10 Sep 2018 04:49:26 +0200
Subject: Fix typo in keymap_swedish.h (#3877)

* Fix typo in keymap_swedish.h

* Update keymap_swedish.h
---
 quantum/keymap_extras/keymap_swedish.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/keymap_swedish.h b/quantum/keymap_extras/keymap_swedish.h
index 9044bb74e7..d1a0f4f227 100644
--- a/quantum/keymap_extras/keymap_swedish.h
+++ b/quantum/keymap_extras/keymap_swedish.h
@@ -41,8 +41,8 @@
 #define NO_DLR_MAC  LSFT(KC_4) // $
 #define NO_GRV_MAC ALGR(NO_BSLS) // `
 #define NO_GRTR_MAC LSFT(KC_GRV)  // >
-#define NO_LCBR_MAC ALGR(LSFT(KC_8))  // }
-#define NO_LESS_MAC KC_GRV  // >
+#define NO_LCBR_MAC ALGR(LSFT(KC_8))  // {
+#define NO_LESS_MAC KC_GRV  // <
 #define NO_PIPE_MAC ALGR(KC_7)  // |
 #define NO_RCBR_MAC ALGR(LSFT(KC_9))  // }
 
-- 
cgit v1.2.3


From 37cfd2c5009b932cfddec815c63c6846a5ef3854 Mon Sep 17 00:00:00 2001
From: takashiski
Date: Wed, 3 Oct 2018 09:51:43 +0900
Subject: add JP keycode for MacOSX (#4033)

---
 quantum/keymap_extras/keymap_jp.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/keymap_jp.h b/quantum/keymap_extras/keymap_jp.h
index fb74bce8d4..b0235f1120 100644
--- a/quantum/keymap_extras/keymap_jp.h
+++ b/quantum/keymap_extras/keymap_jp.h
@@ -40,6 +40,9 @@
 #define JP_HENK KC_INT4 // henkan
 #define JP_KANA KC_INT2 // katakana/hiragana|ro-mazi
 
+#define JP_MKANA KC_LANG1 //kana on MacOSX
+#define JP_MEISU KC_LANG2 //eisu on MacOSX
+
 
 //Aliases for shifted symbols
 #define JP_DQT  LSFT(KC_2)    // "
-- 
cgit v1.2.3


From 0793abfd19d994e68f4b449eb2fed7ea51aa3e2f Mon Sep 17 00:00:00 2001
From: Patrick Hener
Date: Fri, 12 Oct 2018 19:31:08 +0200
Subject: Add sendstring_german.h (#4124)

* added sweet16 test keymap and touched sendstring_german.h

* added sendstring_german.h

* Delete keymap.c

As suggested deleted the keymap file.
---
 quantum/keymap_extras/sendstring_german.h | 81 +++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 quantum/keymap_extras/sendstring_german.h

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/sendstring_german.h b/quantum/keymap_extras/sendstring_german.h
new file mode 100644
index 0000000000..1eaafee317
--- /dev/null
+++ b/quantum/keymap_extras/sendstring_german.h
@@ -0,0 +1,81 @@
+/* Copyright 2018 Patrick Hener
+ *
+ * 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/>.
+ */
+/* Sendstring definitions for the German layout */
+#ifndef SENDSTRING_GERMAN
+#define SENDSTRING_GERMAN
+
+#include "keymap_german.h"
+
+const bool ascii_to_shift_lut[0x80] PROGMEM = {
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    
+    0, 1, 1, 0, 1, 1, 1, 1,
+    1, 1, 1, 0, 0, 0, 0, 1,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 1, 0, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 0, 0, 0, 0, 1,
+    1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 1, 1, 1, 1, 0
+};
+
+/* Until an ALT table/functionality is added, the following symbols will not work:
+* § @ [ ] { } \ ~ äA öÖ ß ´
+* Following characters can be printed using other characters like so:
+* [ in makro will be ü
+* { in makro will be Ü
+* ~ in makro will be °
+*/
+const uint8_t ascii_to_keycode_lut[0x80] PROGMEM = {
+    0, 0, 0, 0, 0, 0, 0, 0,
+    KC_BSPC, KC_TAB, KC_ENT, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, KC_ESC, 0, 0, 0, 0,
+
+  /* SPACE   !     "      #        $     %     &      '                    */
+    KC_SPC, KC_1, KC_2, DE_HASH, KC_4, KC_5, KC_6, DE_HASH,
+  /*  (      )     *      +        ,        -        .       /                    */
+    KC_8, KC_9, DE_PLUS, DE_PLUS, KC_COMM, DE_MINS, KC_DOT, KC_7,
+  /*   0     1     2     3     4     5    6     7                    */
+    KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,
+  /*   8     9      :       ;         <        =       >       ?                     */
+    KC_8, KC_9, KC_DOT, KC_COMM, DE_LESS,    KC_0, DE_LESS, KC_MINS,
+  /*   @     A     B     C     D     E     F     G                    */
+    KC_2, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
+  /*   H     I     J     K     L     M     N     O                    */
+    KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O,
+  /*   P     Q     R     S     T     U     V     W                    */
+    KC_P, KC_Q, KC_R, KC_S, KC_T, KC_U, KC_V, KC_W,
+  /*   X     Y     Z      [         \       ]       ^      _                    */
+    KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, DE_CIRC, DE_MINS,
+  /*   `       a     b     c     d     e     f     g                    */
+    DE_ACUT, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
+  /*   h     i     j     k     l     m     n     o                    */
+    KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O,
+  /*    p    q     r     s     t     u     v     w                      */
+    KC_P, KC_Q, KC_R, KC_S, KC_T, KC_U, KC_V, KC_W,
+  /*    x    y     z      {        |        }        ~    DELETE                    */
+    KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_GRV, KC_DEL
+};
+
+#endif
-- 
cgit v1.2.3


From ec86141a4a558fc51b9ebfdcb14106b8a8d051d5 Mon Sep 17 00:00:00 2001
From: Žan Pevec
Date: Mon, 15 Oct 2018 19:39:58 +0200
Subject: Basic Slovenian keymap added (#4128)

* Basic Slovenian keymap added

* Author fixed
---
 quantum/keymap_extras/keymap_slovenian.h | 106 +++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 quantum/keymap_extras/keymap_slovenian.h

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
new file mode 100644
index 0000000000..8b197e6c5b
--- /dev/null
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -0,0 +1,106 @@
+/* Copyright 2018 Žan Pevec
+ *
+ * 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/>.
+ */
+
+#ifndef KEYMAP_SLOVENIAN
+#define KEYMAP_SLOVENIAN
+#include "keymap.h"
+
+
+//Swapped Z and Y
+#define SI_Z KC_Y
+#define SI_Y KC_Z
+
+//Special characters
+#define SI_CV KC_SCLN
+#define SI_SV KC_LBRC
+#define SI_ZV KC_BSLS
+
+#define SI_A KC_A
+#define SI_B KC_B
+#define SI_C KC_C
+#define SI_D KC_D
+#define SI_E KC_E
+#define SI_F KC_F
+#define SI_G KC_G
+#define SI_H KC_H
+#define SI_I KC_I
+#define SI_J KC_J
+#define SI_K KC_K
+#define SI_L KC_L
+#define SI_M KC_M
+#define SI_N KC_N
+#define SI_O KC_O
+#define SI_P KC_P
+#define SI_Q KC_Q
+#define SI_R KC_R
+#define SI_S KC_S
+#define SI_T KC_T
+#define SI_U KC_U
+#define SI_V KC_V
+#define SI_W KC_W
+#define SI_X KC_X
+
+#define SI_0 KC_0
+#define SI_1 KC_1
+#define SI_2 KC_2
+#define SI_3 KC_3
+#define SI_4 KC_4
+#define SI_5 KC_5
+#define SI_6 KC_6
+#define SI_7 KC_7
+#define SI_8 KC_8
+#define SI_9 KC_9
+
+#define SI_DOT KC_DOT
+#define SI_COMM KC_COMM
+
+#define SI_PLUS KC_EQL // + and * and ~
+#define SI_QOT KC_MINS // Single quote
+#define SI_MINS KC_SLSH // - and _
+
+// shifted characters
+#define SI_EXLM LSFT(KC_1) // !
+#define SO_DQOT LSFT(KC_2) // "
+#define SI_HASH LSFT(KC_3) // #
+#define SI_DLR  LSFT(KC_4) // $
+#define SI_PERC LSFT(KC_5) // %
+#define SI_AMPR LSFT(KC_6) // &
+#define SI_SLSH LSFT(KC_7) // /
+#define SI_LPRN LSFT(KC_8) // (
+#define SI_RPRN LSFT(KC_9) // )
+#define SI_EQL  LSFT(KC_0) // =
+#define SI_QST  LSFT(SI_QOT) // ?
+#define SI_ASTR LSFT(SI_PLUS) // *
+#define SI_COLN LSFT(KC_DOT) // :
+#define SI_SCLN LSFT(KC_COMM) // ;
+#define SI_UNDS LSFT(SI_MINS) // _
+
+// Alt Gr-ed characters
+#define SI_CIRC ALGR(KC_3) // ^
+#define SI_DEG ALGR(KC_5) // °
+#define SI_GRV ALGR(KC_7) // `
+#define SI_ACCU ALGR(KC_9) // ´
+#define SI_LCBR ALGR(KC_B) // {
+#define SI_RCBR ALGR(KC_N) // }
+#define SI_LBRC ALGR(KC_F) // [
+#define SI_RBRC ALGR(KC_G) // ]
+#define SI_BSLS ALGR(KC_Q) // backslash
+#define SI_AT  ALGR(KC_V) // @
+#define SI_EURO ALGR(KC_E) // €
+#define SI_TILD ALGR(KC_1) // ~
+#define SI_PIPE ALGR(KC_W) // |
+
+#endif
-- 
cgit v1.2.3


From 8ce9e3255ee324174c7dbcc553ff089c54fc5265 Mon Sep 17 00:00:00 2001
From: Žan Pevec
Date: Wed, 17 Oct 2018 00:45:05 +0200
Subject: Fixes on slovenian keymap

---
 quantum/keymap_extras/keymap_slovenian.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index 8b197e6c5b..364bd90b8c 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -73,7 +73,7 @@
 
 // shifted characters
 #define SI_EXLM LSFT(KC_1) // !
-#define SO_DQOT LSFT(KC_2) // "
+#define SI_DQOT LSFT(KC_2) // "
 #define SI_HASH LSFT(KC_3) // #
 #define SI_DLR  LSFT(KC_4) // $
 #define SI_PERC LSFT(KC_5) // %
@@ -89,18 +89,18 @@
 #define SI_UNDS LSFT(SI_MINS) // _
 
 // Alt Gr-ed characters
-#define SI_CIRC ALGR(KC_3) // ^
-#define SI_DEG ALGR(KC_5) // °
-#define SI_GRV ALGR(KC_7) // `
-#define SI_ACCU ALGR(KC_9) // ´
-#define SI_LCBR ALGR(KC_B) // {
-#define SI_RCBR ALGR(KC_N) // }
-#define SI_LBRC ALGR(KC_F) // [
-#define SI_RBRC ALGR(KC_G) // ]
-#define SI_BSLS ALGR(KC_Q) // backslash
-#define SI_AT  ALGR(KC_V) // @
-#define SI_EURO ALGR(KC_E) // €
-#define SI_TILD ALGR(KC_1) // ~
-#define SI_PIPE ALGR(KC_W) // |
+#define SI_CIRC ALTG(KC_3) // ^
+#define SI_DEG ALTG(KC_5) // °
+#define SI_GRV ALTG(KC_7) // `
+#define SI_ACCU ALTG(KC_9) // ´
+#define SI_LCBR ALTG(KC_B) // {
+#define SI_RCBR ALTG(KC_N) // }
+#define SI_LBRC ALTG(KC_F) // [
+#define SI_RBRC ALTG(KC_G) // ]
+#define SI_BSLS ALTG(KC_Q) // backslash
+#define SI_AT  ALTG(KC_V) // @
+#define SI_EURO ALTG(KC_E) // €
+#define SI_TILD ALTG(KC_1) // ~
+#define SI_PIPE ALTG(KC_W) // |
 
 #endif
-- 
cgit v1.2.3


From 1d03af876c122cf16ed78025eb753e1d838edcac Mon Sep 17 00:00:00 2001
From: QMK Bot
Date: Tue, 16 Oct 2018 23:11:58 +0000
Subject: convert to unix line-endings [skip ci]

---
 quantum/keymap_extras/keymap_slovenian.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'quantum/keymap_extras')

diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index 364bd90b8c..53d07837e9 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 Žan Pevec
+/* Copyright 2018 Žan Pevec
  *
  * 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
-- 
cgit v1.2.3


From 5694e7b6a60e0a1b60c1bd7fce51e99a8314abb7 Mon Sep 17 00:00:00 2001
From: ROMUSKING
Date: Mon, 22 Oct 2018 19:54:31 +0100
Subject: Keymap: add new keymap  (#4127)

* an attempt at own layout

* typematrixed dvorak

* columns shifted

columns shifted out, second pinky column moved to the inside.

* Update users/romus/romus.h

* code cleanup

Changes requested by Drashna + Tap Dance enabled

* Fixed EOF

Fixed the no newline at the end of file alert.

* rgblight fight eeprom writes

* rgb code simplification

* Update users/romus/README.md

* Update quantum/keymap_extras/keymap_slovenian.h
---
 .../lets_split_eh/keymaps/doxish_dvorak/config.h   |  21 +
 .../lets_split_eh/keymaps/doxish_dvorak/keymap.c   | 161 ++++++
 .../lets_split_eh/keymaps/doxish_dvorak/rules.mk   |   0
 keyboards/lets_split_eh/keymaps/romus/README.md    |   7 +
 keyboards/lets_split_eh/keymaps/romus/keymap.c     |  28 ++
 keyboards/lets_split_eh/keymaps/romus/rules.mk     |   7 +
 quantum/keymap_extras/keymap_slovenian.h           |   1 +
 users/romus/README.md                              |  45 ++
 users/romus/config.h                               |   8 +
 users/romus/romus.c                                | 557 +++++++++++++++++++++
 users/romus/romus.h                                | 272 ++++++++++
 users/romus/rules.mk                               |  24 +
 12 files changed, 1131 insertions(+)
 create mode 100644 keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h
 create mode 100644 keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c
 create mode 100644 keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk
 create mode 100644 keyboards/lets_split_eh/keymaps/romus/README.md
 create mode 100644 keyboards/lets_split_eh/keymaps/romus/keymap.c
 create mode 100644 keyboards/lets_split_eh/keymaps/romus/rules.mk
 create mode 100644 users/romus/README.md
 create mode 100644 users/romus/config.h
 create mode 100644 users/romus/romus.c
 create mode 100644 users/romus/romus.h
 create mode 100644 users/romus/rules.mk

(limited to 'quantum/keymap_extras')

diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h b/keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h
new file mode 100644
index 0000000000..526c0837c7
--- /dev/null
+++ b/keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h
@@ -0,0 +1,21 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#pragma once
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c
new file mode 100644
index 0000000000..8976081542
--- /dev/null
+++ b/keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c
@@ -0,0 +1,161 @@
+#include "eeconfig.h"
+
+extern keymap_config_t keymap_config;
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _DVORAK 0
+
+#define _LOWER 3
+#define _RAISE 4
+#define _FUNCTION 15
+#define _ADJUST 16
+
+enum custom_keycodes {
+  DVORAK = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST
+};
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Func |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |  `   | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT( \
+  KC_QUOTE,    KC_COMMA, KC_DOT,  KC_P,    KC_Y, KC_TAB, KC_BSPC, KC_F,  KC_G,    KC_C,    KC_R,    KC_L, \
+  KC_A,        KC_O,     KC_E,    KC_U,    KC_I, KC_ENT, KC_ENT,  KC_D,  KC_H,    KC_T,    KC_N,    KC_S, \
+  KC_SCOLON,   KC_Q,     KC_J,    KC_K,    KC_X, OSM(MOD_LSFT), OSM(MOD_RSFT), KC_B,  KC_M,    KC_W,    KC_V,    KC_Z, \
+  KC_LCTL, KC_LGUI, KC_LALT, OSM(MOD_LSFT), KC_SPC, LOWER, RAISE, KC_SPC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+
+/*[BASE] = LAYOUT(
+ *   KC_QUOTE,      KC_COMMA,      KC_DOT,     KC_P,                KC_Y,                                 KC_F,       KC_G,      KC_C,    KC_R,          KC_L,
+ *   KC_A,          KC_O,          KC_E,       KC_U,                KC_I,                                 KC_D,       KC_H,      KC_T,    KC_N,          KC_S,
+ *   KC_SCOLON,     KC_Q,          KC_J,       KC_K,                KC_X,                                 KC_B,       KC_M,      KC_W,    KC_V,          KC_Z,
+ *   OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER,   KC_SPACE,  KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT)
+ * ),
+ *KC_GRV,
+ */
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Mute |      |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT( \
+  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,  \
+  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
+  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE, _______, KC_PIPE, \
+  _______, _______,  _______, _______, KC_BSPC, _______, _______, KC_BSPC, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |   4  |   5  |   6  |   +  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |Enter |   7  |   8  |   9  |   -  |  F11 |  F12 |ISO # |ISO / | Mute |      |   \  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   ,  |   0  |  .   |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT( \
+  KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
+  KC_ENT,  KC_7,    KC_8,  KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, \
+  _______, KC_COMM, KC_0,  KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |Taskmg|      |      |      |      |      |      |      |RGBVAI|RGBSAI|RGBHUI|caltde|
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |Qwerty|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      | RESET|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT( \
+  TSKMGR,  _______, _______, _______, _______, _______, KC_DEL,  _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
+  _______, _______, _______, _______, _______, _______, _______, DVORAK,  RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET    \
+),
+
+/* Function
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |  Up  |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Caps |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_FUNCTION] = LAYOUT( \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, \
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+)
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/lets_split_eh/keymaps/romus/README.md b/keyboards/lets_split_eh/keymaps/romus/README.md
new file mode 100644
index 0000000000..d54ed6856f
--- /dev/null
+++ b/keyboards/lets_split_eh/keymaps/romus/README.md
@@ -0,0 +1,7 @@
+# Lets Split Eh Layout
+
+Check out [user readme](../../../../users/romus/README.md) for more info.
+
+# Usage
+
+Fill in after flashing
diff --git a/keyboards/lets_split_eh/keymaps/romus/keymap.c b/keyboards/lets_split_eh/keymaps/romus/keymap.c
new file mode 100644
index 0000000000..ba5b75a5cf
--- /dev/null
+++ b/keyboards/lets_split_eh/keymaps/romus/keymap.c
@@ -0,0 +1,28 @@
+#include QMK_KEYBOARD_H
+#include "romus.h"
+
+
+void matrix_init_keymap (void) {
+}
+
+uint32_t layer_state_set_keymap(uint32_t state) {
+	
+    return state;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Main Dvorak layer
+    [_DV] = LAYOUT_letssplit_wrapper(DVORAK),
+    // Turkish and special character overlay
+    [_AL] = LAYOUT_letssplit_wrapper(ALTCHAR),
+    // Gaming layer
+    [_GA] = LAYOUT_letssplit_wrapper(GAME),
+    // Numbers layer
+    [_NU] = LAYOUT_letssplit_wrapper(NUMBERS),
+    // Settings layer
+    [_SE] = LAYOUT_letssplit_wrapper(SETTINGS),
+    // Mouse emulation layer
+    [_MO] = LAYOUT_letssplit_wrapper(MOUSE),
+    // Music layer
+    [_MU] = LAYOUT_letssplit_wrapper(MUSIC),
+};
diff --git a/keyboards/lets_split_eh/keymaps/romus/rules.mk b/keyboards/lets_split_eh/keymaps/romus/rules.mk
new file mode 100644
index 0000000000..ad7dd4c474
--- /dev/null
+++ b/keyboards/lets_split_eh/keymaps/romus/rules.mk
@@ -0,0 +1,7 @@
+# Build options
+
+BACKLIGHT_ENABLE = no		# Switch LEDs
+MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
+RGBLIGHT_ENABLE = yes 		# LED strips
+TAP_DANCE_ENABLE = yes 		# Use multi-tap features
+AUDIO_ENABLE = no 			# Audio stuff
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index 53d07837e9..a9db17becd 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -1,4 +1,5 @@
 /* Copyright 2018 Žan Pevec
+
  *
  * 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
diff --git a/users/romus/README.md b/users/romus/README.md
new file mode 100644
index 0000000000..0de9d9a817
--- /dev/null
+++ b/users/romus/README.md
@@ -0,0 +1,45 @@
+# overview
+
+ this is a modified version of let's split keyboard from bbaserdem. i don't like standard dvorak overuses right pinky
+ so i shifted the columns out. i'm not sure if this is any good, time will tell.
+
+ i have ortholinear let's split eh, which share a lot of functions with other ortholinear keyboards.
+
+# layout
+
+i use dvorak with an unorthodox off layout.
+if you wanna grab my code, and you used a layout with a persistent base
+layer change, change it to layer 0 before proceeding.
+
+# layers
+
+* **dvorak**: base layer,with dvorak layout.
+* **alternative**: has alternate characters.
+* **game**: toggled from *function*, comfortable for gaming use.
+* **numeric**: has numericals and symbols. can be locked.
+* **function**: layer has media and function keys.
+* **mouse**: manipulates mouse. can be locked.
+* **music** allows playing sounds.
+
+# functionality
+
+* **rgb backlight**: with layer indication, and ability to change base layer lighting mode.
+* **secrets**: by placing a secrets.h, and not tracking it, passwords can be stored.
+* **mouse**: mouse emulation, complete with diagonal keys.
+* **turkish**: an altgr-like overlay that allows some non-common letters, in unicode.
+
+i suggest checking out how i enabled turkish keys,
+how i planned out rgb lighting,
+and my mouse implementation;
+they might offer some insight into fringe user cases.
+
+# issues
+
+all features are too big for the 32kb bootloader.
+offenders are audio and rgb lights; it comes down to one or the other.
+
+~the proton board, and rev 6 might fix that.~
+
+# credits
+
+this is a modified version of let's split keyboard from bbaserdem who has previously written his keymap by himself before, but rewrote it here.
diff --git a/users/romus/config.h b/users/romus/config.h
new file mode 100644
index 0000000000..9332febe63
--- /dev/null
+++ b/users/romus/config.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#ifdef TAP_DANCE_ENABLE
+    #define TAPPING_TERM 300
+    #define TAPPING_TOGGLE 1
+#endif
+
+// !USERSPACE_CONFIG_H
diff --git a/users/romus/romus.c b/users/romus/romus.c
new file mode 100644
index 0000000000..35b524f941
--- /dev/null
+++ b/users/romus/romus.c
@@ -0,0 +1,557 @@
+#include "romus.h"
+
+/*---------------*\
+|*-----MOUSE-----*|
+\*---------------*/
+#ifdef MOUSEKEY_ENABLE
+#include "mousekey.h"
+#endif
+
+/*-------------*\
+|*-----RGB-----*|
+\*-------------*/
+#ifdef RGBLIGHT_ENABLE
+#include "rgblight.h"
+#endif
+
+/*-------------*\
+|*---UNICODE---*|
+\*-------------*/
+#ifdef UNICODE_ENABLE
+#endif
+
+/*-----------------*\
+|*-----SECRETS-----*|
+\*-----------------*/
+// Enabled by adding a non-tracked secrets.h to this dir.
+#if (__has_include("secrets.h"))
+#include "secrets.h"
+#endif
+
+/*---------------*\
+|*-----MUSIC-----*|
+\*---------------*/
+#ifdef AUDIO_ENABLE
+float tone_game[][2]    = SONG(ZELDA_PUZZLE);
+float tone_return[][2]  = SONG(ZELDA_TREASURE);
+float tone_linux[][2]   = SONG(UNICODE_LINUX);
+float tone_windows[][2] = SONG(UNICODE_WINDOWS);
+#endif
+
+/*-------------------*\
+|*-----TAP-DANCE-----*|
+\*-------------------*/
+#ifdef TAP_DANCE_ENABLE
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Shift on double tap of semicolon
+    [SCL] = ACTION_TAP_DANCE_DOUBLE( KC_SCLN, KC_COLN )
+};
+#endif
+
+/* In keymaps, instead of writing _user functions, write _keymap functions
+ * The __attribute__((weak)) allows for empty definitions here, and during
+ * compilation, if these functions are defined elsewhere, they are written
+ * over. This allows to include custom code from keymaps in the generic code
+ * in this file.
+ */
+__attribute__ ((weak)) void matrix_init_keymap(void) { }
+__attribute__ ((weak)) void matrix_scan_keymap(void) { }
+__attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+__attribute__ ((weak)) uint32_t layer_state_set_keymap (uint32_t state) {
+    return state;
+}
+__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { }
+
+/* ----------------------- *\
+ * -----RGB Functions----- *
+\* ----------------------- */
+#ifdef RGBLIGHT_ENABLE
+
+// Set RGBLIGHT state depending on layer
+void rgblight_change( uint8_t this_layer ) {
+    // Enable RGB light; will not work without this
+	//rgblight_enable_noeeprom();	
+	// Change RGB light
+    switch ( this_layer ) {
+        case _DV:
+            // Load base layer
+            rgblight_disable_noeeprom();
+            break;
+        case _AL:
+            // Do yellow for alternate
+			rgblight_enable_noeeprom();
+            rgblight_sethsv_noeeprom( 60,255,255);
+			
+
+            break;
+        case _GA:
+            // Do purple for game
+			rgblight_enable_noeeprom();
+            rgblight_sethsv_noeeprom(285,255,255);
+			
+
+            break;
+        case _NU:
+            // Do azure for number
+			rgblight_enable_noeeprom();
+            rgblight_sethsv_noeeprom(186,200,255);
+			
+
+            break;
+        case _SE:
+            // Do red for settings
+			rgblight_enable_noeeprom();
+
+            rgblight_sethsv_noeeprom( 16,255,255);
+			
+            break;
+        case _MO:
+            // Do green for mouse
+			rgblight_enable_noeeprom();
+            rgblight_sethsv_noeeprom(120,255,255);
+			
+
+            break;
+        case _MU:
+            // Do orange for music
+			
+			rgblight_enable_noeeprom();
+            rgblight_sethsv_noeeprom( 39,255,255);
+			
+            break;
+        default:
+            // Something went wrong
+			rgblight_enable_noeeprom();
+            rgblight_sethsv_noeeprom(  0,255,255);
+			
+            break;
+    }
+}
+
+#endif
+
+/*---------------------*\
+|*-----MATRIX INIT-----*|
+\*---------------------*/
+void matrix_init_user (void) {
+
+    // Keymap specific things, do it first thing to allow for delays etc
+    matrix_init_keymap();
+
+    // Correct unicode
+#ifdef UNICODE_ENABLE
+    set_unicode_input_mode(UC_LNX);
+#endif
+
+    // Make beginning layer DVORAK
+    set_single_persistent_default_layer(_DV);
+
+}
+
+/*---------------------*\
+|*-----MATRIX SCAN-----*|
+\*---------------------*/
+void matrix_scan_user (void) {
+    // Keymap specific, do it first
+    matrix_scan_keymap();
+}
+
+/*------------------*\
+|*-----KEYCODES-----*|
+\*------------------*/
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    // Shift check
+    bool is_capital = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
+    static bool lock_flag = false;
+    uint8_t layer = biton32 (layer_state);
+
+    switch (keycode) {
+        // Secrets implementation
+#if (__has_include("secrets.h"))
+        case SECRET1:
+            if( !record->event.pressed ) {
+                send_string_P( secret[ keycode - SECRET1 ] );
+            }
+            return false;
+            break;
+        case SECRET2:
+            if( !record->event.pressed ) {
+                send_string_P( secret[ keycode - SECRET2 ] );
+            }
+            return false;
+            break;
+        case SECRET3:
+            if( !record->event.pressed ) {
+                send_string_P( secret[ keycode - SECRET3 ] );
+            }
+            return false;
+            break;
+#endif 
+
+        // Lock functionality: These layers are locked if the LOCKED buttons are
+        // pressed. Otherwise, they are momentary toggles
+        case K_LOCK:
+            if (record->event.pressed) {
+                lock_flag = !lock_flag;
+            }
+            return false;
+            break;
+        case K_MOUSE:
+            if (record->event.pressed) {
+                layer_on(_MO);
+                lock_flag = false;
+            } else {
+                if ( lock_flag ) {
+                    lock_flag = false;
+                } else {
+                    layer_off(_MO);
+                }
+            }
+            return false;
+            break;
+        case K_NUMBR:
+            if (record->event.pressed) {
+                layer_on(_NU);
+                lock_flag = false;
+            } else {
+                if ( lock_flag ) {
+                    lock_flag = false;
+                } else {
+                    layer_off(_NU);
+                }
+            }
+            return false;
+            break;
+            
+        // Layer switches with sound
+        case K_GAMES:
+            if (record->event.pressed) {
+                // On press, turn off layer if active
+                if ( layer == _GA ) {
+#ifdef AUDIO_ENABLE
+                    stop_all_notes();
+                    PLAY_SONG(tone_return);
+#endif
+                    layer_off(_GA);
+                }
+            } else {
+                // After click, turn on layer if accessed from setting
+                if ( layer == _SE ) {
+#ifdef AUDIO_ENABLE
+                    stop_all_notes();
+                    PLAY_SONG(tone_game);
+#endif
+                    layer_on(_GA);
+                    layer_off(_SE);
+                }
+            }
+            return false;
+            break;
+        case MU_TOG:
+            if (record->event.pressed) {
+                // On press, turn off layer if active
+                if ( layer == _SE ) {
+                    layer_off(_SE);
+                    layer_on(_MU);
+                } else {
+                    layer_off(_MU);
+                }
+            }
+            return true;
+            break;
+
+//------UNICODE
+        // Unicode switches with sound
+#ifdef UNICODE_ENABLE
+        case UNI_LI:
+            if (record->event.pressed) {
+#ifdef AUDIO_ENABLE
+                stop_all_notes();
+                PLAY_SONG(tone_linux);
+#endif
+                set_unicode_input_mode(UC_LNX);
+            }
+            return false;
+            break;
+        case UNI_WN:
+            if (record->event.pressed) {
+#ifdef AUDIO_ENABLE
+                stop_all_notes();
+                PLAY_SONG(tone_windows);
+#endif
+                set_unicode_input_mode(UC_WIN);
+            }
+            return false;
+            break;
+
+        // Turkish letters, with capital functionality
+        case TUR_A:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00c2);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00e2);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+        case TUR_O:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00d6);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00f6);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+        case TUR_U:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00dc);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00fc);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+        case TUR_I:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x0130);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x0131);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+        case TUR_G:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x011e);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x011f);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+        case TUR_C:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x00c7);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x00e7);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+        case TUR_S:
+            if (record->event.pressed) {
+                if ( is_capital ) {
+                    unicode_input_start();
+                    register_hex(0x015e);
+                    unicode_input_finish();
+                } else {
+                    unicode_input_start();
+                    register_hex(0x015f);
+                    unicode_input_finish();
+                }
+            }
+            return false;
+            break;
+#endif
+
+//-------Diagonal mouse movements
+#ifdef MOUSEKEY_ENABLE
+        case MO_NE:
+            if( record->event.pressed ) {
+                mousekey_on(MO_N);
+                mousekey_on(MO_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_N);
+                mousekey_off(MO_E);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_NW:
+            if( record->event.pressed ) {
+                mousekey_on(MO_N);
+                mousekey_on(MO_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_N);
+                mousekey_off(MO_W);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_SE:
+            if( record->event.pressed ) {
+                mousekey_on(MO_S);
+                mousekey_on(MO_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S);
+                mousekey_off(MO_E);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_SW:
+            if( record->event.pressed ) {
+                mousekey_on(MO_S);
+                mousekey_on(MO_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S);
+                mousekey_off(MO_W);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_S_NE:
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_N);
+                mousekey_on(MO_S_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_N);
+                mousekey_off(MO_S_E);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_S_NW:
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_N);
+                mousekey_on(MO_S_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_N);
+                mousekey_off(MO_S_W);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_S_SE:
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_S);
+                mousekey_on(MO_S_E);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_S);
+                mousekey_off(MO_S_E);
+                mousekey_send();
+            }
+            return false;
+            break;
+        case MO_S_SW:
+            if( record->event.pressed ) {
+                mousekey_on(MO_S_S);
+                mousekey_on(MO_S_W);
+                mousekey_send();
+            } else {
+                mousekey_off(MO_S_S);
+                mousekey_off(MO_S_W);
+                mousekey_send();
+            }
+            return false;
+            break;
+#endif
+
+//------DOUBLE PRESS, with added left navigation
+        case DBL_SPC:
+            if( record->event.pressed ) {
+                SEND_STRING("  "SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_ANG:
+            if( record->event.pressed ) {
+                SEND_STRING("<>"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_PAR:
+            if( record->event.pressed ) {
+                SEND_STRING("()"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_SQR:
+            if( record->event.pressed ) {
+                SEND_STRING("[]"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_BRC:
+            if( record->event.pressed ) {
+                SEND_STRING("{}"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_QUO:
+            if( record->event.pressed ) {
+                SEND_STRING("\'\'"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_DQT:
+            if( record->event.pressed ) {
+                SEND_STRING("\"\""SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+        case DBL_GRV:
+            if( record->event.pressed ) {
+                SEND_STRING("``"SS_TAP(X_LEFT));
+            }
+            return false;
+            break;
+// END OF KEYCODES
+    }
+    return process_record_keymap(keycode, record);
+}
+
+/*----------------------*\
+|*-----LAYER CHANGE-----*|
+\*----------------------*/
+
+uint32_t layer_state_set_user(uint32_t state) {
+
+    state = layer_state_set_keymap (state);
+#ifdef RGBLIGHT_ENABLE
+    // Change RGB lighting depending on the last layer activated
+    rgblight_change( biton32(state) );
+#endif
+    return state;
+}
\ No newline at end of file
diff --git a/users/romus/romus.h b/users/romus/romus.h
new file mode 100644
index 0000000000..265c942e92
--- /dev/null
+++ b/users/romus/romus.h
@@ -0,0 +1,272 @@
+// This is a modified version of Let's Split keyboard from bbaserdem
+
+#pragma once
+
+#include "quantum.h"
+
+// Use 7 wide characters for keymaps
+#define _______ KC_TRNS
+#define XXX     KC_NO
+
+// Layers
+#define _DV 0 // Base layer
+#define _AL 1 // Alt char overlay
+#define _GA 2 // Game layer
+#define _NU 3 // Numbers layer
+#define _SE 4 // Settings layer
+#define _MO 5 // Mouse emulation
+#define _MU 6 // Music mode
+
+// Define short macros
+#define UNDO    LCTL(KC_Z)
+#define REDO    LCTL(KC_Y)
+#define COPY    LCTL(KC_C)
+#define CUT     LCTL(KC_X)
+#define PASTE   LCTL(KC_V)
+#define EXIT    LALT(KC_F4)
+#define	CAPS	SFT_T(KC_CAPS)	
+
+
+// Rename mouse keys with 7 letters
+#ifdef MOUSEKEY_ENABLE
+#define MO_S_N  KC_MS_WH_UP
+#define MO_S_S  KC_MS_WH_DOWN
+#define MO_S_E  KC_MS_WH_RIGHT
+#define MO_S_W  KC_MS_WH_LEFT
+#define MO_N    KC_MS_UP
+#define MO_S    KC_MS_DOWN
+#define MO_E    KC_MS_RIGHT
+#define MO_W    KC_MS_LEFT
+#define MO_CL_L KC_MS_BTN1
+#define MO_CL_R KC_MS_BTN2
+#define MO_CL_M KC_MS_BTN3
+#define MO_CL_4 KC_MS_BTN4
+#define MO_CL_5 KC_MS_BTN5
+#define MO_AC_0 KC_MS_ACCEL0
+#define MO_AC_1 KC_MS_ACCEL1
+#define MO_AC_2 KC_MS_ACCEL2
+#else
+#define MO_S_N  KC_NO
+#define MO_S_S  KC_NO
+#define MO_S_E  KC_NO
+#define MO_S_W  KC_NO
+#define MO_N    KC_NO
+#define MO_S    KC_NO
+#define MO_E    KC_NO
+#define MO_W    KC_NO
+#define MO_CL_L KC_NO
+#define MO_CL_R KC_NO
+#define MO_CL_M KC_NO
+#define MO_CL_1 KC_NO
+#define MO_CL_2 KC_NO
+#define MO_AC_0 KC_NO
+#define MO_AC_1 KC_NO
+#define MO_AC_2 KC_NO
+#endif
+
+// Rename music keys with <8 letters
+#ifdef AUDIO_ENABLE
+#define MU_REC  KC_LCTL
+#define MU_STOP KC_LALT
+#define MU_PLAY KC_LGUI
+#define MU_PLAY KC_LGUI
+#define MU_FAST KC_UP
+#define MU_SLOW KC_DOWN
+#define MU_MASK KC_A
+#else
+#define MU_REC  KC_NO
+#define MU_STOP KC_NO
+#define MU_PLAY KC_NO
+#define MU_PLAY KC_NO
+#define MU_FAST KC_NO
+#define MU_SLOW KC_NO
+#define MU_MASK KC_NO
+#endif
+
+// Define non-capitalized UTF shortcuts here
+#ifdef UNICODE_ENABLE
+#define PHY_HBR UC(0x0127)
+#define PHY_DEG UC(0x00b0)
+#define CUR_LIR UC(0x20ba)
+#define CUR_BIT UC(0x20bf)
+#define CUR_EUR UC(0x20ac)
+#define CUR_BPN UC(0x00a3)
+#define CUR_YEN UC(0x00a5)
+#else
+#define PHY_HBR KC_NO
+#define PHY_DEG KC_NO
+#define CUR_LIR KC_NO
+#define CUR_BIT KC_NO
+#define CUR_EUR KC_NO
+#define CUR_BPN KC_NO
+#define CUR_YEN KC_NO
+#endif
+
+// Custom keycodes
+enum userspace_custom_keycodes {
+    // Turkish letters, with shifting
+    TUR_A = SAFE_RANGE,
+    TUR_C,
+    TUR_G,
+    TUR_I,
+    TUR_O,
+    TUR_S,
+    TUR_U,
+    // Unicode mode switch
+    UNI_LI,
+    UNI_WN,
+    // Double keys
+    DBL_SPC,
+    DBL_ANG,
+    DBL_PAR,
+    DBL_SQR,
+    DBL_BRC,
+    DBL_QUO,
+    DBL_DQT,
+    DBL_GRV,
+    // Diagonal mouse movements
+    MO_NE,
+    MO_NW,
+    MO_SE,
+    MO_SW,
+    MO_S_NE,
+    MO_S_NW,
+    MO_S_SE,
+    MO_S_SW,
+    // Layer switches and lock functionality
+    K_MOUSE,
+    K_NUMBR,
+    K_LOCK,
+    K_GAMES,
+    // Secret macros
+    SECRET1,
+    SECRET2,
+    SECRET3
+};
+
+// Do tap dancable semicolon key if available
+#ifdef TAP_DANCE_ENABLE
+enum {
+    SCL = 0
+};
+#define MY_SCL  TD(SCL)
+#else
+#define MY_SCL  KC_SCLN
+#endif
+
+// Shared keymaps
+#define LAYOUT_planck_wrapper(...) LAYOUT_planck_grid(__VA_ARGS__)
+#define LAYOUT_letssplit_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__)
+
+/* Dvorak
+ * ,------------------------------------------------------------------------.
+ * | ' " |  ,  |  .  |  P  |  Y  | Esc || Del |  F  |  G  |  C  |  R  |  L  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |  A  |  O  |  E  |  U  |  I  | Bkp || Ent |  D  |  H  |  T  |  N  |  S  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|	
+ * | ; : |  Q  |  J  |  K  |  X  | Spc || SET |  B  |  M  |  W  |  V  |  Z  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Ctrl|  OS | Alt | Tab | Cps | ACH || SYM | Spc | Lft |  Up | Dwn | Rght| 
+ * `------------------------------------------------------------------------' */
+#define DVORAK \
+    KC_QUOT,KC_COMM,KC_DOT, KC_P,   KC_Y,	KC_ESC,	KC_DEL,	KC_F,   KC_G,   KC_C,   KC_R,   KC_L,    \
+    KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_BSPC,KC_ENT, KC_D,   KC_H,   KC_T,   KC_N,   KC_S,    \
+    MY_SCL, KC_Q,   KC_J,   KC_K,   KC_X,  	KC_SPC,	MO(_SE),KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,    \
+    KC_LCTL,KC_LGUI,KC_LALT,KC_TAB,	CAPS, 	MO(_AL),K_NUMBR,KC_SPC, KC_LEFT,KC_UP,	KC_DOWN,KC_RGHT
+
+/* Alternative character overlay
+ * ,------------------------------------------------------------------------.
+ * | ` ~ | ' ' | " " | Euro|Pound|     || Del | Home| PgUp| Prn | \ | | / ?	|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Redo| < > | ( ) | [ ] | { } | Alt || Ins | End |PgDwn| Scl | BTC | - _ |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Undo| Cut | Copy|Paste| EXIT| Shf ||     |     |     |     | Yen | = + |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     |     ||     |     |     |     |     |     |
+ * `------------------------------------------------------------------------' */
+#define ALTCHAR \
+    KC_GRV,	DBL_QUO,DBL_DQT,CUR_EUR,CUR_BPN,_______,_______,KC_HOME,KC_PGUP,KC_PSCREEN,		KC_BSLASH,	KC_SLSH, \
+    REDO,	DBL_ANG,DBL_PAR,DBL_SQR,DBL_BRC,KC_LALT,KC_INS,	KC_END, KC_PGDN,KC_SCROLLLOCK,	CUR_BIT,	KC_MINUS, \
+    UNDO,	CUT,    COPY,   PASTE,	EXIT,	KC_LSFT,_______,_______,_______,_______,		CUR_YEN,	KC_EQUAL,   \
+    _______,_______,_______,_______,_______,_______,_______,DBL_SPC,_______,_______,		_______,	_______
+
+/* Game layer
+ * ,------------------------------------------------------------------------.
+ * | OFF |  Q  |  W  |  E  |  R  |  T  || Esc |  7  |  8  |  9  |NumLk|Bkspc|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Tab |  A  |  S  |  D  |  F  |  G  ||  F1 |  4  |  5  |  6  |  \  | Ent |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Shf |  Z  |  X  |  C  |  V  |  B  ||  F2 |  1  |  2  |  3  |  ^  | MSE |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Ctrl| Alt |  /  |  `  | SYM | Spc ||  F5 | Ent |  0  |  <  |  v  |  >  |
+ * `------------------------------------------------------------------------' */
+#define GAME \
+    K_GAMES,KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_ESC, KC_P7,  KC_P8,  KC_P9,  KC_NLCK,KC_BSPC, \
+    KC_TAB, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_F1,  KC_P4,  KC_P5,  KC_P6,  KC_BSLS,KC_ENT , \
+    KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_F2,  KC_P1,  KC_P2,  KC_P3,  KC_UP,K_MOUSE, \
+    KC_LCTL,KC_LALT,KC_SLSH,KC_GRV,	K_NUMBR,KC_SPC, KC_F5, 	KC_ENT, KC_P0,  KC_LEFT,KC_DOWN,KC_RGHT
+
+/* Symbols layer
+ * ,------------------------------------------------------------------------.
+ * | OFF |  `  |  ~  |  \  |  [  |  {  ||  }  |  ]  |  -  |  _  |  =  |  +  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |  1  |  2  |  3  |  4  |  5  |     || LCK |  6  |  7  |  8  |  9  |  0  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |  !  |  @  |  #  |  $  |  %  |     ||Vol +|  ^  |  &  |  *  |  (  |  )  |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |  |  |     |     |     |     |     ||     |     |     |     |     |     |
+ * `------------------------------------------------------------------------' */
+#define NUMBERS \
+    K_NUMBR,KC_GRV, KC_TILD,KC_BSLS,KC_LBRC,KC_LCBR,KC_RCBR,KC_RBRC,KC_MINS,KC_UNDS,KC_EQL, KC_PLUS, \
+    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,	_______,K_LOCK,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    \
+    KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,_______,KC_VOLU,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, \
+    KC_PIPE,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+	
+/* Settings layer
+ * ,------------------------------------------------------------------------.
+ * |BLLed|  F1 |  F2 |  F3 |  F4 | Lin || Win | Wake|     |Hue -|Hue +|Reset|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  F5 |  F6 |  F7 |  F8 |     ||Vol 0|     |RGBto|Sat -|Sat +|     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | Game|  F9 | F10 | F11 | F12 |Vol 0||     |PrtSc|RGBan|Bri -|Bri +|     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |Musir|     |     |     |     |Vol +||Vol -| Prev| Stop|TogMu| Next|     |
+ * `------------------------------------------------------------------------' */
+#define SETTINGS \
+    BL_STEP,KC_F1,  KC_F2,  KC_F3,  KC_F4,  UNI_LI, UNI_WN, KC_WAKE,_______,RGB_HUD,RGB_HUI,RESET  , \
+    _______,KC_F5,  KC_F6,  KC_F7,  KC_F8,  _______,KC_MUTE,_______,RGB_TOG,RGB_SAD,RGB_SAI,_______, \
+    K_GAMES,KC_F9,  KC_F10, KC_F11, KC_F12, KC_MUTE,_______,KC_PSCR,RGB_MOD,RGB_VAD,RGB_VAI,_______, \
+    MU_TOG, _______,_______,_______,_______,KC_VOLU,KC_VOLD,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,_______
+
+/* Mouse layer
+ * ,------------------------------------------------------------------------.
+ * |Ulock|  \  |  ^  |  /  |.....|.....||.....|.....| |\|.| |^| | |/|.|     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  <  | Mid |  >  |Btn 4|.....||.....|Btn 5| <-- | Mid | --> |     |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |  /  |  v  |  \  |.....|.....||.....|.....| |/| | |v| | |\| | LCK |
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     | Left||Right|     |     |Accl0|Accl1|Accl2|
+ * `------------------------------------------------------------------------' */
+#define MOUSE \
+    K_MOUSE,MO_NW,  MO_N,   MO_NE,  XXX,    XXX    ,XXX,    XXX,    MO_S_NW,MO_S_N, MO_S_NE,_______, \
+    _______,MO_W,   MO_CL_M,MO_E,   MO_CL_4,XXX    ,XXX,    MO_CL_5,MO_S_W, MO_CL_M,MO_S_E, _______, \
+    _______,MO_SW,  MO_S,   MO_SE,  XXX,    XXX    ,XXX,    XXX,    MO_S_SW,MO_S_S, MO_S_SE,K_LOCK , \
+    _______,_______,_______,_______,_______,MO_CL_L,MO_CL_R,_______,MO_AC_0,MO_AC_1,MO_AC_2,_______
+
+/* Music layer
+ * ,------------------------------------------------------------------------.
+ * |.....|.....|.....|.....|.....|.....||.....|.....|.....|.....|.....|.....|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |.....|.....|.....|.....|.....|.....||.....|.....|.....|.....|.....|.....|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * |.....|.....|.....|.....|.....|.....||.....|.....|.....|.....|.....|.....|
+ * |-----+-----+-----+-----+-----+-----++-----+-----+-----+-----+-----+-----|
+ * | togg| rec | stop| play| slow| fast||modes|.....|.....|.....|.....|.....|
+ * `------------------------------------------------------------------------'
+ */
+#define MUSIC \
+    MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK, \
+    MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK, \
+    MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK, \
+    MU_TOG, MU_REC, MU_STOP,MU_PLAY,MU_SLOW,MU_FAST,MU_MOD, MU_MASK,MU_MASK,MU_MASK,MU_MASK,MU_MASK
diff --git a/users/romus/rules.mk b/users/romus/rules.mk
new file mode 100644
index 0000000000..78ce2e93f4
--- /dev/null
+++ b/users/romus/rules.mk
@@ -0,0 +1,24 @@
+SRC += romus.c
+EXTRAFLAGS += -flto			# Used to make code smaller
+
+# ENABLE
+UNICODE_ENABLE = yes	# Used for unicode character emulation
+EXTRAKEY_ENABLE = yes 	# OS signals like volume control
+
+# DISABLE
+ifndef BLUETOOTH_ENABLE 
+	BLUETOOTH_ENABLE = no 	# No bluetooth
+endif
+COMMAND_ENABLE = no			# Some bootmagic thing i dont use
+BOOTMAGIC_ENABLE = no 		# Access to EEPROM settings, not needed
+CONSOLE_ENABLE = no			# Allows console output with a command
+SLEEP_LED_ENABLE = no  		# Breathes LED's when computer is asleep. Untested.
+NKRO_ENABLE = no 			# Default is 6KRO which is plenty
+MIDI_ENABLE = no 			# Untested feature
+FAUXCLICKY_ENABLE = no 		# Emulates clicks using speaker
+KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
+API_SYSEX_ENABLE = no 		# Allows OS to send signals.
+
+
+# Disabling this makes it compile, i dont know why
+# VARIABLE_TRACE = no 		# Allows debugging variables
-- 
cgit v1.2.3


From 4636f0f623c71f1eda8628cbae4784fe08a8faf7 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević
Date: Tue, 6 Nov 2018 06:34:54 +0100
Subject: Remove ALTG(kc) as it's misleading and is not actually AltGr (#4338)

* Remove ALTG(kc) as it's misleading and is not actually AltGr

* Add temporary alias for ALGR in keyboards/planck/keymaps/pevecyan/keymap.c
---
 docs/feature_advanced_keycodes.md          |  1 -
 docs/keycodes.md                           |  1 -
 keyboards/planck/keymaps/pevecyan/keymap.c |  2 ++
 quantum/keymap_extras/keymap_slovenian.h   | 30 +++++++++++++++++-------------
 quantum/quantum_keycodes.h                 |  1 -
 5 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'quantum/keymap_extras')

diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index f2e4909d86..f9a5c39806 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -73,7 +73,6 @@ These allow you to combine a modifier with a keycode. When pressed, the keydown
 |`HYPR(kc)`|                      |Hold Left Control, Shift, Alt and GUI and press `kc`|
 |`MEH(kc)` |                      |Hold Left Control, Shift and Alt and press `kc`     |
 |`LCAG(kc)`|                      |Hold Left Control, Alt and GUI and press `kc`       |
-|`ALTG(kc)`|                      |Hold Right Control and Alt and press `kc`           |
 |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc`              |
 |`LCA(kc)` |                      |Hold Left Control and Alt and press `kc`            |
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 6676bb53c9..e5d35b2b4a 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -333,7 +333,6 @@ This is a reference only. Each group of keys links to the page documenting their
 |`HYPR(kc)`|                      |Hold Left Control, Shift, Alt and GUI and press `kc`|
 |`MEH(kc)` |                      |Hold Left Control, Shift and Alt and press `kc`     |
 |`LCAG(kc)`|                      |Hold Left Control, Alt and GUI and press `kc`       |
-|`ALTG(kc)`|                      |Hold Right Control and Alt and press `kc`           |
 |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc`              |
 |`LCA(kc)` |                      |Hold Left Control and Alt and press `kc`            |
 
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c
index 4d76f09b0a..57f9f0e7f9 100644
--- a/keyboards/planck/keymaps/pevecyan/keymap.c
+++ b/keyboards/planck/keymaps/pevecyan/keymap.c
@@ -20,6 +20,8 @@
 #include "muse.h"
 #include "keymap_slovenian.h"
 
+#define ALTG(kc) ALGR(kc) // FIXME: Remove this
+
 extern keymap_config_t keymap_config;
 
 enum planck_layers {
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index a9db17becd..f27123c2a2 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -17,8 +17,12 @@
 
 #ifndef KEYMAP_SLOVENIAN
 #define KEYMAP_SLOVENIAN
+
 #include "keymap.h"
 
+// Alt gr
+#define ALGR(kc) RALT(kc)
+#define SI_ALGR KC_RALT
 
 //Swapped Z and Y
 #define SI_Z KC_Y
@@ -90,18 +94,18 @@
 #define SI_UNDS LSFT(SI_MINS) // _
 
 // Alt Gr-ed characters
-#define SI_CIRC ALTG(KC_3) // ^
-#define SI_DEG ALTG(KC_5) // °
-#define SI_GRV ALTG(KC_7) // `
-#define SI_ACCU ALTG(KC_9) // ´
-#define SI_LCBR ALTG(KC_B) // {
-#define SI_RCBR ALTG(KC_N) // }
-#define SI_LBRC ALTG(KC_F) // [
-#define SI_RBRC ALTG(KC_G) // ]
-#define SI_BSLS ALTG(KC_Q) // backslash
-#define SI_AT  ALTG(KC_V) // @
-#define SI_EURO ALTG(KC_E) // €
-#define SI_TILD ALTG(KC_1) // ~
-#define SI_PIPE ALTG(KC_W) // |
+#define SI_CIRC ALGR(KC_3) // ^
+#define SI_DEG ALGR(KC_5) // °
+#define SI_GRV ALGR(KC_7) // `
+#define SI_ACCU ALGR(KC_9) // ´
+#define SI_LCBR ALGR(KC_B) // {
+#define SI_RCBR ALGR(KC_N) // }
+#define SI_LBRC ALGR(KC_F) // [
+#define SI_RBRC ALGR(KC_G) // ]
+#define SI_BSLS ALGR(KC_Q) // backslash
+#define SI_AT  ALGR(KC_V) // @
+#define SI_EURO ALGR(KC_E) // €
+#define SI_TILD ALGR(KC_1) // ~
+#define SI_PIPE ALGR(KC_W) // |
 
 #endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index e983798f2b..53fece21cc 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -475,7 +475,6 @@ enum quantum_keycodes {
 #define HYPR(kc) (QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI | (kc))
 #define MEH(kc)  (QK_LCTL | QK_LSFT | QK_LALT | (kc))
 #define LCAG(kc) (QK_LCTL | QK_LALT | QK_LGUI | (kc))
-#define ALTG(kc) (QK_RCTL | QK_RALT | (kc))
 #define SGUI(kc) (QK_LGUI | QK_LSFT | (kc))
 #define SCMD(kc) SGUI(kc)
 #define SWIN(kc) SGUI(kc)
-- 
cgit v1.2.3


From 538874f90f5ae69b241f80baa639fb6dbc4cfa80 Mon Sep 17 00:00:00 2001
From: Ismael Venegas Castelló
Date: Wed, 5 Dec 2018 10:12:35 -0600
Subject: Keymap: Hacker Dvorak (#4514)

* Hacker Dvorak

Programmer Dvorak based layout for the Ergodox EZ.

* Address drashna comments.

* Fix RGB and drop OSL for MO.

* Add gulp file to automate development.

* Fix gulpfile.

* Caps, num and scroll lock indicators.

* Fix scroll lock.
---
 .../ergodox_ez/keymaps/hacker_dvorak/.gitignore    |   2 +
 .../ergodox_ez/keymaps/hacker_dvorak/config.h      |  82 +++
 .../keymaps/hacker_dvorak/default.png.md           |   1 +
 .../keymaps/hacker_dvorak/default_highres.png.md   |   1 +
 .../ergodox_ez/keymaps/hacker_dvorak/gulpfile.js   |  13 +
 .../ergodox_ez/keymaps/hacker_dvorak/keymap.c      | 781 +++++++++++++++++++++
 .../ergodox_ez/keymaps/hacker_dvorak/package.json  |  15 +
 .../ergodox_ez/keymaps/hacker_dvorak/readme.md     |  62 ++
 .../ergodox_ez/keymaps/hacker_dvorak/rules.mk      |  35 +
 quantum/keymap_extras/keymap_plover_dvorak.h       |  47 ++
 10 files changed, 1039 insertions(+)
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/default.png.md
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/default_highres.png.md
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md
 create mode 100644 keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk
 create mode 100644 quantum/keymap_extras/keymap_plover_dvorak.h

(limited to 'quantum/keymap_extras')

diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore b/keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore
new file mode 100644
index 0000000000..504afef81f
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+package-lock.json
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
new file mode 100644
index 0000000000..c6b86004c5
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
@@ -0,0 +1,82 @@
+/*
+  Set any config.h overrides for your specific keymap here.
+  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
+*/
+#pragma once
+
+
+/* Keyboard Settings */
+#undef  TAPPING_TERM
+#define TAPPING_TERM 150
+
+#undef  DEBOUNCE
+#define DEBOUNCE 10
+
+#undef  IGNORE_MOD_TAP_INTERRUPT
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#undef  FORCE_NKRO
+#define FORCE_NKRO
+
+/* This isn't defined by default, so there is no need to undefine it first. */
+#define LEADER_TIMEOUT 500
+#define PERMISSIVE_HOLD
+#define QMK_KEYS_PER_SCAN 4
+
+
+// RGB Lights
+#undef  RGBLIGHT_HUE_STEP
+#define RGBLIGHT_HUE_STEP 24
+
+#undef  RGBLIGHT_SAT_STEP
+#define RGBLIGHT_SAT_STEP 24
+
+#undef  RGBLIGHT_VAL_STEP
+#define RGBLIGHT_VAL_STEP 24
+
+#undef  RGBLIGHT_BRI_STEP
+#define RGBLIGHT_BRI_STEP 24
+
+#undef  RGBLIGHT_LIMIT_VAL
+#define RGBLIGHT_LIMIT_VAL 255
+
+/* This isn't defined by default, so there is no need to undefine it first. */
+#define RGBLIGHT_SLEEP
+
+
+// Mouse
+#undef  MOUSEKEY_INTERVAL
+#define MOUSEKEY_INTERVAL 10
+
+#undef  MOUSEKEY_DELAY
+#define MOUSEKEY_DELAY 15
+
+#undef  MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 15
+
+#undef  MOUSEKEY_TIME_TO_MAX
+#define MOUSEKEY_TIME_TO_MAX 150
+
+#undef  MOUSEKEY_WHEEL_MAX_SPEED
+#define MOUSEKEY_WHEEL_MAX_SPEED 15
+
+#undef  MOUSEKEY_WHEEL_TIME_TO_MAX
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 150
+
+
+/* This is defined only if CONSOLE_ENABLE is set to "yes" */
+// #undef  NO_DEBUG
+// #define NO_DEBUG
+
+// #undef  NO_PRINT
+// #define NO_PRINT
+
+/* For COMBO only*/
+// #define COMBO_COUNT 1
+// #define COMBO_TERM 200
+
+/* For tap toggle */
+// #define TAPPING_TOGGLE 2
+// #define ONESHOT_TAP_TOGGLE 2
+// #define ONESHOT_TIMEOUT 300
+
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/default.png.md b/keyboards/ergodox_ez/keymaps/hacker_dvorak/default.png.md
new file mode 100644
index 0000000000..744e7d172a
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/default.png.md
@@ -0,0 +1 @@
+https://i.imgur.com/fKX0Zbs.png
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/default_highres.png.md b/keyboards/ergodox_ez/keymaps/hacker_dvorak/default_highres.png.md
new file mode 100644
index 0000000000..074e0634d2
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/default_highres.png.md
@@ -0,0 +1 @@
+https://i.imgur.com/giAc3M9.jpg
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js b/keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js
new file mode 100644
index 0000000000..338b0c6ba2
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js
@@ -0,0 +1,13 @@
+let gulp = require('gulp');
+let run = require('gulp-run-command').default;
+
+ 
+gulp.task('clean', run('rm -rf ../../../../.build'));
+
+gulp.task('build', ['clean'], run('make -C ../../../../ ergodox_ez:hacker_dvorak', {
+    ignoreErrors: true
+}));
+
+gulp.task('watch', ['build'], () => {
+    gulp.watch(['keymap.c', 'config.h', 'rules.mk'], ['build']);
+});
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c
new file mode 100644
index 0000000000..c42b551084
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c
@@ -0,0 +1,781 @@
+#include QMK_KEYBOARD_H
+#include "keymap_dvorak.h"
+#include "sendstring_dvorak.h"
+#include "keymap_plover.h"
+#include "keymap_plover_dvorak.h"
+
+
+#define SCTL(kc) LSFT(LCTL(kc))
+
+// Layers
+enum layers {
+    DVORAK_US = 0,
+    PLOVER_US,
+    GAMING_US,
+    ARROWS_US,
+    MOUSE_US,
+    NUMPAD_US,
+    LAYERS_US,
+    DVORAK_DV,
+    PLOVER_DV,
+    GAMING_DV,
+    ARROWS_DV,
+    MOUSE_DV,
+    NUMPAD_DV,
+    LAYERS_DV,
+    MEDIA_FN,
+    HYPER_FN,
+    MEH_FN,
+    MEH_FN_PLUS,
+    FIRMWARE
+};
+
+int CAPS_LOCK   = 0;
+int NUM_LOCK    = 0;
+int SCROLL_LOCK = 0;
+
+enum tap_dances {
+    TD_ESC_CAPS = 0
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_ESC_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CLCK)
+};
+
+
+enum custom_keycodes {
+    PLACEHOLDER = SAFE_RANGE, // can always be here
+    RGB_GREEN  // to set default RGB layer as green once
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ,--------------------------------------------------.    ,--------------------------------------------------.
+     * |    0   |   1  |   2  |   3  |   4  |   5  |  6   |    |  38  |  39  |  40  |  41  |  42  |  43  |   44   |
+     * |--------+------+------+------+------+------+------|    |------+------+------+------+------+------+--------|
+     * |    7   |   8  |   9  |  10  |  11  |  12  |  13  |    |  45  |  46  |  47  |  48  |  49  |  50  |   51   |
+     * |--------+------+------+------+------+------|      |    |      |------+------+------+------+------+--------|
+     * |   14   |  15  |  16  |  17  |  18  |  19  |------|    |------|  52  |  53  |  54  |  55  |  56  |   57   |
+     * |--------+------+------+------+------+------|  26  |    |  58  |------+------+------+------+------+--------|
+     * |   20   |  21  |  22  |  23  |  24  |  25  |      |    |      |  59  |  60  |  61  |  62  |  63  |   64   |
+     * `--------+------+------+------+------+-------------'    `-------------+------+------+------+------+--------'
+     *   |  27  |  28  |  29  |  30  |  31  |                                |  65  |  66  |  67  |  68  |  69  |
+     *   `----------------------------------'                                `----------------------------------'
+     *                                       ,-------------.  ,-------------.
+     *                                       |  32  |  33  |  |  70  |  71  |
+     *                                ,------+------+------|  |------+------+------.
+     *                                |      |      |  34  |  |  72  |      |      |
+     *                                |  35  |  36  |------|  |------|  74  |  75  |
+     *                                |      |      |  37  |  |  73  |      |      |
+     *                                `--------------------'  `--------------------'
+     */
+    [DVORAK_US] = LAYOUT_ergodox(
+        // left hand
+        KC_ESC,     KC_LABK,         KC_LCBR,         KC_LBRC,             KC_LPRN,             KC_EXLM, KC_AMPR,
+        KC_TAB,     KC_QUOT,         SCMD_T(KC_COMM), MEH_T(KC_DOT),       ALL_T(KC_P),         KC_Y,    KC_AT,
+        KC_EQL,     CTL_T(KC_A),     SFT_T(KC_O),     LT(NUMPAD_US, KC_E), LT(ARROWS_US, KC_U), KC_I,
+        KC_BSLS,    ALGR_T(KC_SCLN), ALT_T(KC_Q),     LT(MEDIA_FN, KC_J),  GUI_T(KC_K),         KC_X,    KC_PERC,
+        MO(MEH_FN), TG(LAYERS_US),   KC_CIRC,         KC_PLUS,             KC_COLN,
+
+        // left thumb
+                KC_LEFT, KC_RGHT,
+                         KC_HOME,
+        KC_SPC, KC_BSPC, KC_END,
+
+        // right hand
+        KC_PIPE, KC_QUES, KC_RPRN,            KC_RBRC,            KC_RCBR,      KC_RABK,       KC_ASTR,
+        KC_HASH, KC_F,    ALL_T(KC_G),        MEH_T(KC_C),        SCMD_T(KC_R), KC_L,          KC_SLSH,
+                 KC_D,    LT(MOUSE_US, KC_H), LT(HYPER_FN, KC_T), SFT_T(KC_N),  CTL_T(KC_S),   KC_MINS,
+        KC_DLR,  KC_B,    GUI_T(KC_M),        LT(MEDIA_FN, KC_W), ALT_T(KC_V),  ALGR_T(KC_Z),  KC_GRV,
+                          KC_DQUO,            KC_UNDS,            KC_TILD,      TG(DVORAK_DV), MO(MEH_FN_PLUS),
+
+        // right thumb
+        KC_UP,   KC_DOWN,
+        KC_PGUP,
+        KC_PGDN, KC_DEL,  KC_ENT
+    ),
+
+    [PLOVER_US] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX,    XXXXXXX,       KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_BTN3, GUI_T(KC_NO),
+        KC_ESC,     KC_MS_BTN4,    KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN5, PV_NUM,
+        KC_TAB,     PV_LS,         PV_LT,      PV_LP,      PV_LH,       PV_STAR,
+        KC_CLCK,    PV_LS,         PV_LK,      PV_LW,      PV_LR,       PV_STAR,    PV_STAR,
+        MO(MEH_FN), TG(LAYERS_US), PV_NUM,     PV_NUM,     PV_NUM,
+
+        // left thumb
+              KC_SPACE, KC_BSPACE,
+                        KC_HOME,
+        PV_A, PV_O,     KC_END,
+
+        // right hand
+        KC_MS_ACCEL2, KC_MS_ACCEL1,  KC_MS_ACCEL0, KC_UP,   KC_APPLICATION, XXXXXXX,        KC_MS_WH_UP,
+        PV_NUM,       KC_MS_WH_LEFT, KC_LEFT,      KC_DOWN, KC_RIGHT,       KC_MS_WH_RIGHT, KC_MS_WH_DOWN,
+                      PV_STAR,       PV_RF,        PV_RP,   PV_RL,          PV_RT,          PV_RD,
+        PV_STAR,      PV_STAR,       PV_RR,        PV_RB,   PV_RG,          PV_RS,          PV_RZ,
+                                     PV_NUM,       PV_NUM,  PV_NUM,         PV_NUM,         MO(MEH_FN_PLUS),
+
+        // right thumb
+        KC_DELETE, KC_ENTER,
+        KC_PGUP,
+        KC_PGDOWN, PV_E,     PV_U
+    ),
+
+    [GAMING_US] = LAYOUT_ergodox(
+        // left hand
+        KC_ESCAPE,            GUI_T(KC_MINS), KC_I,     KC_O,   KC_P,   ALGR_T(KC_EQL), KC_T,
+        KC_TAB,               KC_LALT,        KC_Q,     KC_W,   KC_E,   ALL_T(KC_R),    KC_G,
+        LT(MOUSE_US, KC_GRV), KC_LCTRL,       KC_A,     KC_S,   KC_D,   MEH_T(KC_F),
+        KC_BSLS,              KC_LSHIFT,      KC_Z,     KC_X,   KC_C,   SCMD_T(KC_V),   KC_M,
+        MO(MEH_FN),           TG(LAYERS_US),  KC_COMM, KC_DOT, KC_LBRC,
+
+        // left thumb
+                   MO(MEDIA_FN), KC_NLCK,
+                                 KC_SCLN,
+         KC_SPACE, KC_ENTER,     KC_BSPACE,
+
+        // right hand
+        KC_QUOT,       KC_Y,       KC_K,        KC_U,        KC_KP_7, KC_KP_8,  KC_KP_9,
+        KC_MS_WH_UP,   KC_H,       KC_J,        KC_L,        KC_KP_4, KC_KP_2,  KC_KP_6,
+                       KC_B,       KC_MS_UP,    KC_N,        KC_KP_1, KC_KP_5,  KC_KP_3,
+        KC_MS_WH_DOWN, KC_MS_LEFT, KC_MS_DOWN,  KC_MS_RIGHT, KC_UP,   KC_KP_0,  KC_SLASH,
+                                   KC_RBRC,     KC_LEFT,     KC_DOWN, KC_RIGHT, MO(MEH_FN_PLUS),
+
+        // right thumb
+        KC_MS_BTN5, MO(HYPER_FN),
+        KC_MS_BTN4,
+        KC_MS_BTN3, KC_MS_BTN2,   KC_MS_BTN1
+    ),
+
+    [ARROWS_US] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,    XXXXXXX, XXXXXXX,
+        XXXXXXX, SCMD_T(KC_NO), MEH_T(KC_NO), ALL_T(KC_NO), XXXXXXX,    XXXXXXX, XXXXXXX,
+        XXXXXXX, KC_LCTRL,      KC_LSHIFT,    XXXXXXX,      _______,    XXXXXXX,
+        XXXXXXX, KC_RALT,       KC_LALT,      GUI_T(KC_NO), XXXXXXX,    XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,
+
+        // left thumb
+                  XXXXXXX,   XXXXXXX,
+                             KC_HOME,
+        KC_SPACE, KC_BSPACE, KC_END,
+
+        // right hand
+        LGUI(KC_X), XXXXXXX,       LCTL(KC_X), KC_MS_WH_UP,   XXXXXXX,       XXXXXXX,        XXXXXXX,
+        LGUI(KC_C), XXXXXXX,       LCTL(KC_C), KC_UP,         SCTL(KC_C),    LCTL(KC_Z),     LGUI(KC_Z),
+                    KC_MS_WH_LEFT, KC_LEFT,    KC_DOWN,       KC_RIGHT,      KC_MS_WH_RIGHT, KC_APPLICATION,
+        LGUI(KC_V), XXXXXXX,       LCTL(KC_V), KC_MS_WH_DOWN, SCTL(KC_V),    LCTL(KC_Y),     SGUI(KC_Z),
+        XXXXXXX,    XXXXXXX,       XXXXXXX,    XXXXXXX,       KC_SLCK,
+
+        // right thumb
+        XXXXXXX,   XXXXXXX,
+        KC_PGUP,
+        KC_PGDOWN, KC_DELETE, KC_ENTER
+    ),
+
+    [MOUSE_US] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX,       XXXXXXX,       XXXXXXX,    KC_MS_WH_UP,   LCTL(KC_X),  XXXXXXX,        LGUI(KC_X),
+        LGUI(KC_Z),    LCTL(KC_Z),    SCTL(KC_C), KC_MS_UP,      LCTL(KC_C),  KC_MS_BTN4,     LGUI(KC_C),
+        KC_MS_BTN3,    KC_MS_WH_LEFT, KC_MS_LEFT, KC_MS_DOWN,    KC_MS_RIGHT, KC_MS_WH_RIGHT,
+        LGUI(KC_Z),    LCTL(KC_Y),    SCTL(KC_V), KC_MS_WH_DOWN, LCTL(KC_V),  KC_MS_BTN5,     LGUI(KC_V),
+        KC_SLCK, XXXXXXX,       XXXXXXX,    XXXXXXX,       XXXXXXX,
+
+        // left thumb
+                    XXXXXXX,    XXXXXXX,
+                                XXXXXXX,
+        KC_MS_BTN1, KC_MS_BTN2, XXXXXXX,
+
+        // right hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, ALL_T(KC_NO), MEH_T(KC_NO), SCMD_T(KC_NO), XXXXXXX,
+                 XXXXXXX, _______, KC_MS_ACCEL1, KC_LSHIFT,    KC_LCTRL,      KC_MS_ACCEL2,
+        XXXXXXX, XXXXXXX, XXXXXXX, GUI_T(KC_NO), KC_LALT,      KC_RALT,       XXXXXXX,
+                          XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, KC_MS_ACCEL0
+    ),
+
+    [NUMPAD_US] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX,  GUI_T(KC_NO), XXXXXXX, ALL_T(KC_NO),  XXXXXXX, XXXXXXX,
+        _______, KC_LCTRL, KC_LSHIFT,    _______, MEH_T(KC_NO),  XXXXXXX,
+        XXXXXXX, KC_RALT,  KC_LALT,      XXXXXXX, SCMD_T(KC_NO), XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,
+
+        // left thumb
+                  XXXXXXX,   XXXXXXX,
+                             KC_HOME,
+        KC_SPACE, KC_BSPACE, KC_END,
+
+        // right hand
+        KC_X, KC_A, KC_B,   KC_C, KC_D,     KC_E,    KC_F,
+        KC_O, KC_I, KC_1,   KC_2, KC_3,     KC_SLSH, KC_PERC,
+              KC_M, KC_4,   KC_5, KC_6,     KC_PLUS, KC_MINS,
+        KC_L, KC_J, KC_7,   KC_8, KC_9,     KC_ASTR, KC_CIRC,
+                    KC_DOT, KC_0, KC_COMM, KC_UNDS,  KC_BSLS,
+
+        // right thumb
+        XXXXXXX,   XXXXXXX,
+        KC_PGUP,
+        KC_PGDOWN, KC_DELETE, KC_ENTER
+    ),
+
+    [LAYERS_US] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // left thumb
+                 XXXXXXX, XXXXXXX,
+                          XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right hand
+        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+                 XXXXXXX, TO(DVORAK_US), TO(PLOVER_US), TO(GAMING_US), XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+                          XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+
+    [DVORAK_DV] = LAYOUT_ergodox(
+        // left hand
+        KC_ESC,     DV_LABK,         DV_LCBR,         DV_LBRC,             DV_LPRN,             DV_EXLM, DV_AMPR,
+        KC_TAB,     DV_QUOT,         SCMD_T(DV_COMM), MEH_T(DV_DOT),       ALL_T(DV_P),         DV_Y,    DV_AT,
+        DV_EQL,     CTL_T(DV_A),     SFT_T(DV_O),     LT(NUMPAD_DV, DV_E), LT(ARROWS_DV, DV_U), DV_I,
+        DV_BSLS,    ALGR_T(DV_SCLN), ALT_T(DV_Q),     LT(MEDIA_FN, DV_J),  GUI_T(DV_K),         DV_X,    DV_PERC,
+        MO(MEH_FN), TG(LAYERS_DV),   DV_CIRC,         DV_PLUS,             DV_COLN,
+
+        // left thumb
+                KC_LEFT, KC_RGHT,
+                         KC_HOME,
+        KC_SPC, KC_BSPC, KC_END,
+
+        // right hand
+        DV_PIPE, DV_QUES, DV_RPRN,            DV_RBRC,            DV_RCBR,      DV_RABK,      DV_ASTR,
+        DV_HASH, DV_F,    ALL_T(DV_G),        MEH_T(DV_C),        SCMD_T(DV_R), DV_L,         DV_SLSH,
+                 DV_D,    LT(MOUSE_DV, DV_H), LT(HYPER_FN, DV_T), SFT_T(DV_N),  CTL_T(DV_S),  DV_MINS,
+        DV_DLR,  DV_B,    GUI_T(DV_M),        LT(MEDIA_FN, DV_W), ALT_T(DV_V),  ALGR_T(DV_Z), DV_GRV,
+                          DV_DQUO,            DV_UNDS,            DV_TILD,      _______,      MO(MEH_FN_PLUS),
+
+        // right thumb
+        KC_UP,   KC_DOWN,
+        KC_PGUP,
+        KC_PGDN, KC_DEL,  KC_ENT
+    ),
+
+    [PLOVER_DV] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX,    XXXXXXX,       KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_BTN3, GUI_T(KC_NO),
+        KC_ESC,     KC_MS_BTN4,    KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN5, PD_NUM,
+        KC_TAB,     PD_LS,         PD_LT,      PD_LP,      PD_LH,       PD_STAR,
+        KC_CLCK,    PD_LS,         PD_LK,      PD_LW,      PD_LR,       PD_STAR,    PD_STAR,
+        MO(MEH_FN), TG(LAYERS_DV), PD_NUM,     PD_NUM,     PD_NUM,
+
+        // left thumb
+              KC_SPACE, KC_BSPACE,
+                        KC_HOME,
+        PD_A, PD_O,     KC_END,
+
+        // right hand
+        KC_MS_ACCEL2, KC_MS_ACCEL1,  KC_MS_ACCEL0, KC_UP,   KC_APPLICATION, XXXXXXX,        KC_MS_WH_UP,
+        PD_NUM,       KC_MS_WH_LEFT, KC_LEFT,      KC_DOWN, KC_RIGHT,       KC_MS_WH_RIGHT, KC_MS_WH_DOWN,
+                      PD_STAR,       PD_RF,        PD_RP,   PD_RL,          PD_RT,          PD_RD,
+        PD_STAR,      PD_STAR,       PD_RR,        PD_RB,   PD_RG,          PD_RS,          PD_RZ,
+                                     PD_NUM,       PD_NUM,  PD_NUM,         PD_NUM,         MO(MEH_FN_PLUS),
+
+        // right thumb
+        KC_DELETE, KC_ENTER,
+        KC_PGUP,
+        KC_PGDOWN, PD_E,     PD_U
+    ),
+
+    [GAMING_DV] = LAYOUT_ergodox(
+        // left hand
+        KC_ESCAPE,            GUI_T(DV_MINS), DV_I,    DV_O,   DV_P,    ALGR_T(DV_EQL), DV_T,
+        KC_TAB,               KC_LALT,        DV_Q,    DV_W,   DV_E,    ALL_T(DV_R),    DV_G,
+        LT(MOUSE_DV, DV_GRV), KC_LCTRL,       DV_A,    DV_S,   DV_D,    MEH_T(DV_F),
+        DV_BSLS,              KC_LSHIFT,      DV_Z,    DV_X,   DV_C,    SCMD_T(DV_V),   DV_M,
+        MO(MEH_FN),           TG(LAYERS_DV),  DV_COMM, DV_DOT, DV_LBRC,
+
+        // left thumb
+                   MO(MEDIA_FN), KC_NLCK,
+                                 DV_SCLN,
+         KC_SPACE, KC_ENTER,     KC_BSPACE,
+
+        // right hand
+        DV_QUOT,       DV_Y,       DV_K,       DV_U,        KC_KP_7, KC_KP_8,  KC_KP_9,
+        KC_MS_WH_UP,   DV_H,       DV_J,       DV_L,        KC_KP_4, KC_KP_2,  KC_KP_6,
+                       DV_B,       KC_MS_UP,   DV_N,        KC_KP_1, KC_KP_5,  KC_KP_3,
+        KC_MS_WH_DOWN, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_UP,   KC_KP_0,  DV_SLSH,
+                                   DV_RBRC,    KC_LEFT,     KC_DOWN, KC_RIGHT, MO(MEH_FN_PLUS),
+
+        // right thumb
+        KC_MS_BTN5, MO(HYPER_FN),
+        KC_MS_BTN4,
+        KC_MS_BTN3, KC_MS_BTN2,   KC_MS_BTN1
+    ),
+
+    [ARROWS_DV] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, SCMD_T(KC_NO), MEH_T(KC_NO), ALL_T(KC_NO), XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, KC_LCTRL,      KC_LSHIFT,    XXXXXXX,      _______, XXXXXXX,
+        XXXXXXX, KC_RALT,       KC_LALT,      GUI_T(KC_NO), XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,
+
+        // left thumb
+                  XXXXXXX,   XXXXXXX,
+                             KC_HOME,
+        KC_SPACE, KC_BSPACE, KC_END,
+
+        // right hand
+        LGUI(DV_X), XXXXXXX,       LCTL(DV_X), KC_MS_WH_UP,   XXXXXXX,       XXXXXXX,        XXXXXXX,
+        LGUI(DV_C), XXXXXXX,       LCTL(DV_C), KC_UP,         SCTL(DV_C),    LCTL(DV_Z),     LGUI(DV_Z),
+                    KC_MS_WH_LEFT, KC_LEFT,    KC_DOWN,       KC_RIGHT,      KC_MS_WH_RIGHT, KC_APPLICATION,
+        LGUI(DV_V), XXXXXXX,       LCTL(DV_V), KC_MS_WH_DOWN, SCTL(DV_V),    LCTL(DV_Y),     SGUI(DV_Z),
+        XXXXXXX,    XXXXXXX,       XXXXXXX,    XXXXXXX,       KC_SLCK,
+
+        // right thumb
+        XXXXXXX,   XXXXXXX,
+        KC_PGUP,
+        KC_PGDOWN, KC_DELETE, KC_ENTER
+    ),
+
+    [MOUSE_DV] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX,       XXXXXXX,       XXXXXXX,    KC_MS_WH_UP,   LCTL(DV_X),  XXXXXXX,        LGUI(DV_X),
+        LGUI(DV_Z),    LCTL(DV_Z),    SCTL(DV_C), KC_MS_UP,      LCTL(DV_C),  KC_MS_BTN4,     LGUI(DV_C),
+        KC_MS_BTN3,    KC_MS_WH_LEFT, KC_MS_LEFT, KC_MS_DOWN,    KC_MS_RIGHT, KC_MS_WH_RIGHT,
+        LGUI(DV_Z),    LCTL(DV_Y),    SCTL(DV_V), KC_MS_WH_DOWN, LCTL(DV_V),  KC_MS_BTN5,     LGUI(DV_V),
+        KC_SLCK, XXXXXXX,       XXXXXXX,    XXXXXXX,       XXXXXXX,
+
+        // left thumb
+                    XXXXXXX,    XXXXXXX,
+                                XXXXXXX,
+        KC_MS_BTN1, KC_MS_BTN2, XXXXXXX,
+
+        // right hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, ALL_T(KC_NO), MEH_T(KC_NO), SCMD_T(KC_NO), XXXXXXX,
+                 XXXXXXX, _______, KC_MS_ACCEL1, KC_LSHIFT,    KC_LCTRL,      KC_MS_ACCEL2,
+        XXXXXXX, XXXXXXX, XXXXXXX, GUI_T(KC_NO), KC_LALT,      KC_RALT,       XXXXXXX,
+                          XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, KC_MS_ACCEL0
+    ),
+
+    [NUMPAD_DV] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX,  GUI_T(KC_NO), XXXXXXX, ALL_T(KC_NO),  XXXXXXX, XXXXXXX,
+        _______, KC_LCTRL, KC_LSHIFT,    _______, MEH_T(KC_NO),  XXXXXXX,
+        XXXXXXX, KC_RALT,  KC_LALT,      XXXXXXX, SCMD_T(KC_NO), XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,
+
+        // left thumb
+                  XXXXXXX,   XXXXXXX,
+                             KC_HOME,
+        KC_SPACE, KC_BSPACE, KC_END,
+
+        // right hand
+        DV_X, DV_A, DV_B,   DV_C, DV_D,    DV_E,    DV_F,
+        DV_O, DV_I, DV_1,   DV_2, DV_3,    DV_SLSH, DV_PERC,
+              DV_M, DV_4,   DV_5, DV_6,    DV_PLUS, DV_MINS,
+        DV_L, DV_J, DV_7,   DV_8, DV_9,    DV_ASTR, DV_CIRC,
+                    DV_DOT, DV_0, DV_COMM, DV_UNDS, DV_BSLS,
+
+        // right thumb
+        XXXXXXX,   XXXXXXX,
+        KC_PGUP,
+        KC_PGDOWN, KC_DELETE, KC_ENTER
+    ),
+
+    [LAYERS_DV] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // left thumb
+                 XXXXXXX, XXXXXXX,
+                          XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right hand
+        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+                 XXXXXXX, TO(DVORAK_DV), TO(PLOVER_DV), TO(GAMING_DV), XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+                          XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+
+    [MEDIA_FN] = LAYOUT_ergodox(
+        // left hand
+        KC_AUDIO_VOL_DOWN,   KC_AUDIO_MUTE, RGB_TOG,    XXXXXXX, KC_MAIL,      KC_FIND, KC_WWW_REFRESH,
+        KC_MEDIA_PREV_TRACK, KC_F9,         KC_F7,      KC_F5,   KC_F3,        KC_F1,   KC_WWW_HOME,
+        KC_PAUSE,            KC_F19,        KC_F17,     KC_F15,  KC_F13,       KC_F11,
+        RGB_HUD,             XXXXXXX,       XXXXXXX,    _______, KC_F23,       KC_F21,  KC_WWW_BACK,
+        RGB_VAD,             KC_CLCK,       KC_PSCREEN, XXXXXXX, MO(FIRMWARE),
+
+        // left thumb
+                 _______, XXXXXXX,
+                          XXXXXXX,
+        XXXXXXX, XXXXXXX, KC_MEDIA_EJECT,
+
+        // right hand
+        KC_WWW_FAVORITES, KC_MY_COMPUTER, KC_CALCULATOR,   XXXXXXX, RGB_MOD,         RGB_M_P,        KC_AUDIO_VOL_UP,
+        KC_WWW_SEARCH,    KC_F2,          KC_F4,           KC_F6,   KC_F8,           KC_F10,         KC_MEDIA_NEXT_TRACK,
+                          KC_F12,         KC_F14,          KC_F16,  KC_F18,          KC_F20,         KC_MEDIA_PLAY_PAUSE,
+        KC_WWW_FORWARD,   KC_F22,         KC_F24,          _______, XXXXXXX,         XXXXXXX,        RGB_HUI,
+                                          KC_SYSTEM_POWER, XXXXXXX, KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, RGB_VAI,
+
+        // right thumb
+        XXXXXXX,   XXXXXXX,
+        XXXXXXX,
+        RGB_GREEN, XXXXXXX, XXXXXXX
+    ),
+
+    [HYPER_FN] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, HYPR(KC_F1),  HYPR(KC_F2),  HYPR(KC_F3),  HYPR(KC_F4),  HYPR(KC_F5),  XXXXXXX,
+        XXXXXXX, HYPR(KC_F6),  HYPR(KC_F7),  HYPR(KC_F8),  HYPR(KC_F9),  HYPR(KC_F10), XXXXXXX,
+        XXXXXXX, HYPR(KC_F11), HYPR(KC_F12), HYPR(KC_F13), HYPR(KC_F14), HYPR(KC_F15),
+        XXXXXXX, HYPR(KC_F16), HYPR(KC_F17), HYPR(KC_F18), HYPR(KC_F19), HYPR(KC_F20), XXXXXXX,
+        XXXXXXX, HYPR(KC_F21), HYPR(KC_F22), HYPR(KC_F23), HYPR(KC_F24),
+
+        // left thumb
+                 XXXXXXX, XXXXXXX,
+                          XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                 XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right thumb
+        XXXXXXX, _______,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+
+    [MEH_FN] = LAYOUT_ergodox(
+        // left hand
+        LCA(KC_F11),  LCA(KC_F9),  LCA(KC_F7),  LCA(KC_F5),  LCA(KC_F3),  LCA(KC_F1),  XXXXXXX,
+        LCAG(KC_F11), LCAG(KC_F9), LCAG(KC_F7), LCAG(KC_F5), LCAG(KC_F3), LCAG(KC_F1), XXXXXXX,
+        MEH(KC_F11),  MEH(KC_F9),  MEH(KC_F7),  MEH(KC_F5),  MEH(KC_F3),  MEH(KC_F1),
+        SGUI(KC_F11), SGUI(KC_F9), SGUI(KC_F7), SGUI(KC_F5), SGUI(KC_F3), SGUI(KC_F1), XXXXXXX,
+        _______,      XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,
+
+        // left thumb
+                 XXXXXXX, XXXXXXX,
+                          XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right hand
+        XXXXXXX, LCA(KC_F2),  LCA(KC_F4),  LCA(KC_F6),  LCA(KC_F8),  LCA(KC_F10),  LCA(KC_F12),
+        XXXXXXX, LCAG(KC_F2), LCAG(KC_F4), LCAG(KC_F6), LCAG(KC_F8), LCAG(KC_F10), LCAG(KC_F12),
+                 MEH(KC_F2),  MEH(KC_F4),  MEH(KC_F6),  MEH(KC_F8),  MEH(KC_F10),  MEH(KC_F12),
+        XXXXXXX, SGUI(KC_F2), SGUI(KC_F4), SGUI(KC_F6), SGUI(KC_F8), SGUI(KC_F10), SGUI(KC_F12),
+                              XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,      XXXXXXX,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+
+    [MEH_FN_PLUS] = LAYOUT_ergodox(
+        // left hand
+        LCA(KC_F23),  LCA(KC_F21),  LCA(KC_F19),  LCA(KC_F17),  LCA(KC_F15),  LCA(KC_F13),  XXXXXXX,
+        LCAG(KC_F23), LCAG(KC_F21), LCAG(KC_F19), LCAG(KC_F17), LCAG(KC_F15), LCAG(KC_F13), XXXXXXX,
+        MEH(KC_F23),  MEH(KC_F21),  MEH(KC_F19),  MEH(KC_F17),  MEH(KC_F15),  MEH(KC_F13),
+        SGUI(KC_F23), SGUI(KC_F21), SGUI(KC_F19), SGUI(KC_F17), SGUI(KC_F15), SGUI(KC_F13), XXXXXXX,
+        XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+
+        // left thumb
+                 XXXXXXX, XXXXXXX,
+                          XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right hand
+        XXXXXXX, LCA(KC_F14),  LCA(KC_F16),  LCA(KC_F18),  LCA(KC_F20),  LCA(KC_F22),  LCA(KC_F24),
+        XXXXXXX, LCAG(KC_F14), LCAG(KC_F16), LCAG(KC_F18), LCAG(KC_F20), LCAG(KC_F22), LCAG(KC_F24),
+                 MEH(KC_F14),  MEH(KC_F16),  MEH(KC_F18),  MEH(KC_F20),  MEH(KC_F22),  MEH(KC_F24),
+        XXXXXXX, SGUI(KC_F14), SGUI(KC_F16), SGUI(KC_F18), SGUI(KC_F20), SGUI(KC_F22), SGUI(KC_F24),
+                               XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      _______,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+
+    [FIRMWARE] = LAYOUT_ergodox(
+        // left hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+
+        // left thumb
+               XXXXXXX, XXXXXXX,
+                        XXXXXXX,
+        RESET, XXXXXXX, XXXXXXX,
+
+        // right hand
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+        // right thumb
+        XXXXXXX, XXXXXXX,
+        XXXXXXX,
+        XXXXXXX, XXXXXXX, EEP_RST
+    )
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_GREEN:
+            if (record->event.pressed) {
+                #ifdef RGBLIGHT_ENABLE
+                    rgblight_enable();
+                    rgblight_mode(1);
+                    rgblight_sethsv_red();
+                #endif
+            }
+
+            return false;
+
+        case KC_CLCK:
+            if (record->event.pressed) {
+                if (!(CAPS_LOCK)) {
+                    ergodox_right_led_1_on();
+                    CAPS_LOCK = 1;
+                } else {
+                    ergodox_right_led_1_off();
+                    CAPS_LOCK = 0;
+                }
+            }
+
+            return true;
+
+        case KC_NLCK:
+            if (record->event.pressed) {
+                if (!(NUM_LOCK)) {
+                    ergodox_right_led_2_on();
+                    NUM_LOCK = 1;
+                } else {
+                    ergodox_right_led_2_off();
+                    NUM_LOCK = 0;
+                }
+            }
+
+            return true;
+
+        case KC_SLCK:
+            if (record->event.pressed) {
+                if (!(SCROLL_LOCK)) {
+                    ergodox_right_led_3_on();
+                    SCROLL_LOCK = 1;
+                } else {
+                    ergodox_right_led_3_off();
+                    SCROLL_LOCK = 0;
+                }
+            }
+
+        case KC_MS_WH_LEFT:
+            if (record->event.pressed) {
+                if (SCROLL_LOCK) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+
+        case KC_MS_WH_UP:
+            if (record->event.pressed) {
+                if (SCROLL_LOCK) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+
+        case KC_MS_WH_DOWN:
+            if (record->event.pressed) {
+                if (SCROLL_LOCK) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+
+        case KC_MS_WH_RIGHT:
+            if (record->event.pressed) {
+                if (SCROLL_LOCK) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+
+        default:
+            return true;
+    }
+}
+
+uint32_t layer_state_set_user(uint32_t state) {
+    uint8_t layer = biton32(state);
+
+    switch (layer) {
+        case DVORAK_US:
+            rgblight_sethsv_noeeprom_red();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+
+            break;
+
+        case PLOVER_US:
+            rgblight_sethsv_noeeprom_red();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+
+            break;
+
+        case GAMING_US:
+            rgblight_sethsv_noeeprom_red();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+
+            break;
+
+        case ARROWS_US:
+            rgblight_sethsv_noeeprom_blue();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case MOUSE_US:
+            rgblight_sethsv_noeeprom_blue();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case NUMPAD_US:
+            rgblight_sethsv_noeeprom_blue();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case LAYERS_US:
+            rgblight_sethsv_noeeprom_cyan();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case DVORAK_DV:
+            rgblight_sethsv_noeeprom_green();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+            break;
+
+        case PLOVER_DV:
+            rgblight_sethsv_noeeprom_green();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+
+            break;
+
+        case GAMING_DV:
+            rgblight_sethsv_noeeprom_green();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+
+            break;
+
+        case ARROWS_DV:
+            rgblight_sethsv_noeeprom_blue();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case MOUSE_DV:
+            rgblight_sethsv_noeeprom_blue();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case NUMPAD_DV:
+            rgblight_sethsv_noeeprom_blue();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case LAYERS_DV:
+            rgblight_sethsv_noeeprom_cyan();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case MEDIA_FN:
+            rgblight_sethsv_noeeprom_yellow();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case HYPER_FN:
+            rgblight_sethsv_noeeprom_magenta();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        case MEH_FN:
+            rgblight_sethsv_noeeprom_magenta();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 4);
+
+            break;
+
+        case MEH_FN_PLUS:
+            rgblight_sethsv_noeeprom_magenta();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 5);
+
+            break;
+
+        case FIRMWARE:
+            rgblight_sethsv_noeeprom_pink();
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+
+            break;
+
+        default:
+            break;
+    }
+
+    return state;
+};
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json b/keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json
new file mode 100644
index 0000000000..116911e46b
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "hacker_dvorak",
+  "version": "1.0.0",
+  "description": "Inspired by the [*Programmer Dvorak*](https://www.kaufmann.no/roland/dvorak) keyboard layout, cherry picked ideas from other layouts in the [EZ Repository](https://configure.ergodox-ez.com/search?q=dvorak&legacy=true), a character distribution [heatmap vizualizer](https://run.plnkr.co/plunks/5EEO8nJ2wRzYAfT3), my own subjective use cases and lots of trial and error.",
+  "main": "gulpfile.js",
+  "scripts": {
+    "test": "test"
+  },
+  "author": "SalchiPapa",
+  "license": "GPL-2.0",
+  "dependencies": {
+    "gulp": "^3.9.1",
+    "gulp-run-command": "0.0.9"
+  }
+}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md b/keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md
new file mode 100644
index 0000000000..c7df0d7483
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md
@@ -0,0 +1,62 @@
+# [Ergodox EZ Hacker Dvorak Layout](https://configure.ergodox-ez.com/layouts/Wadz/latest/0)
+
+Inspired by the [*Programmer Dvorak*](https://www.kaufmann.no/roland/dvorak) keyboard layout, cherry picked ideas from other layouts in the [EZ Repository](https://configure.ergodox-ez.com/search?q=dvorak&legacy=true), a character distribution [heatmap vizualizer](https://run.plnkr.co/plunks/5EEO8nJ2wRzYAfT3), my own subjective use cases and lots of trial and error.
+
+## Setup
+
+Configure your OS keyboard layout to US, or the keymap will be incorrect.
+
+## Limitations
+
+I plan to use [QMK](https://docs.qmk.fm) in the future, in order to overcome some limitations of the Ergodox EZ [graphical configurator](https://configure.ergodox-ez.com/layouts/default/latest/0)), however I will defer that, until more progress is made to the new [configurator](https://medium.com/the-ergo/the-configurator-is-out-of-beta-e107aec80cae).
+
+## Layers
+
+1. Dvorak
+  * US Dvorak layout.
+  * All symbols (including shifted symbols).
+  * All modifier are dual keys positioned near the home row.
+2. Querty
+  * Used to overcome the limitation pointed above, when your OS layout is set to Dvorak instead of US, this way you can use 
+    Standard Dvorak (available by default on all the main operating systems) on other normal keybdoards and Hacker Dvorak on 
+    the Ergodox EZ Shine at the same time, without changing back and forth tho OS layout.
+3. Gaming
+  * Still in development.
+  * Left side is mainly "normal" Qwerty.
+  * Right side is mainly for movement, either using the mouse, the arrow keys, the number pad or the `H`, `J`, `K`, `L` as       direction keys.
+4. Arrows
+  * Arrow keys navigation.
+  * All modifier keys.
+  * Common text edititng shortcuts (doesn't work for MacOS).
+5. Mouse
+  * Mouse navigation.
+  * All modifier keys.
+  * Common text edititng shortcuts (doesn't work for MacOS).
+6. Numpad
+  * ATM style numpad.
+  * All modifier keys.
+  * Letters from `A` to `F` for hexadecimal numbers (`B` is also used for binary numeric literals in most programming 
+    languages, ie. `0b11001`).
+  * `X` for hexadecimal numeric literals in most programming languages, ie. `0xbeef`.
+  * `O` for octal numeric literals in most programming languages, ie `0o123`.
+  * `J` for complex numeric literals in Python, ie. `3j`.
+  * `I` and `M` for complex Julia numeric literals, ie. `3im`.
+  * Common symbols for mathematical operations.
+7. Hyper Fn
+  * Useful for custom global shortcuts.
+8. Media Fn
+  * Media keys.
+  * Function keys.
+  * EZ Shine keys.
+9. Meh Fn
+  * Useful for custom application shortcuts.
+10. Meh Fn +
+  * Useful for custom standard shortcuts.
+  
+## To Do
+
+Add images.
+
+***
+
+Please comment below if you have any ideas or suggestions. If you have used this layout or used it as a base, I'd love to hear about your experience!
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk b/keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk
new file mode 100644
index 0000000000..4aa2f262b7
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk
@@ -0,0 +1,35 @@
+# Set any rules.mk overrides for your specific keymap here.
+# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
+NKRO_ENABLE       = yes  # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+TAP_DANCE_ENABLE  = yes
+MOUSEKEY_ENABLE   = yes  # Mouse keys(+4700b).
+EXTRAKEY_ENABLE   = yes  # Audio control and System control(+450b).
+SLEEP_LED_ENABLE  = yes  # Turn off leds when computer is sleeping.
+KEY_LOCK_ENABLE   = yes  # (+1730b)
+RGBLIGHT_ENABLE   = yes
+LEADER_ENABLE     = yes
+
+
+UNICODE_ENABLE    = no  # For Unicode.
+COMMAND_ENABLE    = no  # Commands for debug and configuration
+SWAP_HANDS_ENABLE = no  # Allow swapping hands of keyboard.
+
+
+# This are by default off:
+# CONSOLE_ENABLE    = no  # Console for debug(+400)
+# BOOTMAGIC_ENABLE  = no  # Virtual DIP switch configuration(+1000)
+# API_SYSEX_ENABLE  = no
+# MIDI_ENABLE       = no
+# UNICODEMAP_ENABLE = no
+# BLUETOOTH_ENABLE  = no
+# AUDIO_ENABLE      = no
+# FAUXCLICKY_ENABLE = no
+# VARIABLE_TRACE    = no
+# BACKLIGHT_ENABLE  = no
+# RGB_MATRIX_ENABLE = no
+# COMBO_ENABLE      = no
+
+
+# This don't need argument:
+# CUSTOM_MATRIX    # Custom matrix file for the ErgoDox EZ
+# SPLIT_KEYBOARD
diff --git a/quantum/keymap_extras/keymap_plover_dvorak.h b/quantum/keymap_extras/keymap_plover_dvorak.h
new file mode 100644
index 0000000000..83bb1e8b87
--- /dev/null
+++ b/quantum/keymap_extras/keymap_plover_dvorak.h
@@ -0,0 +1,47 @@
+/* Copyright 2016 James Kay
+ *
+ * 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/>.
+ */
+#ifndef KEYMAP_PLOVER_DVORAK_H
+#define KEYMAP_PLOVER_DVORAK_H
+
+#include "keymap_dvorak.h"
+
+#define PD_NUM  DV_1
+#define PD_LS   DV_Q
+#define PD_LT   DV_W
+#define PD_LP   DV_E
+#define PD_LH   DV_R
+#define PD_LK   DV_S
+#define PD_LW   DV_D
+#define PD_LR   DV_F
+
+#define PD_STAR DV_Y
+#define PD_RF   DV_U
+#define PD_RP   DV_I
+#define PD_RL   DV_O
+#define PD_RT   DV_P
+#define PD_RD   DV_LBRC
+#define PD_RR   DV_J
+#define PD_RB   DV_K
+#define PD_RG   DV_L
+#define PD_RS   DV_SCLN
+#define PD_RZ   DV_QUOT
+
+#define PD_A    DV_C
+#define PD_O    DV_V
+#define PD_E    DV_N
+#define PD_U    DV_M
+
+#endif
-- 
cgit v1.2.3


From 28fbf84cc5ff52f545011ea4198a6cc6d054f896 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević
Date: Wed, 12 Dec 2018 19:17:19 +0100
Subject: Add standard definitions for ALGR and KC_ALGR (#4389)

* Add standard ALGR defition, remove (re)definitions from language files

* Use ALGR(kc) consistently in ALTGR(kc) aliases

* Non-Nordic keymaps should not use NO_ALGR

* Add standard KC_ALGR definition

* Update docs with ALGR and KC_ALGR

* Update SS_ALGR and ALGR_T aliases
---
 docs/feature_advanced_keycodes.md                    | 4 ++--
 docs/keycodes.md                                     | 4 ++--
 docs/keycodes_basic.md                               | 2 +-
 keyboards/handwired/reddot/keymaps/default/keymap.c  | 4 ++--
 keyboards/xd75/keymaps/germanized/config.h           | 1 -
 quantum/keymap_extras/keymap_belgian.h               | 5 +----
 quantum/keymap_extras/keymap_bepo.h                  | 5 +----
 quantum/keymap_extras/keymap_canadian_multilingual.h | 5 +----
 quantum/keymap_extras/keymap_fr_ch.h                 | 1 -
 quantum/keymap_extras/keymap_french.h                | 5 +----
 quantum/keymap_extras/keymap_german.h                | 1 -
 quantum/keymap_extras/keymap_german_ch.h             | 1 -
 quantum/keymap_extras/keymap_hungarian.h             | 1 -
 quantum/keymap_extras/keymap_italian.h               | 1 -
 quantum/keymap_extras/keymap_nordic.h                | 1 -
 quantum/keymap_extras/keymap_slovenian.h             | 1 -
 quantum/keymap_extras/keymap_spanish.h               | 3 +--
 quantum/keymap_extras/keymap_uk.h                    | 3 +--
 quantum/quantum.h                                    | 1 +
 quantum/quantum_keycodes.h                           | 5 +++--
 tmk_core/common/keycode.h                            | 1 +
 21 files changed, 18 insertions(+), 37 deletions(-)

(limited to 'quantum/keymap_extras')

diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index bb5cb7419b..e5f241f7f1 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -68,7 +68,7 @@ These allow you to combine a modifier with a keycode. When pressed, the keydown
 |`LGUI(kc)`|`LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc`                        |
 |`RCTL(kc)`|                      |Hold Right Control and press `kc`                   |
 |`RSFT(kc)`|                      |Hold Right Shift and press `kc`                     |
-|`RALT(kc)`|                      |Hold Right Alt and press `kc`                       |
+|`RALT(kc)`|`ALGR(kc)`            |Hold Right Alt and press `kc`                       |
 |`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`|Hold Right GUI and press `kc`                       |
 |`HYPR(kc)`|                      |Hold Left Control, Shift, Alt and GUI and press `kc`|
 |`MEH(kc)` |                      |Hold Left Control, Shift and Alt and press `kc`     |
@@ -92,7 +92,7 @@ The modifiers this keycode and `OSM()` accept are prefixed with `MOD_`, not `KC_
 |`MOD_LGUI`|Left GUI (Windows/Command/Meta key)     |
 |`MOD_RCTL`|Right Control                           |
 |`MOD_RSFT`|Right Shift                             |
-|`MOD_RALT`|Right Alt                               |
+|`MOD_RALT`|Right Alt (AltGr)                       |
 |`MOD_RGUI`|Right GUI (Windows/Command/Meta key)    |
 |`MOD_HYPR`|Hyper (Left Control, Shift, Alt and GUI)|
 |`MOD_MEH` |Meh (Left Control, Shift, and Alt)      |
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 75b01389c5..d12a85aa15 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -177,7 +177,7 @@ This is a reference only. Each group of keys links to the page documenting their
 |`KC_LGUI`              |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key)            |
 |`KC_RCTRL`             |`KC_RCTL`           |Right Control                                  |
 |`KC_RSHIFT`            |`KC_RSFT`           |Right Shift                                    |
-|`KC_RALT`              |                    |Right Alt                                      |
+|`KC_RALT`              |`KC_ALGR`           |Right Alt (AltGr)                              |
 |`KC_RGUI`              |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)           |
 |`KC_SYSTEM_POWER`      |`KC_PWR`            |System Power Down                              |
 |`KC_SYSTEM_SLEEP`      |`KC_SLEP`           |System Sleep                                   |
@@ -331,7 +331,7 @@ This is a reference only. Each group of keys links to the page documenting their
 |`LGUI(kc)`|`LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc`                        |
 |`RCTL(kc)`|                      |Hold Right Control and press `kc`                   |
 |`RSFT(kc)`|                      |Hold Right Shift and press `kc`                     |
-|`RALT(kc)`|                      |Hold Right Alt and press `kc`                       |
+|`RALT(kc)`|`ALGR(kc)`            |Hold Right Alt and press `kc`                       |
 |`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`|Hold Right GUI and press `kc`                       |
 |`HYPR(kc)`|                      |Hold Left Control, Shift, Alt and GUI and press `kc`|
 |`MEH(kc)` |                      |Hold Left Control, Shift and Alt and press `kc`     |
diff --git a/docs/keycodes_basic.md b/docs/keycodes_basic.md
index 9cc00f0325..cba876d346 100644
--- a/docs/keycodes_basic.md
+++ b/docs/keycodes_basic.md
@@ -116,7 +116,7 @@ The basic set of keycodes are based on the [HID Keyboard/Keypad Usage Page (0x07
 |`KC_LGUI`  |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) |
 |`KC_RCTRL` |`KC_RCTL`           |Right Control                       |
 |`KC_RSHIFT`|`KC_RSFT`           |Right Shift                         |
-|`KC_RALT`  |                    |Right Alt                           |
+|`KC_RALT`  |`KC_ALGR`           |Right Alt (AltGr)                   |
 |`KC_RGUI`  |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)|
 
 ## International
diff --git a/keyboards/handwired/reddot/keymaps/default/keymap.c b/keyboards/handwired/reddot/keymaps/default/keymap.c
index 44ee2ce510..c67cc0e4c5 100755
--- a/keyboards/handwired/reddot/keymaps/default/keymap.c
+++ b/keyboards/handwired/reddot/keymaps/default/keymap.c
@@ -8,14 +8,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_LALT,    FR_AMP, FR_EACU,  FR_QUOT, FR_APOS,    FR_LPRN,  KC_BSPACE,   KC_DELETE, FR_MINS,  FR_EGRV, FR_UNDS,  FR_CCED,       FR_AGRV,    FR_RPRN,  FR_EQL,       KC_INSERT,    KC_HOME,    KC_PGUP,\
  KC_LGUI,    FR_A,     FR_Z,     KC_E,      KC_R,     KC_T,  KC_LSFT,   KC_ENT,     KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,    FR_CIRC,      FR_DLR,       KC_DELETE,    KC_END,    KC_PGDOWN, KC_KP_PLUS,\
  KC_LCTL,    FR_Q,     KC_S,     KC_D,      KC_F,     KC_G,   KC_ENT,            KC_H,     KC_J,     KC_K,     KC_L,          FR_M,  FR_UGRV,  FR_ASTR,       KC_KP_1,    KC_UP,    KC_KP_3,\
- FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  NO_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
+ FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  FR_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
 
  [1] = KEYMAP(
   KC_ESC,    KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,   KC_TAB,  KC_CAPS,    KC_F6,    KC_F7,    KC_F8,    KC_F9,        KC_F10,  KC_F11,    KC_F12,   KC_FN0, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,\
   KC_LALT,    FR_AMP, FR_EACU,  FR_QUOT, FR_APOS,    FR_LPRN,  KC_BSPACE,   KC_DELETE, FR_MINS,  FR_EGRV, FR_UNDS,  FR_CCED,       FR_AGRV,    FR_RPRN,  FR_EQL,       KC_7,    KC_8,    KC_9,\
   KC_LGUI,    FR_A,     FR_Z,     KC_E,      KC_R,     KC_T,  KC_LSFT,   KC_ENT,     KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,    FR_CIRC,      FR_DLR,       KC_4,    KC_5,    KC_6, KC_KP_PLUS,\
   KC_LCTL,    FR_Q,     KC_S,     KC_D,      KC_F,     KC_G,   KC_ENT,            KC_H,     KC_J,     KC_K,     KC_L,          FR_M,  FR_UGRV,  FR_ASTR,       KC_1,    KC_2,    KC_3,\
-  FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  NO_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
+  FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  FR_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
 };
 
 
diff --git a/keyboards/xd75/keymaps/germanized/config.h b/keyboards/xd75/keymaps/germanized/config.h
index 5b19bddb05..379b954714 100644
--- a/keyboards/xd75/keymaps/germanized/config.h
+++ b/keyboards/xd75/keymaps/germanized/config.h
@@ -28,7 +28,6 @@
 #define TAPPING_TERM 200
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define DE_ALGR KC_RALT
 
 // normal characters
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 764c561417..573fa2e8a4 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -22,10 +22,7 @@
 #define BE_LALT KC_LGUI
 
 // Alt gr
-#ifndef ALGR
-#define ALGR(kc) RALT(kc)
-#endif
-#define NO_ALGR KC_RALT
+#define BE_ALGR KC_RALT
 
 // Normal characters
 // Line 1
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 05fd2b0023..e6545a7a83 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -21,10 +21,7 @@
 
 // Alt gr
 #ifndef ALTGR
-#define ALTGR(kc)   RALT(kc)
-#endif
-#ifndef ALGR
-#define ALGR(kc)    ALTGR(kc)
+#define ALTGR(kc)   ALGR(kc)
 #endif
 #define BP_ALGR KC_RALT
 
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index 1d45bee32e..fbeef21874 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -20,10 +20,7 @@
 
 // Alt gr
 #ifndef ALTGR
-#define ALTGR(kc)   RALT(kc)
-#endif
-#ifndef ALGR
-#define ALGR(kc)    ALTGR(kc)
+#define ALTGR(kc)   ALGR(kc)
 #endif
 
 #define CSA_ALTGR   KC_RALT
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h
index c0ca832a6f..4eeca7209f 100644
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -19,7 +19,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define FR_CH_ALGR KC_RALT
 
 // normal characters
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index 3308dc5f77..d2de859ee7 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -19,10 +19,7 @@
 #include "keymap.h"
 
 // Alt gr
-#ifndef ALGR
-#define ALGR(kc) RALT(kc)
-#endif
-#define NO_ALGR KC_RALT
+#define FR_ALGR KC_RALT
 
 // Normal characters
 #define FR_SUP2	KC_GRV
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index e007c26ef5..a215570fd3 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -20,7 +20,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define DE_ALGR KC_RALT
 
 // normal characters
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 67350d6602..f0376a17c0 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -19,7 +19,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define CH_ALGR KC_RALT
 
 // normal characters
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index b372440928..cd2dc94cfe 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -20,7 +20,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define HU_ALGR KC_RALT
 
 // basic letters
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index 0ff6ce8762..f629081507 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -20,7 +20,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define IT_ALGR KC_RALT
 
 // normal characters
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 6b34db5588..4210d37145 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -19,7 +19,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define NO_ALGR KC_RALT
 
 // Normal characters
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index f27123c2a2..47f5bceed2 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -21,7 +21,6 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
 #define SI_ALGR KC_RALT
 
 //Swapped Z and Y
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index 224db7be16..19d12551a6 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -19,8 +19,7 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
-#define NO_ALGR KC_RALT
+#define ES_ALGR KC_RALT
 
 // Normal characters
 #define ES_OVRR KC_GRV
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index de47103cb9..a7bcd697e0 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -19,8 +19,7 @@
 #include "keymap.h"
 
 // Alt gr
-#define ALGR(kc) RALT(kc)
-#define NO_ALGR KC_RALT
+#define UK_ALGR KC_RALT
 
 // Normal characters
 #define UK_HASH KC_NUHS
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 41c7d8351a..5920e4b139 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -197,6 +197,7 @@ extern uint32_t default_layer_state;
 #define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
 #define SS_LSFT(string) SS_DOWN(X_LSHIFT) string SS_UP(X_LSHIFT)
 #define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
+#define SS_ALGR(string) SS_RALT(string)
 
 #define SEND_STRING(str) send_string_P(PSTR(str))
 extern const bool ascii_to_shift_lut[0x80];
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 7670d53e96..283b4a65ca 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -470,6 +470,7 @@ enum quantum_keycodes {
 #define RCTL(kc) (QK_RCTL | (kc))
 #define RSFT(kc) (QK_RSFT | (kc))
 #define RALT(kc) (QK_RALT | (kc))
+#define ALGR(kc) RALT(kc)
 #define RGUI(kc) (QK_RGUI | (kc))
 #define RCMD(kc) RGUI(kc)
 #define RWIN(kc) RGUI(kc)
@@ -480,7 +481,7 @@ enum quantum_keycodes {
 #define SGUI(kc) (QK_LGUI | QK_LSFT | (kc))
 #define SCMD(kc) SGUI(kc)
 #define SWIN(kc) SGUI(kc)
-#define LCA(kc) (QK_LCTL | QK_LALT | (kc))
+#define LCA(kc)  (QK_LCTL | QK_LALT | (kc))
 
 #define MOD_HYPR 0xf
 #define MOD_MEH 0x7
@@ -645,7 +646,7 @@ enum quantum_keycodes {
 #define ALT_T(kc) MT(MOD_LALT, kc)
 #define LALT_T(kc) MT(MOD_LALT, kc)
 #define RALT_T(kc) MT(MOD_RALT, kc)
-#define ALGR_T(kc) MT(MOD_RALT, kc) // dual-function AltGR
+#define ALGR_T(kc) RALT_T(kc)
 
 #define GUI_T(kc) MT(MOD_LGUI, kc)
 #define CMD_T(kc) GUI_T(kc)
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h
index d6fef2bebf..ac3edbd215 100644
--- a/tmk_core/common/keycode.h
+++ b/tmk_core/common/keycode.h
@@ -140,6 +140,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_LWIN KC_LGUI
 #define KC_RCTL KC_RCTRL
 #define KC_RSFT KC_RSHIFT
+#define KC_ALGR KC_RALT
 #define KC_RCMD KC_RGUI
 #define KC_RWIN KC_RGUI
 
-- 
cgit v1.2.3


From e76bf17d36c3e23d4c780ab7dd0a10b5883889a2 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević
Date: Thu, 3 Jan 2019 17:13:55 +0100
Subject: Remove redundant, language-specific aliases for KC_ALGR (#4720)

* Use standard KC_ALGR, remove language-specific redefinitions

* Use ALGR instead of ALTGR in BÉPO and Canadian multilingual keymaps

* Remove BE_LALT, BE_LGUI aliases
---
 keyboards/contra/keymaps/maxr1998/keymap.c         |   4 +-
 keyboards/ergodox_ez/keymaps/skug/keymap.c         |   2 +-
 .../handwired/reddot/keymaps/default/keymap.c      |   4 +-
 keyboards/lets_split/keymaps/DE_simple/keymap.c    |   2 +-
 keyboards/planck/keymaps/skug/keymap.c             |   2 +-
 keyboards/preonic/keymaps/jacwib/keymap.c          |   4 +-
 keyboards/satan/keymaps/dende_iso/keymap.c         |   2 +-
 keyboards/xd75/keymaps/germanized/config.h         |   3 -
 layouts/community/ergodox/bepo/keymap.c            |   2 +-
 layouts/community/ergodox/bepo_csa/keymap.c        |  12 +-
 .../community/ergodox/dvorak_svorak_a5/keymap.c    |   2 +-
 layouts/community/ergodox/swedish-lindhe/keymap.c  |   2 +-
 layouts/community/ergodox/swedish/keymap.c         |   2 +-
 quantum/keymap_extras/keymap_belgian.h             |   6 -
 quantum/keymap_extras/keymap_bepo.h                | 150 ++++++++++-----------
 .../keymap_extras/keymap_canadian_multilingual.h   |  46 +++----
 quantum/keymap_extras/keymap_fr_ch.h               |   3 -
 quantum/keymap_extras/keymap_french.h              |   3 -
 quantum/keymap_extras/keymap_german.h              |   3 -
 quantum/keymap_extras/keymap_german_ch.h           |   3 -
 quantum/keymap_extras/keymap_hungarian.h           |   3 -
 quantum/keymap_extras/keymap_italian.h             |   6 -
 quantum/keymap_extras/keymap_neo2.h                |   2 +-
 quantum/keymap_extras/keymap_nordic.h              |   3 -
 quantum/keymap_extras/keymap_slovenian.h           |   3 -
 quantum/keymap_extras/keymap_spanish.h             |   3 -
 quantum/keymap_extras/keymap_uk.h                  |   3 -
 users/spacebarracecar/spacebarracecar.c            |   4 +-
 users/spacebarracecar/spacebarracecar.h            |   4 +-
 29 files changed, 116 insertions(+), 172 deletions(-)

(limited to 'quantum/keymap_extras')

diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
index 87bf338948..4d731c08b4 100644
--- a/keyboards/contra/keymaps/maxr1998/keymap.c
+++ b/keyboards/contra/keymaps/maxr1998/keymap.c
@@ -127,11 +127,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return true;
     case NR_L3:
       if (record->event.pressed) {
-        register_code(DE_ALGR);
+        register_code(KC_ALGR);
         layer_on(_NUMROW_L3);
       } else {
         layer_off(_NUMROW_L3);
-        unregister_code(DE_ALGR);
+        unregister_code(KC_ALGR);
       }
       return false;
     default:
diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c
index d17990481e..b3696f3a98 100644
--- a/keyboards/ergodox_ez/keymaps/skug/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          TG(SYMB),       KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              NO_AA,
                          KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, NO_OSLH), LT(SYMB, NO_AE),
          KC_WFWD,        KC_N,   KC_M,   KC_COMM, KC_DOT,  NO_MINS,           KC_RSPC,
-                                 KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR,           CTL_T(NO_TILD),
+                                 KC_SPC, KC_BSPC, KC_ALGR, NO_ASTR,           CTL_T(NO_TILD),
         KC_HOME,  NO_CIRC,
         KC_PGUP,  KC_UP,         KC_DOWN,
         KC_LGUI,  ALT_T(KC_ESC), CTL_T(KC_ENT)
diff --git a/keyboards/handwired/reddot/keymaps/default/keymap.c b/keyboards/handwired/reddot/keymaps/default/keymap.c
index c67cc0e4c5..73aeff2252 100755
--- a/keyboards/handwired/reddot/keymaps/default/keymap.c
+++ b/keyboards/handwired/reddot/keymaps/default/keymap.c
@@ -8,14 +8,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_LALT,    FR_AMP, FR_EACU,  FR_QUOT, FR_APOS,    FR_LPRN,  KC_BSPACE,   KC_DELETE, FR_MINS,  FR_EGRV, FR_UNDS,  FR_CCED,       FR_AGRV,    FR_RPRN,  FR_EQL,       KC_INSERT,    KC_HOME,    KC_PGUP,\
  KC_LGUI,    FR_A,     FR_Z,     KC_E,      KC_R,     KC_T,  KC_LSFT,   KC_ENT,     KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,    FR_CIRC,      FR_DLR,       KC_DELETE,    KC_END,    KC_PGDOWN, KC_KP_PLUS,\
  KC_LCTL,    FR_Q,     KC_S,     KC_D,      KC_F,     KC_G,   KC_ENT,            KC_H,     KC_J,     KC_K,     KC_L,          FR_M,  FR_UGRV,  FR_ASTR,       KC_KP_1,    KC_UP,    KC_KP_3,\
- FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  FR_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
+ FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  KC_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
 
  [1] = KEYMAP(
   KC_ESC,    KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,   KC_TAB,  KC_CAPS,    KC_F6,    KC_F7,    KC_F8,    KC_F9,        KC_F10,  KC_F11,    KC_F12,   KC_FN0, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,\
   KC_LALT,    FR_AMP, FR_EACU,  FR_QUOT, FR_APOS,    FR_LPRN,  KC_BSPACE,   KC_DELETE, FR_MINS,  FR_EGRV, FR_UNDS,  FR_CCED,       FR_AGRV,    FR_RPRN,  FR_EQL,       KC_7,    KC_8,    KC_9,\
   KC_LGUI,    FR_A,     FR_Z,     KC_E,      KC_R,     KC_T,  KC_LSFT,   KC_ENT,     KC_Y,     KC_U,     KC_I,     KC_O,          KC_P,    FR_CIRC,      FR_DLR,       KC_4,    KC_5,    KC_6, KC_KP_PLUS,\
   KC_LCTL,    FR_Q,     KC_S,     KC_D,      KC_F,     KC_G,   KC_ENT,            KC_H,     KC_J,     KC_K,     KC_L,          FR_M,  FR_UGRV,  FR_ASTR,       KC_1,    KC_2,    KC_3,\
-  FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  FR_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
+  FR_LESS, FR_W,     KC_X,     KC_C,      KC_V,     KC_B,   KC_SPACE,          KC_SPACE,     KC_N, FR_COMM,   FR_SCLN,  FR_COLN,     FR_EXLM,  KC_ALGR,    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_KP_ENTER),
 };
 
 
diff --git a/keyboards/lets_split/keymaps/DE_simple/keymap.c b/keyboards/lets_split/keymaps/DE_simple/keymap.c
index d329bea4c0..e801c241e1 100644
--- a/keyboards/lets_split/keymaps/DE_simple/keymap.c
+++ b/keyboards/lets_split/keymaps/DE_simple/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,    KC_BSPC, \
   KC_TAB,  DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L,    DE_PLUS, DE_HASH, \
   KC_LSFT, DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,  DE_MINS, KC_ENT , \
-  KC_LCTL, KC_LALT, DE_ALGR, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+  KC_LCTL, KC_LALT, KC_ALGR, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
 ),
 
 /* Lower
diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c
index 29324a09e4..86a1de767b 100644
--- a/keyboards/planck/keymaps/skug/keymap.c
+++ b/keyboards/planck/keymaps/skug/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y    , KC_U   , KC_I   , KC_O   , KC_P   , NO_AA  ,
     UTILITY, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H    , KC_J   , KC_K   , KC_L   , NO_OSLH, NO_AE  ,
     KC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N    , KC_M   , KC_COMM, KC_DOT , NO_MINS, KC_RSPC,
-    LFT_CTR, KC_LALT, KC_LGUI, NO_AT  , ESC_LOW, KC_ENT , KC_SPC  , BSP_RAI, _______, NO_ALGR, NO_ASTR, RGT_CTR
+    LFT_CTR, KC_LALT, KC_LGUI, NO_AT  , ESC_LOW, KC_ENT , KC_SPC  , BSP_RAI, _______, KC_ALGR, NO_ASTR, RGT_CTR
 ),
 
 /* Raise
diff --git a/keyboards/preonic/keymaps/jacwib/keymap.c b/keyboards/preonic/keymaps/jacwib/keymap.c
index 0b63abce17..ffd5889455 100644
--- a/keyboards/preonic/keymaps/jacwib/keymap.c
+++ b/keyboards/preonic/keymaps/jacwib/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    NO_AM,   \
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    NO_AE,   NO_OSLH, \
   KC_LSFT, NO_LESS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, NO_MINS, \
-  KC_LCTL, KC_LALT, KC_LGUI, NO_ALGR, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+  KC_LCTL, KC_LALT, KC_LGUI, KC_ALGR, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
 
 /* Lower
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    NO_AM,   \
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    NO_AE,   NO_OSLH, \
   KC_LSFT, NO_LESS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, NO_MINS, \
-  KC_LCTL, KC_LALT, KC_LGUI, NO_ALGR, MLOWER,  KC_SPC,  KC_ENT,  MRAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+  KC_LCTL, KC_LALT, KC_LGUI, KC_ALGR, MLOWER,  KC_SPC,  KC_ENT,  MRAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
 ),
 
 /* Mac Lower
diff --git a/keyboards/satan/keymaps/dende_iso/keymap.c b/keyboards/satan/keymaps/dende_iso/keymap.c
index 205e9cb77d..be1bfd23aa 100644
--- a/keyboards/satan/keymaps/dende_iso/keymap.c
+++ b/keyboards/satan/keymaps/dende_iso/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,       KC_Q,    KC_W,    KC_E, KC_R, KC_T, DE_Z, KC_U, KC_I, KC_O,    KC_P,    DE_UE,   DE_PLUS, \
   FN_CAPS,      KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    DE_OE,   DE_AE,   DE_HASH, KC_ENT, \
   KC_LSFT,      DE_LESS, DE_Y,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  DE_MINS, KC_RSFT, KC_DELETE,  \
-  KC_LCTL,      KC_LGUI, KC_LALT,              KC_SPACE,                       DE_ALGR, KC_RGUI, KC_APP,  KC_RCTL),
+  KC_LCTL,      KC_LGUI, KC_LALT,              KC_SPACE,                       KC_ALGR, KC_RGUI, KC_APP,  KC_RCTL),
 
 
   /* Keymap _FNK: Function Keys
diff --git a/keyboards/xd75/keymaps/germanized/config.h b/keyboards/xd75/keymaps/germanized/config.h
index 379b954714..dd3f32275b 100644
--- a/keyboards/xd75/keymaps/germanized/config.h
+++ b/keyboards/xd75/keymaps/germanized/config.h
@@ -27,9 +27,6 @@
 //Tap Dancing
 #define TAPPING_TERM 200
 
-// Alt gr
-#define DE_ALGR KC_RALT
-
 // normal characters
 #define DE_Z KC_Y
 #define DE_Y KC_Z
diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c
index c33c3c2550..6ea8cba681 100644
--- a/layouts/community/ergodox/bepo/keymap.c
+++ b/layouts/community/ergodox/bepo/keymap.c
@@ -50,7 +50,7 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,
 				KC_CAPSLOCK,	BP_DCRC,	BP_V,		BP_D,		BP_L,		BP_J,		BP_Z,
 						BP_C,		BP_T,		BP_S,		BP_R,		BP_N,		BP_M,
 				KC_NUMLOCK,	BP_APOS,	BP_Q,		BP_G,		BP_H,		BP_F,		BP_CCED,
-								BP_ALGR,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
+								KC_ALGR,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,
 DF(AZ_B),	DF(BEPO),
 MO(NUMK),
 MO(FNAV),	KC_RSHIFT,	KC_ENTER),
diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c
index 9526ea3f77..125301d443 100644
--- a/layouts/community/ergodox/bepo_csa/keymap.c
+++ b/layouts/community/ergodox/bepo_csa/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_BSPC,   BP_DCRC,  BP_V,    BP_D,    BP_L,    BP_J,     BP_Z,
                    BP_C,     BP_T,    BP_S,    BP_R,    BP_N,     BP_M,
         KC_ENT,    BP_APOS,  BP_Q,    BP_G,    BP_H,    BP_F,     KC_RSFT,
-                             BP_ALGR, BP_PERC, KC_APP,  BP_CCED,  KC_RCTL,
+                             KC_ALGR, BP_PERC, KC_APP,  BP_CCED,  KC_RCTL,
 
         KC_LEFT, KC_RGHT,
         KC_UP,
@@ -449,14 +449,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                         register_code(KC_1 + (id - M_1));
                         break;
                     case M_DEGR:
-                        return MACRO(DOWN(CSA_ALTGR), D(SCLN), END);
+                        return MACRO(DOWN(KC_ALGR), D(SCLN), END);
                     case M_SCLN:
                         return MACRO(D(SCLN), END);
                     case M_GRV:
-                        return MACRO(I(75), DOWN(CSA_ALTGR), TYPE(CSA_DCRC), UP(CSA_ALTGR), T(SPACE), END);
+                        return MACRO(I(75), DOWN(KC_ALGR), TYPE(CSA_DCRC), UP(KC_ALGR), T(SPACE), END);
                     case M_NBSP:
                         // use weak mod such that pressing another key will not be affected
-                        add_weak_mods(MOD_BIT(CSA_ALTGR));
+                        add_weak_mods(MOD_BIT(KC_ALGR));
                         return MACRO(D(SPACE), END);
                 }
             } else {
@@ -466,11 +466,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                         unregister_code(KC_1 + (id - M_1));
                         break;
                     case M_DEGR:
-                        return MACRO(UP(CSA_ALTGR), U(SCLN), END);
+                        return MACRO(UP(KC_ALGR), U(SCLN), END);
                     case M_SCLN:
                         return MACRO(U(SCLN), END);
                     case M_NBSP:
-                        del_weak_mods(MOD_BIT(CSA_ALTGR));
+                        del_weak_mods(MOD_BIT(KC_ALGR));
                         return MACRO(U(SPACE), END);
                 }
             }
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
index 2668fce866..98df732893 100644
--- a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
+++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     NO_AA,
                     KC_H,    KC_J,    KC_K,    KC_L,    NO_OSLH,  NO_AE,
     KC_DELT,        KC_N,    KC_M,    KC_COMM, KC_DOT,  NO_MINS,  KC_RSFT,
-                             NO_ALGR, KC_DOWN, KC_UP,   KC_LEFT,  KC_RGHT,
+                             KC_ALGR, KC_DOWN, KC_UP,   KC_LEFT,  KC_RGHT,
     KC_HOME,        KC_END,
     KC_PGUP,
     KC_PGDN,        KC_ENT, KC_SPACE
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index e977ab9948..a46408793a 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          TG(SYMB),  KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,     NO_AA,
                     KC_H,   KC_J,    KC_K,    KC_L,    NO_OSLH,  NO_AE,
          KC_DELT,   KC_N,   KC_M,    KC_COMM, KC_DOT,  NO_MINS,  KC_RSFT,
-                            NO_ALGR, KC_DOWN, KC_UP,   KC_LEFT,  KC_RGHT,
+                            KC_ALGR, KC_DOWN, KC_UP,   KC_LEFT,  KC_RGHT,
          KC_HOME,        KC_END,
          KC_PGUP,
          KC_PGDN, KC_TAB, LT(MDIA, KC_ENT)
diff --git a/layouts/community/ergodox/swedish/keymap.c b/layouts/community/ergodox/swedish/keymap.c
index d2b9b40d1f..0cda8511f7 100644
--- a/layouts/community/ergodox/swedish/keymap.c
+++ b/layouts/community/ergodox/swedish/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                        KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, NO_OSLH), GUI_T(NO_AE),
          MEH_T(KC_NO), KC_N,   KC_M,   KC_COMM, KC_DOT,  CTL_T(NO_MINS),    KC_RSFT,
                                KC_UP,  KC_DOWN, NO_CIRC, NO_ASTR,           KC_FN1,
-         NO_ALGR,        CTL_T(KC_ESC),
+         KC_ALGR,        CTL_T(KC_ESC),
          KC_PGUP,
          KC_PGDN,KC_TAB, KC_ENT
 ),
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 573fa2e8a4..ab89fbabfe 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -18,12 +18,6 @@
 
 #include "keymap.h"
 
-#define BE_LGUI KC_LALT
-#define BE_LALT KC_LGUI
-
-// Alt gr
-#define BE_ALGR KC_RALT
-
 // Normal characters
 // Line 1
 #define BE_SUP2	KC_GRV
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index e6545a7a83..8d7b36ca3d 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -19,12 +19,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#ifndef ALTGR
-#define ALTGR(kc)   ALGR(kc)
-#endif
-#define BP_ALGR KC_RALT
-
 // Normal characters
 // First row (on usual keyboards)
 #define BP_DOLLAR           KC_GRAVE            // $
@@ -139,138 +133,138 @@
 
 // AltGr-ed characters
 // First row
-#define BP_EN_DASH          ALTGR(BP_DOLLAR)    // –
+#define BP_EN_DASH          ALGR(BP_DOLLAR)     // –
 #define BP_NDSH             BP_EN_DASH
-#define BP_EM_DASH          ALTGR(KC_1)         // —
+#define BP_EM_DASH          ALGR(KC_1)          // —
 #define BP_MDSH             BP_EM_DASH
-#define BP_LESS             ALTGR(KC_2)         // <
-#define BP_GREATER          ALTGR(KC_3)         // >
+#define BP_LESS             ALGR(KC_2)          // <
+#define BP_GREATER          ALGR(KC_3)          // >
 #define BP_GRTR             BP_GREATER
-#define BP_LBRACKET         ALTGR(KC_4)         // [
+#define BP_LBRACKET         ALGR(KC_4)          // [
 #define BP_LBRC             BP_LBRACKET
-#define BP_RBRACKET         ALTGR(KC_5)         // ]
+#define BP_RBRACKET         ALGR(KC_5)          // ]
 #define BP_RBRC             BP_RBRACKET
-#define BP_CIRCUMFLEX       ALTGR(KC_6)         // ^
+#define BP_CIRCUMFLEX       ALGR(KC_6)          // ^
 #define BP_CIRC             BP_CIRCUMFLEX
-#define BP_PLUS_MINUS       ALTGR(KC_7)         // ±
+#define BP_PLUS_MINUS       ALGR(KC_7)          // ±
 #define BP_PSMS             BP_PLUS_MINUS
-#define BP_MATH_MINUS       ALTGR(KC_8)         // −
+#define BP_MATH_MINUS       ALGR(KC_8)          // −
 #define BP_MMNS             BP_MATH_MINUS
-#define BP_OBELUS           ALTGR(KC_9)         // ÷
+#define BP_OBELUS           ALGR(KC_9)          // ÷
 #define BP_OBEL             BP_OBELUS
 // more conventional name of the symbol
 #define BP_DIVISION_SIGN    BP_OBELUS
 #define BP_DVSN             BP_DIVISION_SIGN
-#define BP_TIMES            ALTGR(KC_0)         // ×
+#define BP_TIMES            ALGR(KC_0)          // ×
 #define BP_TIMS             BP_TIMES
-#define BP_DIFFERENT        ALTGR(BP_EQUAL)     // ≠
+#define BP_DIFFERENT        ALGR(BP_EQUAL)      // ≠
 #define BP_DIFF             BP_DIFFERENT
-#define BP_PERMILLE         ALTGR(BP_PERCENT)   // ‰
+#define BP_PERMILLE         ALGR(BP_PERCENT)    // ‰
 #define BP_PMIL             BP_PERMILLE
 
 // Second row
-#define BP_PIPE                 ALTGR(BP_B)         // |
-#define BP_DEAD_ACUTE           ALTGR(BP_E_ACUTE)   // dead ´
+#define BP_PIPE                 ALGR(BP_B)          // |
+#define BP_DEAD_ACUTE           ALGR(BP_E_ACUTE)    // dead ´
 #define BP_DACT                 BP_DEAD_ACUTE
-#define BP_AMPERSAND            ALTGR(BP_P)         // &
+#define BP_AMPERSAND            ALGR(BP_P)          // &
 #define BP_AMPR                 BP_AMPERSAND
-#define BP_OE_LIGATURE          ALTGR(BP_O)         // œ
+#define BP_OE_LIGATURE          ALGR(BP_O)          // œ
 #define BP_OE                   BP_OE_LIGATURE
-#define BP_DEAD_GRAVE           ALTGR(BP_E_GRAVE)   // `
+#define BP_DEAD_GRAVE           ALGR(BP_E_GRAVE)    // `
 #define BP_DGRV                 BP_DEAD_GRAVE
-#define BP_INVERTED_EXCLAIM     ALTGR(BP_DEAD_CIRCUMFLEX)   // ¡
+#define BP_INVERTED_EXCLAIM     ALGR(BP_DEAD_CIRCUMFLEX)    // ¡
 #define BP_IXLM                 BP_INVERTED_EXCLAIM
-#define BP_DEAD_CARON           ALTGR(BP_V)         // dead ˇ
+#define BP_DEAD_CARON           ALGR(BP_V)          // dead ˇ
 #define BP_DCAR                 BP_DEAD_CARON
-#define BP_ETH                  ALTGR(BP_D)         // ð
-#define BP_DEAD_SLASH           ALTGR(BP_L)         // dead /
+#define BP_ETH                  ALGR(BP_D)          // ð
+#define BP_DEAD_SLASH           ALGR(BP_L)          // dead /
 #define BP_DSLH                 BP_DEAD_SLASH
-#define BP_IJ_LIGATURE          ALTGR(BP_J)         // ij
+#define BP_IJ_LIGATURE          ALGR(BP_J)          // ij
 #define BP_IJ                   BP_IJ_LIGATURE
-#define BP_SCHWA                ALTGR(BP_Z)         // ə
+#define BP_SCHWA                ALGR(BP_Z)          // ə
 #define BP_SCWA                 BP_SCHWA
-#define BP_DEAD_BREVE           ALTGR(BP_W)         // dead ˘
+#define BP_DEAD_BREVE           ALGR(BP_W)          // dead ˘
 #define BP_DBRV                 BP_DEAD_BREVE
 
 // Third row
-#define BP_AE_LIGATURE              ALTGR(BP_A)         // æ
+#define BP_AE_LIGATURE              ALGR(BP_A)          // æ
 #define BP_AE                       BP_AE_LIGATURE
-#define BP_U_GRAVE                  ALTGR(BP_U)           // ù
+#define BP_U_GRAVE                  ALGR(BP_U)          // ù
 #define BP_UGRV                     BP_U_GRAVE
-#define BP_DEAD_TREMA               ALTGR(BP_I)         // dead ¨ (trema/umlaut/diaresis)
+#define BP_DEAD_TREMA               ALGR(BP_I)          // dead ¨ (trema/umlaut/diaresis)
 #define BP_DTRM                     BP_DEAD_TREMA
-#define BP_EURO                     ALTGR(BP_E)         // €
-#define BP_TYPOGRAPHICAL_APOSTROPHE ALTGR(BP_COMMA)     // ’
+#define BP_EURO                     ALGR(BP_E)          // €
+#define BP_TYPOGRAPHICAL_APOSTROPHE ALGR(BP_COMMA)      // ’
 #define BP_TAPO                     BP_TYPOGRAPHICAL_APOSTROPHE
-#define BP_COPYRIGHT                ALTGR(BP_C)         // ©
+#define BP_COPYRIGHT                ALGR(BP_C)          // ©
 #define BP_CPRT                     BP_COPYRIGHT
-#define BP_THORN                    ALTGR(BP_T)         // þ
+#define BP_THORN                    ALGR(BP_T)          // þ
 #define BP_THRN                     BP_THORN
-#define BP_SHARP_S                  ALTGR(BP_S)         // ß
+#define BP_SHARP_S                  ALGR(BP_S)          // ß
 #define BP_SRPS                     BP_SHARP_S
-#define BP_REGISTERED_TRADEMARK     ALTGR(BP_R)         // ®
+#define BP_REGISTERED_TRADEMARK     ALGR(BP_R)          // ®
 #define BP_RTM                      BP_REGISTERED_TRADEMARK
-#define BP_DEAD_TILDE               ALTGR(BP_N)         // dead ~
+#define BP_DEAD_TILDE               ALGR(BP_N)          // dead ~
 #define BP_DTLD                     BP_DEAD_TILDE
-#define BP_DEAD_MACRON              ALTGR(BP_M)         // dead ¯
+#define BP_DEAD_MACRON              ALGR(BP_M)          // dead ¯
 #define BP_DMCR                     BP_DEAD_MACRON
-#define BP_DEAD_CEDILLA             ALTGR(BP_C_CEDILLA) // dead ¸
+#define BP_DEAD_CEDILLA             ALGR(BP_C_CEDILLA)  // dead ¸
 #define BP_DCED                     BP_DEAD_CEDILLA
 
 // Fourth row
-#define BP_NONUS_SLASH          ALTGR(BP_E_CIRCUMFLEX)  // / on non-us backslash key (102nd key, ê in bépo)
+#define BP_NONUS_SLASH          ALGR(BP_E_CIRCUMFLEX)   // / on non-us backslash key (102nd key, ê in bépo)
 #define BP_NUSL                 BP_NONUS_SLASH
-#define BP_BACKSLASH            ALTGR(BP_A_GRAVE)       /* \ */
+#define BP_BACKSLASH            ALGR(BP_A_GRAVE)        /* \ */
 #define BP_BSLS                 BP_BACKSLASH
-#define BP_LEFT_CURLY_BRACE     ALTGR(BP_Y)             // {
+#define BP_LEFT_CURLY_BRACE     ALGR(BP_Y)              // {
 #define BP_LCBR                 BP_LEFT_CURLY_BRACE
-#define BP_RIGHT_CURLY_BRACE    ALTGR(BP_X)             // }
+#define BP_RIGHT_CURLY_BRACE    ALGR(BP_X)              // }
 #define BP_RCBR                 BP_RIGHT_CURLY_BRACE
-#define BP_ELLIPSIS             ALTGR(BP_DOT)           // …
+#define BP_ELLIPSIS             ALGR(BP_DOT)            // …
 #define BP_ELPS                 BP_ELLIPSIS
-#define BP_TILDE                ALTGR(BP_K)             // ~
+#define BP_TILDE                ALGR(BP_K)              // ~
 #define BP_TILD                 BP_TILDE
-#define BP_INVERTED_QUESTION    ALTGR(BP_QUESTION)      // ¿
+#define BP_INVERTED_QUESTION    ALGR(BP_QUESTION)       // ¿
 #define BP_IQST                 BP_INVERTED_QUESTION
-#define BP_DEAD_RING            ALTGR(BP_Q)             // dead °
+#define BP_DEAD_RING            ALGR(BP_Q)              // dead °
 #define BP_DRNG                 BP_DEAD_RING
-#define BP_DEAD_GREEK           ALTGR(BP_G)             // dead Greek key (following key will make a Greek letter)
+#define BP_DEAD_GREEK           ALGR(BP_G)              // dead Greek key (following key will make a Greek letter)
 #define BP_DGRK                 BP_DEAD_GREEK
-#define BP_DAGGER               ALTGR(BP_H)             // †
+#define BP_DAGGER               ALGR(BP_H)              // †
 #define BP_DAGR                 BP_DAGGER
-#define BP_DEAD_OGONEK          ALTGR(BP_F)             // dead ˛
+#define BP_DEAD_OGONEK          ALGR(BP_F)              // dead ˛
 #define BP_DOGO                 BP_DEAD_OGONEK
 
 // Space bar
-#define BP_UNDERSCORE   ALTGR(KC_SPACE)     // _
+#define BP_UNDERSCORE   ALGR(KC_SPACE)      // _
 #define BP_UNDS         BP_UNDERSCORE
 
 // AltGr-Shifted characters (different from capitalised AltGr-ed characters)
 // First row
-#define BP_PARAGRAPH            ALTGR(BP_HASH)      // ¶
+#define BP_PARAGRAPH            ALGR(BP_HASH)       // ¶
 #define BP_PARG                 BP_PARAGRAPH
-#define BP_LOW_DOUBLE_QUOTE     ALTGR(BP_1)         // „
+#define BP_LOW_DOUBLE_QUOTE     ALGR(BP_1)          // „
 #define BP_LWQT                 BP_LOW_DOUBLE_QUOTE
-#define BP_LEFT_DOUBLE_QUOTE    ALTGR(BP_2)         // “
+#define BP_LEFT_DOUBLE_QUOTE    ALGR(BP_2)          // “
 #define BP_LDQT                 BP_LEFT_DOUBLE_QUOTE
-#define BP_RIGHT_DOUBLE_QUOTE   ALTGR(BP_3)         // ”
+#define BP_RIGHT_DOUBLE_QUOTE   ALGR(BP_3)          // ”
 #define BP_RDQT                 BP_RIGHT_DOUBLE_QUOTE
-#define BP_LESS_OR_EQUAL        ALTGR(BP_4)         // ≤
+#define BP_LESS_OR_EQUAL        ALGR(BP_4)          // ≤
 #define BP_LEQL                 BP_LESS_OR_EQUAL
-#define BP_GREATER_OR_EQUAL     ALTGR(BP_5)         // ≥
+#define BP_GREATER_OR_EQUAL     ALGR(BP_5)          // ≥
 #define BP_GEQL                 BP_GREATER_OR_EQUAL
-// nothing on ALTGR(BP_6)
-#define BP_NEGATION             ALTGR(BP_7)         // ¬
+// nothing on ALGR(BP_6)
+#define BP_NEGATION             ALGR(BP_7)          // ¬
 #define BP_NEGT                 BP_NEGATION
-#define BP_ONE_QUARTER          ALTGR(BP_8)         // ¼
+#define BP_ONE_QUARTER          ALGR(BP_8)          // ¼
 #define BP_1QRT                 BP_ONE_QUARTER
-#define BP_ONE_HALF             ALTGR(BP_9)         // ½
+#define BP_ONE_HALF             ALGR(BP_9)          // ½
 #define BP_1HLF                 BP_ONE_HALF
-#define BP_THREE_QUARTERS       ALTGR(BP_0)         // ¾
+#define BP_THREE_QUARTERS       ALGR(BP_0)          // ¾
 #define BP_3QRT                 BP_THREE_QUARTERS
-#define BP_MINUTES              ALTGR(BP_DEGREE)    // ′
+#define BP_MINUTES              ALGR(BP_DEGREE)     // ′
 #define BP_MNUT                 BP_MINUTES
-#define BP_SECONDS              ALTGR(BP_GRAVE)     // ″
+#define BP_SECONDS              ALGR(BP_GRAVE)      // ″
 #define BP_SCND                 BP_SECONDS
 
 // Second row
@@ -278,7 +272,7 @@
 #define BP_BPIP                 BP_BROKEN_PIPE
 #define BP_DEAD_DOUBLE_ACUTE    LSFT(BP_DEAD_ACUTE)     // ˝
 #define BP_DDCT                 BP_DEAD_DOUBLE_ACUTE
-#define BP_SECTION              ALTGR(LSFT(BP_P))       // §
+#define BP_SECTION              ALGR(LSFT(BP_P))        // §
 #define BP_SECT                 BP_SECTION
 // LSFT(BP_DEAD_GRAVE) is actually the same character as LSFT(BP_PERCENT)
 #define BP_GRAVE_BIS            LSFT(BP_DEAD_GRAVE)     // `
@@ -289,35 +283,35 @@
 #define BP_DDTA                 BP_DEAD_DOT_ABOVE
 #define BP_DEAD_CURRENCY        LSFT(BP_EURO)           // dead ¤ (next key will generate a currency code like ¥ or £)
 #define BP_DCUR                 BP_DEAD_CURRENCY
-#define BP_DEAD_HORN            LSFT(ALTGR(BP_COMMA))   // dead ̛
+#define BP_DEAD_HORN            LSFT(ALGR(BP_COMMA))    // dead ̛
 #define BP_DHRN                 BP_DEAD_HORN
-#define BP_LONG_S               LSFT(ALTGR(BP_C))       // ſ
+#define BP_LONG_S               LSFT(ALGR(BP_C))        // ſ
 #define BP_LNGS                 BP_LONG_S
 #define BP_TRADEMARK            LSFT(BP_REGISTERED_TRADEMARK)   // ™
 #define BP_TM                   BP_TRADEMARK
-#define BP_ORDINAL_INDICATOR_O  LSFT(ALTGR(BP_M))               // º
+#define BP_ORDINAL_INDICATOR_O  LSFT(ALGR(BP_M))        // º
 #define BP_ORDO                 BP_ORDINAL_INDICATOR_O
 #define BP_DEAD_COMMA           LSFT(BP_DEAD_CEDILLA)   // dead ˛
 #define BP_DCOM                 BP_DEAD_COMMA
 
 // Fourth row
-#define BP_LEFT_QUOTE           LSFT(ALTGR(BP_Y))       // ‘
+#define BP_LEFT_QUOTE           LSFT(ALGR(BP_Y))        // ‘
 #define BP_LQOT                 BP_LEFT_QUOTE
-#define BP_RIGHT_QUOTE          LSFT(ALTGR(BP_X))       // ’
+#define BP_RIGHT_QUOTE          LSFT(ALGR(BP_X))        // ’
 #define BP_RQOT                 BP_RIGHT_QUOTE
-#define BP_INTERPUNCT           LSFT(ALTGR(BP_DOT))     // ·
+#define BP_INTERPUNCT           LSFT(ALGR(BP_DOT))      // ·
 #define BP_IPCT                 BP_INTERPUNCT
-#define BP_DEAD_HOOK_ABOVE      LSFT(ALTGR(BP_QUESTION))    // dead ̉
+#define BP_DEAD_HOOK_ABOVE      LSFT(ALGR(BP_QUESTION)) // dead ̉
 #define BP_DHKA                 BP_DEAD_HOOK_ABOVE
 #define BP_DEAD_UNDERDOT        LSFT(BP_DEAD_RING)      // dead ̣
 #define BP_DUDT                 BP_DEAD_UNDERDOT
 #define BP_DOUBLE_DAGGER        LSFT(BP_DAGGER)         // ‡
 #define BP_DDGR                 BP_DOUBLE_DAGGER
-#define BP_ORDINAL_INDICATOR_A  LSFT(ALTGR(BP_F))       // ª
+#define BP_ORDINAL_INDICATOR_A  LSFT(ALGR(BP_F))        // ª
 #define BP_ORDA                 BP_ORDINAL_INDICATOR_A
 
 // Space bar
-#define BP_NARROW_NON_BREAKING_SPACE    ALTGR(BP_NON_BREAKING_SPACE)
+#define BP_NARROW_NON_BREAKING_SPACE    ALGR(BP_NON_BREAKING_SPACE)
 #define BP_NNBS                         BP_NARROW_NON_BREAKING_SPACE
 
 #endif
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index fbeef21874..2b5b95d6fa 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -13,19 +13,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef KEYMAP_CANADIAN_MULTILINGUAG_H
-#define KEYMAP_CANADIAN_MULTILINGUAG_H
+#ifndef KEYMAP_CANADIAN_MULTILINGUAL_H
+#define KEYMAP_CANADIAN_MULTILINGUAL_H
 
 #include "keymap.h"
 
-// Alt gr
-#ifndef ALTGR
-#define ALTGR(kc)   ALGR(kc)
-#endif
-
-#define CSA_ALTGR   KC_RALT
-#define CSA_ALGR    CSA_ALTGR
-
 #ifndef GR2A
 #define GR2A(kc)    RCTL(kc)
 #endif
@@ -75,43 +67,43 @@
 
 // Alt Gr-ed characters
 // First row
-#define CSA_PIPE                ALTGR(CSA_SLASH)        // |
-#define CSA_CURRENCY            ALTGR(KC_4)             // ¤
+#define CSA_PIPE                ALGR(CSA_SLASH)         // |
+#define CSA_CURRENCY            ALGR(KC_4)              // ¤
 #define CSA_CURR                CSA_CURRENCY
-#define CSA_LEFT_CURLY_BRACE    ALTGR(KC_7)             // {
+#define CSA_LEFT_CURLY_BRACE    ALGR(KC_7)              // {
 #define CSA_LCBR                CSA_LEFT_CURLY_BRACE
-#define CSA_RIGHT_CURLY_BRACE   ALTGR(KC_8)             // }
+#define CSA_RIGHT_CURLY_BRACE   ALGR(KC_8)              // }
 #define CSA_RCBR                CSA_RIGHT_CURLY_BRACE
-#define CSA_LBRACKET            ALTGR(KC_9)             // [
+#define CSA_LBRACKET            ALGR(KC_9)              // [
 #define CSA_LBRC                CSA_LBRACKET
-#define CSA_RBRACKET            ALTGR(KC_0)             // ]
+#define CSA_RBRACKET            ALGR(KC_0)              // ]
 #define CSA_RBRC                CSA_RBRACKET
-#define CSA_NEGATION            ALTGR(KC_EQUAL)         // ¬
+#define CSA_NEGATION            ALGR(KC_EQUAL)          // ¬
 #define CSA_NEGT                CSA_NEGATION
 
 // Second row
 // euro symbol not available on Linux? (X.org)
-#define CSA_EURO        ALTGR(KC_E)                 // €
-#define CSA_DEAD_GRAVE  ALTGR(CSA_DEAD_CIRCUMFLEX)
+#define CSA_EURO        ALGR(KC_E)                  // €
+#define CSA_DEAD_GRAVE  ALGR(CSA_DEAD_CIRCUMFLEX)
 #define CSA_DGRV        CSA_DEAD_GRAVE              // dead `
-#define CSA_DEAD_TILDE  ALTGR(CSA_C_CEDILLA)        // ~
+#define CSA_DEAD_TILDE  ALGR(CSA_C_CEDILLA)         // ~
 #define CSA_DTLD        CSA_DEAD_TILDE
 
 // Third row
-#define CSA_DEGREE  ALTGR(KC_SCOLON)    // °
+#define CSA_DEGREE  ALGR(KC_SCOLON)     // °
 #define CSA_DEGR    CSA_DEGREE
 
 // Fourth row
-#define CSA_LEFT_GUILLEMET      ALTGR(KC_Z)         // «
+#define CSA_LEFT_GUILLEMET      ALGR(KC_Z)          // «
 #define CSA_LGIL                CSA_LEFT_GUILLEMET
-#define CSA_RIGHT_GUILLEMET     ALTGR(KC_X)         // »
+#define CSA_RIGHT_GUILLEMET     ALGR(KC_X)          // »
 #define CSA_RGIL                CSA_RIGHT_GUILLEMET
-#define CSA_LESS                ALTGR(KC_COMMA)     // <
-#define CSA_GREATER             ALTGR(KC_DOT)       // >
+#define CSA_LESS                ALGR(KC_COMMA)      // <
+#define CSA_GREATER             ALGR(KC_DOT)        // >
 #define CSA_GRTR                CSA_GREATER
 
 // Space bar
-#define CSA_NON_BREAKING_SPACE  ALTGR(KC_SPACE)
+#define CSA_NON_BREAKING_SPACE  ALGR(KC_SPACE)
 #define CSA_NBSP                CSA_NON_BREAKING_SPACE
 
 // GR2A-ed characters
@@ -198,7 +190,7 @@
 // nothing on 2
 #define CSA_POUND               GR2A(LSFT(KC_3))    // £
 #define CSA_GBP                 CSA_POUND_SIGN
-// already on ALTGR(KC_E)
+// already on ALGR(KC_E)
 #define CSA_EURO_BIS            GR2A(LSFT(KC_4))    // €
 #define CSA_EURB                CSA_EURO_BIS
 #define CSA_THREE_EIGHTHS       GR2A(LSFT(KC_5))    // ⅜
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h
index 4eeca7209f..69f9547bb9 100644
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -18,9 +18,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define FR_CH_ALGR KC_RALT
-
 // normal characters
 #define FR_CH_Z KC_Y
 #define FR_CH_Y KC_Z
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index d2de859ee7..bef7754707 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -18,9 +18,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define FR_ALGR KC_RALT
-
 // Normal characters
 #define FR_SUP2	KC_GRV
 #define FR_AMP	KC_1
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index a215570fd3..0ba3570df7 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -19,9 +19,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define DE_ALGR KC_RALT
-
 // normal characters
 #define DE_Z KC_Y
 #define DE_Y KC_Z
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index f0376a17c0..bd1ef89a19 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -18,9 +18,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define CH_ALGR KC_RALT
-
 // normal characters
 #define CH_Z KC_Y
 #define CH_Y KC_Z
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index cd2dc94cfe..ff43535f38 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -19,9 +19,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define HU_ALGR KC_RALT
-
 // basic letters
 #define HU_Z KC_Y
 #define HU_Y KC_Z
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index f629081507..fe0f5eb847 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -19,13 +19,7 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define IT_ALGR KC_RALT
-
 // normal characters
-
-
-
 #define IT_A KC_A
 #define IT_B KC_B
 #define IT_C KC_C
diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index 174f4a6eec..818a739c76 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@@ -73,6 +73,6 @@
 #define NEO_L1_R DE_HASH
 
 #define NEO_L2_L DE_LESS
-#define NEO_L2_R DE_ALGR
+#define NEO_L2_R KC_ALGR
 
 #endif
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 4210d37145..551a4212b2 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -18,9 +18,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define NO_ALGR KC_RALT
-
 // Normal characters
 #define NO_HALF	KC_GRV
 #define NO_PLUS	KC_MINS
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index 47f5bceed2..892283e702 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -20,9 +20,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define SI_ALGR KC_RALT
-
 //Swapped Z and Y
 #define SI_Z KC_Y
 #define SI_Y KC_Z
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index 19d12551a6..1f183327f9 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -18,9 +18,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define ES_ALGR KC_RALT
-
 // Normal characters
 #define ES_OVRR KC_GRV
 #define ES_APOS	KC_MINS
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index a7bcd697e0..cc3d0039e2 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -18,9 +18,6 @@
 
 #include "keymap.h"
 
-// Alt gr
-#define UK_ALGR KC_RALT
-
 // Normal characters
 #define UK_HASH KC_NUHS
 #define UK_BSLS	KC_NUBS
diff --git a/users/spacebarracecar/spacebarracecar.c b/users/spacebarracecar/spacebarracecar.c
index f7048869ed..130d7dc2d4 100644
--- a/users/spacebarracecar/spacebarracecar.c
+++ b/users/spacebarracecar/spacebarracecar.c
@@ -211,11 +211,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       timer_timeout();
       if (lshift || rshift){
         unregister_code(KC_LSFT);
-        register_code(DE_ALGR);
+        register_code(KC_ALGR);
         unregister_code(DE_PLUS);
         register_code(DE_PLUS);
         unregister_code(DE_PLUS);
-        unregister_code(DE_ALGR);
+        unregister_code(KC_ALGR);
         register_code(KC_LSFT);
       } else {
         register_code(KC_LSFT);
diff --git a/users/spacebarracecar/spacebarracecar.h b/users/spacebarracecar/spacebarracecar.h
index 035c1ac790..d0259b73cc 100644
--- a/users/spacebarracecar/spacebarracecar.h
+++ b/users/spacebarracecar/spacebarracecar.h
@@ -192,7 +192,7 @@ return false;
 if (record->event.pressed) { \
   timer_timeout(); \
   unregister_code(KC_LSFT); \
-  register_code(DE_ALGR); \
+  register_code(KC_ALGR); \
   if (lshift || rshift) { \
     unregister_code(kc2); \
     register_code(kc2); \
@@ -203,7 +203,7 @@ if (record->event.pressed) { \
     register_code(kc1); \
     unregister_code(kc1); \
   } \
-  unregister_code(DE_ALGR); \
+  unregister_code(KC_ALGR); \
 } \
 return false;
 
-- 
cgit v1.2.3