diff --git a/keyboards/crkbd/keymaps/allemangd/keymap.c b/keyboards/crkbd/keymaps/allemangd/keymap.c
index be231086276..18f4710a844 100644
--- a/keyboards/crkbd/keymaps/allemangd/keymap.c
+++ b/keyboards/crkbd/keymaps/allemangd/keymap.c
@@ -24,30 +24,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
 [_DVORAK] = UNWRAP_LAYOUT(
    KC_TAB, __DVORAK_L1________________________________,                      __DVORAK_R1________________________________, KC_BSPC,
    KC_ESC, __DVORAK_L2________________________________,                      __DVORAK_R2________________________________, KC_MINS,
   KC_LSFT, __DVORAK_L3________________________________,                      __DVORAK_R3________________________________, KC_RSFT,
-                                      KC_LCTL, ET_LWER, DL_LALT,    IN_RALT, SP_RAIS, AP_RCTL
+                                       KC_DEL, TL_LOWR,  KC_ENT,     KC_SPC, TL_UPPR,  KC_APP
 ),
+
 [_LOWER] = UNWRAP_LAYOUT(
   _______, __LOWER_L1_________________________________,                      __LOWER_R1_________________________________, _______,
   _______, __LOWER_L2_________________________________,                      __LOWER_R2_________________________________, _______,
   _______, __LOWER_L3_________________________________,                      __LOWER_R3_________________________________, _______,
                                       _______, _______, _______,    _______, _______, _______
 ),
+
 [_RAISE] = UNWRAP_LAYOUT(
    KC_GRV, __RAISE_L1_________________________________,                      __RAISE_R1_________________________________, _______,
   _______, __RAISE_L2_________________________________,                      __RAISE_R2_________________________________, _______,
   _______, __RAISE_L3_________________________________,                      __RAISE_R3_________________________________, _______,
                                       _______, _______, _______,    _______, _______, _______
 ),
+
 [_ADJUST] = UNWRAP_LAYOUT(
   QK_MAKE, __ADJUST_L1________________________________,                      __ADJUST_R1________________________________, QK_BOOT,
   KC_VRSN, __ADJUST_L2________________________________,                      __ADJUST_R2________________________________, KC_PSCR,
   _______, __ADJUST_L3________________________________,                      __ADJUST_R3________________________________, _______,
                                       _______, _______, _______,    _______, _______, _______
 ),
+
 };
 // clang-format on
 
diff --git a/users/allemangd/allemangd.h b/users/allemangd/allemangd.h
index b37ca25cbb3..24e60c5e588 100644
--- a/users/allemangd/allemangd.h
+++ b/users/allemangd/allemangd.h
@@ -8,9 +8,9 @@
 
 enum userspace_layers {
     _DVORAK = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
+    _LOWER = 1,
+    _RAISE = 2,
+    _ADJUST = 3,
     _MOUSE,
 };
 
@@ -35,21 +35,23 @@ bool vrsn(void);
 
 // clang-format off
 
-// todo LGUI_T in DVORAK_L3, DVORAK_R3
-
 #define __BLANK____________________________________  _______, _______, _______, _______, _______
 
-#define LG_SCLN  LGUI_T(KC_SCLN)
-#define RG_Z     RGUI_T(KC_Z)
+#define LC_SCLN LCTL_T(KC_SCLN)
+#define LG_Q    LGUI_T(KC_Q)
+#define LA_X    LALT_T(KC_X)
 
+#define RA_B    RALT_T(KC_B)
+#define RG_V    RGUI_T(KC_V)
+#define RC_Z    RCTL_T(KC_Z)
 
 #define __DVORAK_L1________________________________  KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y
 #define __DVORAK_L2________________________________     KC_A,    KC_O,    KC_E,    KC_U,    KC_I
-#define __DVORAK_L3________________________________  LG_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X
+#define __DVORAK_L3________________________________  LC_SCLN,    LG_Q,    KC_J,    KC_K,    LA_X
 
 #define __DVORAK_R1________________________________     KC_F,    KC_G,    KC_C,    KC_R,    KC_L
 #define __DVORAK_R2________________________________     KC_D,    KC_H,    KC_T,    KC_N,    KC_S
-#define __DVORAK_R3________________________________     KC_B,    KC_M,    KC_W,    KC_V,    RG_Z
+#define __DVORAK_R3________________________________     RA_B,    KC_M,    KC_W,    RG_V,    RC_Z
 
 
 #define __LOWER_L1_________________________________     KC_1,    KC_2,    KC_3,    KC_4,    KC_5
@@ -65,8 +67,8 @@ bool vrsn(void);
 #define __RAISE_L2_________________________________  KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_CIRC
 #define __RAISE_L3_________________________________  __BLANK____________________________________
 
-#define __RAISE_R1_________________________________  _______, _______,   KC_UP, _______, _______
-#define __RAISE_R2_________________________________  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______
+#define __RAISE_R1_________________________________   KC_APP, _______,   KC_UP, _______, _______
+#define __RAISE_R2_________________________________   KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, _______
 #define __RAISE_R3_________________________________  __BLANK____________________________________
 
 
diff --git a/users/allemangd/rules.mk b/users/allemangd/rules.mk
index 83e271599fa..cf9646ee809 100644
--- a/users/allemangd/rules.mk
+++ b/users/allemangd/rules.mk
@@ -20,3 +20,5 @@ SWAP_HANDS_ENABLE = no
 RGB_MATRIX_ENABLE = no
 HAPTIC_ENABLE = no
 SLEEP_LED_ENABLE = no
+
+TRI_LAYER_ENABLE = yes
\ No newline at end of file