diff --git a/firmware/config.h b/firmware/config.h
index a0eb9f6..bd13224 100644
--- a/firmware/config.h
+++ b/firmware/config.h
@@ -5,7 +5,7 @@
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x0000
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Doryan_and_nm17
+#define MANUFACTURER    DlSgv_and_NM17
 #define PRODUCT         Angelwings Keyboard
 #define DESCRIPTION     Split 40 percent ergo-keyboard
 
diff --git a/firmware/keymaps/default/keymap.c b/firmware/keymaps/default/keymap.c
index 2891971..5546350 100644
--- a/firmware/keymaps/default/keymap.c
+++ b/firmware/keymaps/default/keymap.c
@@ -9,8 +9,8 @@ enum layers {
 
 #define KC______ KC_TRNS
 #define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
+#define KC_LOWER KC_LWR
+#define KC_RAISE KC_RSE
 #define KC_LTOG  RGB_TOG
 #define KC_LHUI  RGB_HUI
 #define KC_LHUD  RGB_HUD
@@ -19,12 +19,9 @@ enum layers {
 #define KC_LVAI  RGB_VAI
 #define KC_LVAD  RGB_VAD
 #define KC_LMOD  RGB_MOD
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
+#define KC_LWR MO(_LOWER)
+#define KC_RSE MO(_RAISE)
 #define BSL_RAL MT(MOD_RALT, KC_BSLS)
-
 #define BSP_LSH MT(MOD_LSFT, KC_BSPC)
 #define SPC_RSH MT(MOD_RSFT, KC_SPC)
 #define DEL_RSE LT(_RAISE, KC_DEL)
@@ -56,9 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                         _______, _______, _______,      _______, _______, _______
     ),
     [_ADJUST] = LAYOUT(
-    _______,  _______, KC_ASUP, KC_ASTG, KC_ASDN, KC_WH_U, _______,      _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______,
-    _______,  RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_WH_D, _______,      _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______,
-              RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______,
+    _______,  QK_RBT,  KC_ASUP, KC_ASTG, KC_ASDN, _______, _______,      KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______,
+    _______,  RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,      KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______,
+              RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,      _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______,
                                          _______, _______, _______,      _______, _______, _______
     ),
 };
diff --git a/firmware/keymaps/via/keymap.c b/firmware/keymaps/via/keymap.c
index 9fadbb3..6d1d9aa 100644
--- a/firmware/keymaps/via/keymap.c
+++ b/firmware/keymaps/via/keymap.c
@@ -16,15 +16,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [2] = LAYOUT(
-    _______, KC_NLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      KC_END,  KC_HOME, KC_UP,   KC_PSCR, KC_SLCK, KC_CAPS, _______,
-    KC_VOLU, KC_PEQL, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_APP,  KC_VOLD,
-             _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      _______, KC_END,  _______, KC_PGDN, KC_PAUS, _______,
+    _______, KC_NLCK, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      _______, KC_HOME, KC_END,  KC_PSCR, KC_SLCK, KC_CAPS, _______,
+    KC_VOLU, KC_PEQL, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,      _______, KC_LEFT, KC_UP,   KC_RGHT, KC_INS,  KC_APP,  KC_VOLD,
+             _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PCMM,      _______, KC_END,  KC_DOWN, KC_PGDN, KC_PAUS, _______,
                                         _______, _______, MO(3)  ,      MO(3)  , _______, _______
     ),
     [3] = LAYOUT(
-    _______,  _______, KC_ASUP, KC_ASTG, KC_ASDN, KC_WH_U, _______,      _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______,
-    _______,  RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_WH_D, _______,      _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______,
-              RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______,
+    _______,  _______, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______,      KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______,
+    _______,  RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,      KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______,
+              RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,      _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______,
                                          _______, _______, _______,      _______, _______, _______
     ),
 };
\ No newline at end of file
diff --git a/firmware/rev1/rev1.h b/firmware/rev1/rev1.h
index 7bbabe0..2751bb7 100644
--- a/firmware/rev1/rev1.h
+++ b/firmware/rev1/rev1.h
@@ -7,10 +7,10 @@
 #define XXX KC_NO
 
 #define LAYOUT(\
-    L00, L01, L02, L03, L04, L05, L06,             R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,             R10, R11, R12, R13, R14, R15, R16, \
-         L21, L22, L23, L24, L25, L26,             R20, R21, R22, R23, R24, R25, \
-                             L34, L35, L36,   R30, R31, R32 \
+    L01, L02, L03, L04, L05, L06,   R00, R01, R02, R03, R04, R05, \
+    L11, L12, L13, L14, L15, L16,   R10, R11, R12, R13, R14, R15, \
+    L21, L22, L23, L24, L25, L26,   R20, R21, R22, R23, R24, R25, \
+         L00, L10, L34, L35, L36,   R30, R31, R32, R16, R06 \
  )\
  {\
         {L00, L01, L02, L03, L04, L05, L06}, \