1 files changed, 18 insertions, 7 deletions

diff --git a/xmonad.hs b/xmonad.hs
index b26e45c..e77f0eb 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -2,23 +2,34 @@ import           XMonad
 import           XMonad.Config.Desktop
 import           XMonad.Layout.NoBorders
 import           XMonad.Layout.Tabbed
+import           XMonad.Layout.AvoidFloats
+import XMonad.Layout.Monitor
+import XMonad.Util.EZConfig (additionalKeys)
+import XMonad.Actions.PhysicalScreens
 
 main :: IO ()
-main = xmonad
-    desktopConfig {
+main = xmonad $ desktopConfig {
             terminal = "xterm"
---        , layoutHook = noBorders Full ||| noBorders (tabbed shrinkText def) ||| layoutHook desktopConfig
           , layoutHook = desktopLayoutModifiers layouts
-          , modMask = mod4Mask
-    }
+          , modMask = theModMask
+    } `additionalKeys` myKeys
 
   where
 
+    theModMask = mod4Mask
+    modm = theModMask
+
+    myKeys = [((theModMask, xK_u ), broadcastMessage ToggleMonitor >> refresh)] ++ fixScreenOrder
+
+    fixScreenOrder = [((modm .|. mask, key), f sc) | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..],
+                                                     (f, mask) <- [(viewScreen def, 0), (sendToScreen def, shiftMask)]]
+
     layouts = noBorders Full
               ||| noBorders (tabbed shrinkText def)
               ||| smartBorders tiled
               ||| smartBorders (Mirror tiled)
-    tiled = Tall nmaster delta ratio
+    tiled = avoidFloats $ Tall nmaster delta ratio
     nmaster = 1 -- The default number of windows in the master pane
-    ratio = 1 / 2 -- Default proportion of screen occupied by master pane
+    ratio = 2 / 3 -- Default proportion of screen occupied by master pane
     delta = 3 / 100 -- Percent of screen to increment by when resizing panes
+