diff --git a/config/swiftbar/bin/mpd-control.1h.zsh b/config/bitbar/bin/mpd-control.1h.zsh
similarity index 100%
rename from config/swiftbar/bin/mpd-control.1h.zsh
rename to config/bitbar/bin/mpd-control.1h.zsh
diff --git a/config/swiftbar/bin/taskpaper-ecoach.10s.py b/config/bitbar/bin/taskpaper-ecoach.10s.py
similarity index 100%
rename from config/swiftbar/bin/taskpaper-ecoach.10s.py
rename to config/bitbar/bin/taskpaper-ecoach.10s.py
diff --git a/config/swiftbar/bin/taskpaper-personal.10s.py b/config/bitbar/bin/taskpaper-personal.10s.py
similarity index 100%
rename from config/swiftbar/bin/taskpaper-personal.10s.py
rename to config/bitbar/bin/taskpaper-personal.10s.py
diff --git a/config/swiftbar/bin/yabai.1s.zsh b/config/bitbar/bin/yabai.1s.zsh
similarity index 100%
rename from config/swiftbar/bin/yabai.1s.zsh
rename to config/bitbar/bin/yabai.1s.zsh
diff --git a/config/swiftbar/lib/taskpaper/__init__.py b/config/bitbar/lib/taskpaper/__init__.py
similarity index 100%
rename from config/swiftbar/lib/taskpaper/__init__.py
rename to config/bitbar/lib/taskpaper/__init__.py
diff --git a/config/swiftbar/lib/taskpaper/default.png b/config/bitbar/lib/taskpaper/default.png
similarity index 100%
rename from config/swiftbar/lib/taskpaper/default.png
rename to config/bitbar/lib/taskpaper/default.png
diff --git a/config/swiftbar/lib/taskpaper/ecoach.png b/config/bitbar/lib/taskpaper/ecoach.png
similarity index 100%
rename from config/swiftbar/lib/taskpaper/ecoach.png
rename to config/bitbar/lib/taskpaper/ecoach.png
diff --git a/config/skhd/skhdrc b/config/skhd/skhdrc
index 870a886..6e88c82 100644
--- a/config/skhd/skhdrc
+++ b/config/skhd/skhdrc
@@ -151,5 +151,3 @@ rctrl - d : yabai -m space --layout float
 play   : mpc toggle
 rewind : mpc cdprev
 fast   : mpc next
-
-rctrl - b : /usr/local/bin/hs -c 'stackline.config:toggle("appearance.showIcons")'
diff --git a/config/swiftbar/bin/.gitignore b/config/swiftbar/bin/.gitignore
deleted file mode 100644
index eaf4ab0..0000000
--- a/config/swiftbar/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.repository.json
diff --git a/config/yabai/yabairc b/config/yabai/yabairc
index 4544b0d..1326f4d 100755
--- a/config/yabai/yabairc
+++ b/config/yabai/yabairc
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
-sudo yabai --load-sa
 
 # global settings
 yabai -m config mouse_follows_focus          on
diff --git a/local/bin/mpd-notify-bitbar b/local/bin/mpd-notify-bitbar
index 976577e..96212ff 100755
--- a/local/bin/mpd-notify-bitbar
+++ b/local/bin/mpd-notify-bitbar
@@ -1,4 +1,4 @@
 #!/bin/bash
 while mpc idle; do
-	open swiftbar://refreshplugin?name=mpd-control
+	open -g bitbar://refreshPlugin?name=mpd*
 done