diff --git a/box_setup b/box_setup
index f849ef5..a610cdd 100755
--- a/box_setup
+++ b/box_setup
@@ -2,8 +2,8 @@
 
 source set_script_env_vars
 source ./src_files/.config/zsh/.zshenv
-./install_programs
 ./make_config_dirs
 ./copy_configs
 source $ZDOTDIR/.zshenv ; source $ZDOTDIR/.zshrc
 ./make_org_structure_dirs
+./install_programs # TODO: moved this to after config copy, but does this work?
diff --git a/installs_and_builds/s06_window_manager b/installs_and_builds/s06_window_manager
index d3e9f20..c3f777e 100755
--- a/installs_and_builds/s06_window_manager
+++ b/installs_and_builds/s06_window_manager
@@ -8,6 +8,11 @@ local linux_wm_and_utils() {
 local macos_wm_and_utils() {
     brew install koekeishiya/formulae/yabai
     brew install koekeishiya/formulae/skhd
+    skhd --start-service
+    yabai --start-service
+    sleep 14 # time to give permission in accessibility settings
+    skhd --restart-service
+    yabai --restart-service
 }
 
 [[ "$BOX_SETUP_OS" = "macos" ]] && macos_wm_and_utils || linux_wm_and_utils
diff --git a/src_files/.config/git/ignore b/src_files/.config/git/ignore
index 6a99f0e..e1e5e0a 100644
--- a/src_files/.config/git/ignore
+++ b/src_files/.config/git/ignore
@@ -1,6 +1,7 @@
 .tool-versions
 *.swp
 *.swo
+.npmrc
 .tmux-session-hydrate
 zxcv*
 .DS_Store
diff --git a/src_files/.config/skhd/skhdrc b/src_files/.config/skhd/skhdrc
index e2367b2..532aacf 100755
--- a/src_files/.config/skhd/skhdrc
+++ b/src_files/.config/skhd/skhdrc
@@ -1,5 +1,8 @@
-# staring file was at /opt/homebrew/opt/yabai/share/yabai/examples
 # list of built-in keywords at https://github.com/koekeishiya/skhd/issues/1
+# staring file was at /opt/homebrew/opt/yabai/share/yabai/examples
+
+##########################################################################################
+# yabai
 
 # in managed mode: swap current window
 shift + cmd - k : yabai -m window --swap north
@@ -24,11 +27,19 @@ shift + cmd - 0 : yabai -m space --balance
 shift + cmd - g : yabai -m space --layout bsp
 # all windows in a space to float and each fill screen
 shift + cmd - f : yabai -m space --layout float \
-                      | yabai -m query --windows --space \
-                      | jq '.[].id' \
-                      | xargs -I % yabai -m window % --grid 1:1:0:0:1:1
+        | yabai -m query --windows --space | jq '.[].id' \
+        | xargs -I % yabai -m window % --grid 1:1:0:0:1:1
 
-# focus on next/previous window
-shift + cmd - n : yabai -m window --focus next
-shift + cmd - p : yabai -m window --focus prev
+# managed layout, focus on next/previous window
+shift + cmd - x : yabai -m window --focus next # TODO: figure out better key option
+shift + cmd - z : yabai -m window --focus prev # TODO: figure out better key option
+# float layout, focus on next/previous window; hacky, but it seems to work for now
+shift + cmd - n : yabai -m query --windows --space | jq '.[].id' | sort | tr "\r\n" " " \
+        | sed "s/\(.*\)/ \1 \n/" \
+        | sed "s/.* $(yabai -m query --windows --window | jq '.id') \([0-9]*\) .*/\1/" \
+        | xargs -I % yabai -m window --focus %
+shift + cmd - p : yabai -m query --windows --space | jq '.[].id' | sort | tr "\r\n" " " \
+        | sed "s/\(.*\)/ \1 \n/" \
+        | sed "s/.* \([0-9]*\) $(yabai -m query --windows --window | jq '.id') .*/\1/" \
+        | xargs -I % yabai -m window --focus %