diff --git a/system/darwin/jankyborders.nix b/system/darwin/jankyborders.nix
index 2c564ad..657d2d4 100644
--- a/system/darwin/jankyborders.nix
+++ b/system/darwin/jankyborders.nix
@@ -1,5 +1,32 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
+let
+  pkg = pkgs.jankyborders;
+
+  borders-config = [
+    "style=round"
+    "active_color=0xaaabb2bf"
+    "inactive_color=0xdd282a36"
+    "width=5.0"
+    "blur_radius=15.0"
+    "hidpi=on"
+    "ax_focus=on"
+  ];
+in
 {
-  environment.systemPackages = [ pkgs.jankyborders ];
+  environment.systemPackages = [ pkg ];
+
+  launchd.user.agents.jankyborders = {
+    serviceConfig = {
+      ProgramArguments = [ "${pkg}/bin/borders" ] ++ borders-config;
+
+      KeepAlive = true;
+      RunAtLoad = true;
+      ProcessType = "Interactive";
+      EnvironmentVariables = {
+        PATH = "${pkg}/bin:${config.environment.systemPath}";
+        LANG = "en_US.UTF-8";
+      };
+    };
+  };
 }
diff --git a/system/darwin/yabai.nix b/system/darwin/yabai.nix
index 15527da..2cdb621 100644
--- a/system/darwin/yabai.nix
+++ b/system/darwin/yabai.nix
@@ -5,7 +5,7 @@ let
   yabai-bin = "${yabai-pkg}/bin/yabai";
   jq-bin = "${pkgs.jq}/bin/jq";
 
-  window_padding = 5;
+  window_padding = 8;
 
   native-tab-apps = [ "Finder" "TablePlus" ];
 
@@ -13,6 +13,7 @@ let
     "Dash"
     "Dato"
     "IINA"
+    "LaunchBar"
     "Mona"
     "System.*einstellungen"
   ];
@@ -85,9 +86,12 @@ in
     };
 
     extraConfig = (lib.strings.concatMapStrings (app: "yabai -m rule --add app='^${app}$' manage=off\n") unmanaged-apps) + ''
+      # Float specific app windows
+      yabai -m rule --add app="^Finder$" title="^Infos zu|^Kopieren" manage=off
+
       # Auto-float certain windows
       yabai -m signal --add event=window_created action='
-        yabai -m query --windows --window $YABAI_WINDOW_ID | ${jq-bin} -er ".\"can-resize\" or .\"is-floating\"" || \
+        yabai -m query --windows --window $YABAI_WINDOW_ID | ${jq-bin} -er ".\"can-resize\"" || \
         yabai -m window $YABAI_WINDOW_ID --toggle float
       '