diff --git a/home-manager/all.nix b/home-manager/all.nix
index 1f08283..de8a12d 100644
--- a/home-manager/all.nix
+++ b/home-manager/all.nix
@@ -111,6 +111,10 @@
       bind -n C-j select-pane -D
       bind -n C-k select-pane -U
       bind -n C-l select-pane -R
+      bind -n M-h select-pane -L
+      bind -n M-j select-pane -D
+      bind -n M-k select-pane -U
+      bind -n M-l select-pane -R
   
       # Set status bar postition
       set -g status-position top
diff --git a/home-manager/dots/bspwm/bspwmrc b/home-manager/dots/bspwm/bspwmrc
index 853e61e..562da84 100755
--- a/home-manager/dots/bspwm/bspwmrc
+++ b/home-manager/dots/bspwm/bspwmrc
@@ -1,21 +1,26 @@
 #! /bin/sh
 
+# Monitors
 bspc monitor DP-1 -d 1 2 3 4 5
 bspc monitor DP-2 -d 6 7 8 9 0
 
-bspc config border_width 1
+# Behavior
+bspc config automatic_scheme alternate
+bspc config split_ratio          0.6
 bspc config focus_follows_pointer true
 bspc config pointer_follows_focus false
 
+# Style
+bspc config border_width 1
 bspc config top_padding 0
 bspc config window_gap 24
-bspc config split_ratio          0.55
 bspc config borderless_monocle   false
 bspc config gapless_monocle      false
 bspc config focused_border_color '#bd93f9'
 bspc config normal_border_color '#282a36'
 bspc config presel_feedback_color '#282a36'
 
+# Rules
 bspc rule -a Wrapper-2.0 \
 	state=floating border=off focus=on
 bspc rule -a mpv \
diff --git a/hosts/buckwheat/configuration.nix b/hosts/buckwheat/configuration.nix
index f6869f5..5b1f0e5 100644
--- a/hosts/buckwheat/configuration.nix
+++ b/hosts/buckwheat/configuration.nix
@@ -39,8 +39,8 @@ in
     # };
   };
   users.users.${user.name} = {
-    extraGroups = [ "libvirtd" "transmission" "davfs2" ];
-    packages = [
+    extraGroups = [ "davfs2" "libvirtd" "transmission" ];
+    packages = with pkgs; [
       mixxx
       virt-manager
     ];
diff --git a/hosts/fireweed/configuration.nix b/hosts/fireweed/configuration.nix
index 0032e7c..0eedfbf 100644
--- a/hosts/fireweed/configuration.nix
+++ b/hosts/fireweed/configuration.nix
@@ -40,7 +40,7 @@ in
   };
   users.users.${user.name} = {
     extraGroups = [ "davfs2" ];
-    packages = [
+    packages = with pkgs; [
     ];
   };
   services = {
diff --git a/nixos/all.nix b/nixos/all.nix
index bc63ffd..9c3ded1 100644
--- a/nixos/all.nix
+++ b/nixos/all.nix
@@ -110,11 +110,17 @@
     ];
   };
   system = {
-    autoUpgrade = {
-      enable = true;
-      allowReboot = false;
-      channel = "https://channels.nixos.org/nixos-unstable";
-    };
+    #autoUpgrade = {
+    #  enable = true;
+    #  allowReboot = false;
+    #  channel = "https://channels.nixos.org/nixos-unstable";
+    #  flake = "<git repo url>";
+    #  flags = [
+    #  "--update-input"
+    #  "nixpkgs"
+    #  "--commit-lockfile"
+    #  ];
+    #};
     stateVersion = "22.11";
   };
 }
diff --git a/nixos/cli.nix b/nixos/cli.nix
index 0f30815..b342df6 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -72,7 +72,7 @@
     catgirl
     cava
     cifs-utils
-    cmus
+    #cmus
     curlie
     dig
     dogdns
@@ -103,8 +103,9 @@
     pdfgrep
     profanity
     recutils
-    surfraw
+    sc-im
     ssss
+    surfraw
     tut
     unrar
     unzip