diff --git a/modules/applications/darwin.nix b/modules/applications/darwin.nix
index 95ae8ac..33ad5af 100644
--- a/modules/applications/darwin.nix
+++ b/modules/applications/darwin.nix
@@ -23,7 +23,7 @@
     { spacer.small = true; }
 
     "/Applications/Nix Apps/Audacity.app"
-    "/Applications/Affinity Photo 2.app"
+    "/Applications/Affinity.app"
     "/Applications/GIMP.app"
     "/Applications/Krita.app"
 #    "/Applications/Blender.app"
@@ -45,7 +45,7 @@
       "signal"
       "soulseek"
       "musicbrainz-picard"
-      "affinity-photo"
+      "affinity"
 
       "the-unarchiver"
       "linearmouse"
diff --git a/stow/.config/matugen/templates/jankyborders.sh b/stow/.config/matugen/templates/jankyborders.sh
index e472495..29aead7 100644
--- a/stow/.config/matugen/templates/jankyborders.sh
+++ b/stow/.config/matugen/templates/jankyborders.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-borders active_color=0xFF{{colors.primary.default.hex_stripped}} inactive_color=0xFF{{colors.surface_dim.default.hex_stripped}} width=6.0
+killall borders
 
 if [ "{{custom.rounding}}" = 0 ]; then
-  borders style=square
+  nohup borders active_color=0xFF{{colors.primary.default.hex_stripped}} inactive_color=0xFF{{colors.surface_dim.default.hex_stripped}} width=6.0 style=square > /dev/null &
 else
-  borders style=round
+  nohup borders active_color=0xFF{{colors.primary.default.hex_stripped}} inactive_color=0xFF{{colors.surface_dim.default.hex_stripped}} width=6.0 style=round > /dev/null &
 fi
+
+exit
diff --git a/stow/.config/yabai/yabairc b/stow/.config/yabai/yabairc
index c150fe3..5aadcbb 100644
--- a/stow/.config/yabai/yabairc
+++ b/stow/.config/yabai/yabairc
@@ -4,18 +4,20 @@
 yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
 sudo yabai --load-sa
 
-
-# Remove existing signals (in case of restart)
-yabai -m signal --remove "sketchybar_space_change" 2>/dev/null
-yabai -m signal --remove "sketchybar_front_app" 2>/dev/null
-
 # Sketchybar Intergration
-yabai -m signal --add event=space_changed action="sketchybar --trigger space_change" label="sketchybar_space_change"
-yabai -m signal --add event=window_focused action="sketchybar --trigger front_app_switched" label="sketchybar_front_app"
+if command -v "sketchybar"; then
+  yabai -m config menubar_opacity 0.0
+  sketchybar & disown
+  yabai -m signal --remove "sketchybar_space_change" 2>/dev/null
+  yabai -m signal --remove "sketchybar_front_app" 2>/dev/null
+
+  # Remove existing signals (in case of restart)
+  yabai -m signal --add event=space_changed action="sketchybar --trigger space_change" label="sketchybar_space_change"
+  yabai -m signal --add event=window_focused action="sketchybar --trigger front_app_switched" label="sketchybar_front_app"
+fi
 
 # autostart
-sketchybar & disown
-borders & disown
+borders active_color=0xfff74f9e inactive_color=0xffffa8f1 width=6.0 & disown
 sh ~/.cache/matugen-jankyborders.sh & disown
 skhd & disown