diff --git a/haskell/xmonad/xmonad.hs b/haskell/xmonad/xmonad.hs
index ef29bb7..5c02930 100644
--- a/haskell/xmonad/xmonad.hs
+++ b/haskell/xmonad/xmonad.hs
@@ -75,9 +75,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
 
 -- TODO: figure out multi screen stuff, including xinerama
 
-------------------------------------------------------------------------
 -- Mouse bindings: default actions bound to mouse events
---
 myMouseBindings (XConfig {XMonad.modMask = modm}) =
   M.fromList
     -- mod-button1, Set the window to floating mode and move by dragging
@@ -134,25 +132,14 @@ myLayout = avoidStruts $ autoChoose ||| threeCol ||| tiled ||| tabbed shrinkText
     -- Percent of screen to increment by when resizing panes
     delta = 3 / 100
 
-------------------------------------------------------------------------
--- Window rules:
-
--- Execute arbitrary actions and WindowSet manipulations when managing
--- a new window. You can use this to, for example, always float a
--- particular program, or have a client always appear on a particular
--- workspace.
---
--- To find the property name associated with a program, use
--- > xprop | grep WM_CLASS
--- and click on the client you're interested in.
---
--- To match on the WM_NAME, you can use 'title' in the same way that
--- 'className' and 'resource' are used below.
---
 myManageHook =
   composeAll
     [ className =? "MPlayer" --> doFloat,
       className =? "Gimp" --> doFloat,
+      className =? "firefox" --> doShift "browser",
+      className =? "Evolution" --> doShift "comms",
+      className =? "Signal" --> doShift "comms",
+      className =? "SchildiChat" --> doShift "comms",
       resource =? "desktop_window" --> doIgnore,
       resource =? "kdesktop" --> doIgnore
     ]