diff --git a/dotfiles/kanata/conf.kbd b/dotfiles/kanata/conf.kbd
index eea2121..8c8c739 100755
--- a/dotfiles/kanata/conf.kbd
+++ b/dotfiles/kanata/conf.kbd
@@ -7,6 +7,9 @@
     macos-dev-names-include (
       "0xD4359520DA829EC8" ;; Macbook keyboard
       "0x2E7E3EBD4C615B55" ;; Karabiner Driver
+      "0x379FD7D8D8AE4ACA" ;; Logitech Wave Keys (Bluetooth)
+      "0x4C044B7D74E4DBB4" ;; Gamestop keeb
+      "0xC7C83E024FB08653" ;; Razer Hunstman V2 TKL
     )
 )
 #|
@@ -44,11 +47,10 @@
     chl    (chord ch l)
     ch_lmet    (chord ch lmet)
     ch_rmet    (chord ch rmet)
-    navlayer (layer-while-held mousenav)
-    vimlayer (layer-while-held vimnav)
+    navlayer (layer-while-held nav)
     hyper  (multi lsft lctl lalt lmet)
     meh    (multi lsft lctl lalt)
-    caps   (tap-hold $tap-time $hold-time (tap-dance 200 ((multi lalt spc) @meh caps)) @navlayer)  
+    caps   (tap-hold $tap-time $hold-time (tap-dance 200 ((multi lctl spc) @meh caps)) @navlayer)  
     a      (tap-hold $tap-time $hold-time a    lctl)
     s      (tap-hold $tap-time $hold-time s    lalt)
     d      (tap-hold $tap-time $hold-time d    lmet)
@@ -74,10 +76,10 @@
 (defchords ch $chord-time
     (w   ) w
     (   e) e
-    (w  e) @hyper 
+    (w  e) XX
     (i   ) i
     (   o) o
-    (i  o) @hyper
+    (i  o) XX
     (s   ) @s
     (   d) @d
     (s  d) ret
@@ -88,8 +90,8 @@
     (k   ) @k
     (   l) @l
     (k  l) bspc
-    (lmet   ) (tap-dance $tap-time (@vimlayer lmet))
-    (   rmet) (tap-dance $tap-time (@navlayer rmet))
+    (lmet   ) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lmet))
+    (   rmet) (tap-dance $tap-time ((multi lsft lctl lalt lmet) lmet))
     (lmet rmet) (tap-hold $tap-time $hold-time @normie (layer-switch base))
 )
 
@@ -101,18 +103,10 @@
     @ch_lmet @spc @ch_rmet
 )
 
-(deflayer mousenav
+(deflayer nav
     _
-    _ mbck (movemouse-up 3 2) mfwd _ _ _ _ _ _
-    (multi lctl lsft tab) (movemouse-left 3 2) (movemouse-down 3 2) (movemouse-right 3 2) (multi lctl tab) _ mlft mmid mrgt _
-    _ _ _ _ _ _ XX XX XX XX
-    _ _ _
-)
-
-(deflayer vimnav
-    _
-    _ _ _ _ _ _ _ _ _ _
-    _ _ _ _ (multi lmet left) left down up right (multi lmet right)
+    mbck (movemouse-up 3 2) mfwd _ _ _ mlft mrgt (mwheel-up 50 120) (mwheel-down 50 120)
+    (movemouse-left 3 2) (movemouse-down 3 2) (movemouse-right 3 2) _ home left down up right end
     _ _ _ _ _ _ _ _ _ _
     _ _ _
 )
@@ -137,7 +131,7 @@
     _
     S-1 S-2 S-3 S-4 S-5 S-6 S-7 S-8 S-9 S-0
     S-\ = - S-= S-- ` S-` S-scln ' S-'
-    _ \ S-[ S-] S-, S-. [ ] S-/ _
+    _ \ S-[ S-] S-, S-. [ ] _ _
     _ _ _
 )
 
@@ -152,7 +146,7 @@
 (deflayer md
     _
     _ _ _ _ _ _ _ _ _ _
-    prev pp next mute ins del vold volu brdn brup
+    prev pp next mute XX XX vold volu brdn brup
     _ _ _ _ _ _ _ _ _ _
     _ _ _
 )
diff --git a/flake.nix b/flake.nix
index b21f4c0..d1336a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,9 +56,8 @@
           "foobar2000"
           "android-platform-tools"
           "zen"
-          "ungoogled-chromium"
-          #"krita"
-          #"sioyek"
+          "krita"
+          "sioyek"
           "shortcat"
           "leader-key"
           "mouseless"