diff --git a/dotfiles/kanata/conf.kbd b/dotfiles/kanata/conf.kbd
index 81876d0..856af3c 100755
--- a/dotfiles/kanata/conf.kbd
+++ b/dotfiles/kanata/conf.kbd
@@ -49,14 +49,14 @@
     navlayer (layer-while-held nav)
     caps   (tap-hold $tap-time $hold-time (tap-dance 200 (esc caps)) @navlayer)  
     ;; Home row mods
-    a      (tap-hold $tap-time $hold-time a    lmet)
+    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    lctl)
+    d      (tap-hold $tap-time $hold-time d    lmet)
     f      (tap-hold $tap-time $hold-time f    lsft)
     j      (tap-hold $tap-time $hold-time j    rsft)
-    k      (tap-hold $tap-time $hold-time k    lctl)
+    k      (tap-hold $tap-time $hold-time k    lmet)
     l      (tap-hold $tap-time $hold-time l    lalt)
-    scln   (tap-hold $tap-time $hold-time scln rmet)
+    scln   (tap-hold $tap-time $hold-time scln rctl)
     ;; Numpad layer
     numpad (layer-while-held num)
     g      (tap-hold $tap-time $hold-time g @numpad) 
diff --git a/flake.nix b/flake.nix
index b3eebf3..d93b825 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,8 +31,6 @@
         neovim # Text editor of choice
         htop # Resource manager
         iina # Media player
-        yabai # Tiling window manager
-        skhd # Hotkey daemon
         # raycast # AI chat/Application launcher/Automation tool
         # kanata # Keyboard remapping tool
       ];
@@ -42,7 +40,6 @@
         taps = [];
         brews = [
           "kanata" 
-          #"hugo"
           "mpv"
           "lua"
           "luarocks"
@@ -59,18 +56,11 @@
           "foobar2000"
           "android-platform-tools"
           "zen"
+          "obs"
+          "krita"
         ];
       };
 
-
-      /*services.yabai = {
-        enable = true;
-        extraConfig = builtins.readFile ./dotfiles/yabai/yabairc;
-      };*/
-      /* services.skhd = {
-        enable = true;
-        skhdConfig = builtins.readFile ./dotfiles/skhd/skhdrc;
-      };*/
       system.primaryUser = "erogers";
       system.defaults = {
         dock.autohide = true;