diff --git a/lib/MouseBindings.hs b/lib/MouseBindings.hs
index 7229a2f..894026e 100644
--- a/lib/MouseBindings.hs
+++ b/lib/MouseBindings.hs
@@ -9,4 +9,3 @@ modify :: XConfig l -> XConfig l
 modify conf = conf
   { logHook = logHook conf >> updatePointer (0.5,0.5) (0,0)
   }
-
diff --git a/lib/Projects.hs b/lib/Projects.hs
index ab7c5fe..eb3885c 100644
--- a/lib/Projects.hs
+++ b/lib/Projects.hs
@@ -46,7 +46,6 @@ projects =
   , singleAppWithName "element" "element-desktop"
   , singleAppWithName "signal" "signal-desktop"
   , singleAppWithName "vcv" "Rack"
-  , singleAppWithName "wire" "wire-desktop"
   , singleTermAppWithName "email" "neomutt"
   , Project { projectName = "admin"
             , projectDirectory = "~/admin/nixos-config"
diff --git a/xmonad.hs b/xmonad.hs
index e7b034f..66ef284 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -11,7 +11,7 @@ import XMonad.Hooks.DynamicLog
 --import XMonad.Hooks.EwmhDesktops (ewmh, ewmhFullscreen)
 import XMonad.Hooks.EwmhDesktops (ewmh)
 import XMonad.Hooks.ManageHelpers
-import XMonad.Layout.NoBorders (noBorders, smartBorders)
+import XMonad.Layout.NoBorders (noBorders, smartBorders, hasBorder, BorderMessage (HasBorder))
 import XMonad.Layout.ResizableTile (ResizableTall(..))
 import XMonad.Layout.Spacing
 import XMonad.Layout.ToggleLayouts (toggleLayouts)
@@ -39,15 +39,10 @@ layouts = toggleLayouts fullscreen    tiled
 -------------- Here be the law of windows
 myManageHook = composeOne
   [ className =? "Pavucontrol"          -?> doShift "music"
-  , className =? "Pinentry"             -?> doFloat
   , className =? "Steam"                -?> doShift "steam"
-  , className =? "VirtualBox"           -?> doFloat
-  , className =? "csgo_linux64"         -?> doShift "csgo"
-  , className =? "mpv"                  -?> doFullFloat <+> (doShift "flims")
-  , className =? "qemu-system-x86_64"   -?> doFloat
-  , className =? "qutebrowser"          -?> doShift "web"
-  , appName   =? "Wine System Tray"     -?> doShift "wine-tray"
-  , className =? "battle.net.exe"       -?> doShift "battlenet"
+  , className =? "Renoise"              -?> hasBorder False
+  , className =? "REAPER"               -?> hasBorder False
+  , className =? "Pinentry"             -?> doCenterFloat
   , isDialog                            -?> doCenterFloat
 
     -- Move transient windows to their parent:
@@ -62,7 +57,7 @@ withConfig =
     $ Mouse.modify      -- Apply mouse bindings config
     $ Scratchpad.modify -- Apply scratchpad managehook config
     $ desktopConfig     --   on a default desktop config
-    { manageHook         = myManageHook <+> manageHook desktopConfig
+    { manageHook         = myManageHook
     , layoutHook         = desktopLayoutModifiers layouts
     , terminal           = "/home/eeva/.nix-profile/bin/alacritty"
     , normalBorderColor  = N.backgroundhl