diff --git a/zegonix/configs/envoy/keymaps/quaken/keymap.c b/zegonix/configs/envoy/keymaps/quaken/keymap.c
index a329853..7f632c1 100644
--- a/zegonix/configs/envoy/keymaps/quaken/keymap.c
+++ b/zegonix/configs/envoy/keymaps/quaken/keymap.c
@@ -59,7 +59,7 @@ KC_LCTL,   KC_LGUI,   KC_LALT,                                    KC_SPC,
 // gaming layer
 [_GAME] = LAYOUT_65_ansi_blocker(
 KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,   KC_DEL,
-KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_BSLS,   KC_BSLS,   KC_BSLS,   KC_PGUP,
+KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_BSLS,   KC_PGUP,
 MO(_DIV),  KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,       KC_ENT,           KC_PGDN,
 KC_LSFT,   KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,        KC_RSFT,         KC_UP,     KC_END,
 KC_LCTL,   KC_LGUI,   KC_LALT,                                    KC_SPC,                          MO(_NAV),  KC_LCTL,              KC_LEFT,   KC_DOWN,   KC_RGHT
@@ -67,7 +67,7 @@ KC_LCTL,   KC_LGUI,   KC_LALT,                                    KC_SPC,
 
 // navigation layer
 [_NAV] = LAYOUT_65_ansi_blocker(
-KC_GRV,    KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    _______,   QK_BOOT,
+KC_GRV,    KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    _______,   _______,
 _______,   _______,   KC_HOME,   KC_UP,     KC_END,    KC_PGUP,   _______,   KC_MPRV,   KC_MPLY,   KC_MNXT,   _______,   _______,   _______,   _______,   _______,
 _______,   _______,   KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_PGDN,   _______,   KC_LCTL,   KC_LSFT,   KC_LALT,   KC_LGUI,   _______,        _______,         _______,
 _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,        _______,         _______,   _______,
@@ -78,8 +78,8 @@ _______,   _______,   _______,                                    _______,
 [_DIV] = LAYOUT_65_ansi_blocker(
 RGB_TOG,   KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    _______,   _______,
 _______,   _______,   _______,   _______,   _______,   DF(_GAME), _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
-_______,   _______,   KC_LALT,   KC_LSFT,   KC_LCTL,   DF(_BASE), KC_DEL,    KC_MINS,   KC_EQL,    KC_LBRC,   KC_RBRC,   _______,        _______,         _______,
+_______,   _______,   KC_LALT,   KC_LSFT,   KC_LCTL,   DF(_BASE), KC_DEL,    KC_MINS,   KC_EQL,    KC_LBRC,   KC_RBRC,   KC_BSLS,        _______,         _______,
 _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,        _______,         _______,   _______,
-_______,   _______,   _______,                                    KC_CAPS,                         _______,   _______,              _______,   _______,   _______
+QK_BOOT,   _______,   _______,                                    KC_CAPS,                         _______,   _______,              _______,   _______,   _______
 ),
 };
diff --git a/zegonix/configs/envoy/keymaps/via/keymap.c b/zegonix/configs/envoy/keymaps/via/keymap.c
deleted file mode 100644
index a81d663..0000000
--- a/zegonix/configs/envoy/keymaps/via/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Gondolindrim
- *
- * 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/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_65_ansi_blocker( /* Base */
-    KC_ESC , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_DEL ,
-    KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-    KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , KC_PGDN,
-    KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V  , KC_B    , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END ,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   KC_RALT, MO(1)  , KC_LEFT, KC_DOWN, KC_RGHT
-),
-[1] = LAYOUT_65_ansi_blocker(
-    QK_BOOT, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_MUTE,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
-)
-};
diff --git a/zegonix/configs/envoy/keymaps/via/rules.mk b/zegonix/configs/envoy/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b998..0000000
--- a/zegonix/configs/envoy/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes