diff --git a/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev1_via.hex b/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev1_via.hex
index 7a672147..a78e9dc9 100644
--- a/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev1_via.hex
+++ b/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev1_via.hex
@@ -39,11 +39,11 @@
 :100260000B0C0D0E0F101112131415161718191A66
 :100270001B1C1D2F3130354C2B0014001A000800B8
 :10028000150017001C0018000C00120013002A00B3
-:10029000290004001600070009000A000B000D00E9
+:10029000E00004001600070009000A000B000D0032
 :1002A0000E000F0033003400E1001D001B000600AB
 :1002B0001900050011001000360037003800E50075
-:1002C0000000E000E300E200777C2C002800787C4E
-:1002D000E600E700E400000001001E001F0020000F
+:1002C0002900E000E300E200777C2C002800787C25
+:1002D000E600E700E400290001001E001F002000E6
 :1002E00021002200230024002500260027002A00E8
 :1002F000010000000000000000000000500051005C
 :1003000052004F000000000001000000000000004B
diff --git a/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev2_via.uf2 b/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev2_via.uf2
index 501d7a1d..fe5cb6d0 100644
Binary files a/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev2_via.uf2 and b/keyboards/cornelius/qmk/qmk_firmware/.build/cornelius_rev2_via.uf2 differ
diff --git a/keyboards/cornelius/qmk/qmk_firmware/keymaps/default/keymap.c b/keyboards/cornelius/qmk/qmk_firmware/keymaps/default/keymap.c
index 1bb5bb9d..239833cc 100644
--- a/keyboards/cornelius/qmk/qmk_firmware/keymaps/default/keymap.c
+++ b/keyboards/cornelius/qmk/qmk_firmware/keymaps/default/keymap.c
@@ -18,9 +18,9 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,   KC_P,  KC_BSPC,
-      KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L, KC_SCLN, KC_QUOT,
+     KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L, KC_SCLN, KC_QUOT,
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,  KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-     XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT,   MO(1),  KC_SPC,  KC_ENT,   MO(2),  KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX
+      KC_ESC, KC_LCTL, KC_LGUI, KC_LALT,   MO(1),  KC_SPC,  KC_ENT,   MO(2),  KC_RALT, KC_RGUI, KC_RCTL,  KC_ESC
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/cornelius/qmk/qmk_firmware/keymaps/via/keymap.c b/keyboards/cornelius/qmk/qmk_firmware/keymaps/via/keymap.c
index ac6bac29..10a569a7 100644
--- a/keyboards/cornelius/qmk/qmk_firmware/keymaps/via/keymap.c
+++ b/keyboards/cornelius/qmk/qmk_firmware/keymaps/via/keymap.c
@@ -18,9 +18,9 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,   KC_P,  KC_BSPC,
-      KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L, KC_SCLN, KC_QUOT,
+     KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L, KC_SCLN, KC_QUOT,
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,  KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-     XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR,  KC_SPC,  KC_ENT, TL_UPPR,  KC_RALT, KC_RGUI, KC_RCTL, XXXXXXX
+      KC_ESC, KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR,  KC_SPC,  KC_ENT, TL_UPPR,  KC_RALT, KC_RGUI, KC_RCTL,  KC_ESC
   ),
 
   [1] = LAYOUT(
diff --git a/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_mini_via.uf2 b/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_mini_via.uf2
index f558d0ac..2c2d6461 100644
Binary files a/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_mini_via.uf2 and b/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_mini_via.uf2 differ
diff --git a/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.hex b/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.hex
index 020edf9c..09526b29 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.hex
+++ b/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.hex
@@ -3018,28 +3018,28 @@
 :10BC780000000000E300777C2C0000002A0013007D
 :10BC880012000C0018001C00E400340033000F0000
 :10BC98000E000D000B00E6002900380037003600C2
-:10BCA800100011000000000000000000E600787C91
+:10BCA800100011000000000000000000E700787C90
 :10BCB800280000002B001E001F0020002100220089
 :10BCC800E000E00000000000000000000000E200CA
 :10BCD800E10000000000000000000000000000007B
 :10BCE80000000000E30001002C0000002A002700EB
 :10BCF8002600250024002300E400000000004F0077
 :10BD0800520051005000E600000000000000000052
-:10BD1800000000000000000000000000E600010034
+:10BD1800000000000000000000000000E700010033
 :10BD2800280000002B001E021F022002210222020E
 :10BD3800E000E00000000000000000000000E20059
 :10BD4800E10000000000000000000000000000000A
 :10BD580000000000E30001002C0000002A00270278
 :10BD68002602250224022302E400350031003000B7
 :10BD78002F002E002D00E6003502310230022F027E
-:10BD88002E022D020000000000000000E600010065
+:10BD88002E022D020000000000000000E700010064
 :10BD980028000000007C00000000000000000000F7
 :10BDA800000020782378257827780000000000001C
 :10BDB8002178247826782878000000000000000008
 :10BDC80000000000E30001002C000000000000005B
 :10BDD800000000000000000000000000000000005B
 :10BDE800000000000000000000000000000000004B
-:10BDF800000000000000000000000000E600010054
+:10BDF800000000000000000000000000E700010053
 :10BE0800280000004C617965723A2000446566613B
 :10BE1800756C74004C6F77657200526169736500C8
 :10BE280041646A75737400556E6465660078002C09
diff --git a/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.uf2 b/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.uf2
index 0c1db15a..712d0ea6 100644
Binary files a/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.uf2 and b/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.uf2 differ
diff --git a/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c b/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c
index 5bdac121..63815dbe 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c
+++ b/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------'  `--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------+--------.  ,--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, TL_LOWR,  KC_SPC,     KC_ENT, TL_UPPR, KC_RALT
+                                          KC_LGUI, TL_LOWR,  KC_SPC,     KC_ENT, TL_UPPR, KC_RGUI
                                       //`--------------------------'  `--------------------------'
 
   ),
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------'  `--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------.  ,--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RGUI
                                       //`--------------------------'  `--------------------------'
   ),
 
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------'  `--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
   //|--------+--------+--------+--------+--------+--------+--------.  ,--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RGUI
                                       //`--------------------------'  `--------------------------'
   ),
 
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------+--------'  `--------+--------+--------+--------+--------+--------+--------|
       RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------.  ,--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RGUI
                                       //`--------------------------'  `--------------------------'
   )
 };