diff --git a/home-manager/modules/xmonad/app/Main.hs b/home-manager/modules/xmonad/app/Main.hs
index 7c9995d..682b402 100644
--- a/home-manager/modules/xmonad/app/Main.hs
+++ b/home-manager/modules/xmonad/app/Main.hs
@@ -205,13 +205,20 @@ myKeymap c =
      , ("M-<F9>", (workspacesGrouped >>= \ws -> (liftIO . print $ ws)))
     ]
     ++
-
     --
     -- mod-[1..9], Switch to workspace N
     --
     [("M-" ++ m ++ [k], windows $ onCurrentScreen f i)
         | (i, k) <- zip (workspaces' c) "1234567890"
         , (f, m) <- [(W.greedyView, ""), (W.shift, "S-"), (copy, "S-C-")]]
+    ++
+    --
+    -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3
+    -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3
+    --
+    [("M-"++m++[key], screenWorkspace sc >>= flip whenJust (windows . f))
+        | (key, sc) <- zip ".o," [0..]
+        , (f, m) <- [(W.view, ""), (W.shift, "S-")]]
     where
       xMoveWindow
         :: (Position, Position)