diff --git a/xmonad.hs b/xmonad.hs
index 76494c0..b492341 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -10,13 +10,13 @@ import XMonad.Util.EZConfig
 import XMonad.Util.Scratchpad
 import XMonad.Config.Desktop
 import XMonad.Config.Azerty
-import XMonad.Layout.Fullscreen
 import XMonad.Layout.NoBorders
 import XMonad.Layout.Maximize
 import XMonad.Layout.Tabbed
-import XMonad.Layout.Minimize
+import XMonad.Layout.Minimize(minimize)
 import XMonad.Layout.BoringWindows
 import XMonad.Layout.PerWorkspace
+import XMonad.Layout.Fullscreen(fullscreenSupport)
 import XMonad.Prompt
 import XMonad.Prompt.Ssh
 import System.IO
@@ -24,13 +24,22 @@ import qualified Data.Map as M
 import qualified XMonad.StackSet as W
 import qualified Data.List as L
 
+myLayout = 
+    smartBorders
+    $ avoidStruts
+    $ boringWindows
+    $ minimize
+    $ maximizeWithPadding 0
+    $ onWorkspace "8:media" Full
+    $ onWorkspaces ["2:com", "9:div"] simpleTabbed
+    $ (Tall 1 0.03 0.5 ||| Full ||| simpleTabbed )
+
 baseConfig = desktopConfig
     { modMask = mod5Mask -- AltGr
     , startupHook = startupHook desktopConfig >> setWMName "LG3D"
     , terminal = "mate-terminal.wrapper"
     , workspaces = ["1:web", "2:com"] ++ map show [3..7] ++ ["8:media", "9:div"]
-    , layoutHook = smartBorders $ fullscreenFull $ avoidStruts $ boringWindows $ minimize $ maximizeWithPadding 0 $ onWorkspace "8:media" Full $ onWorkspaces ["2:com", "9:div"] simpleTabbed $ (Tall 1 0.03 0.5 ||| Full ||| simpleTabbed )
-    , handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook
+    , layoutHook = myLayout
     }
     `removeKeys`
     [(m .|. modMask baseConfig , k)
@@ -70,8 +79,10 @@ xmobarSwitchWs wsName = xmobarActionWrapper action wsName
 
 main = do
     xmobar_proc <- spawnPipe "xmobar"
-    xmonad $ baseConfig
-        { manageHook = (scratchpadManageHook $ W.RationalRect 0.0 0.0 1.0 0.5) <+> workspaceManageHook <+> fullscreenManageHook <+> manageDocks
+    xmonad
+        $ fullscreenSupport
+        $ baseConfig
+        { manageHook = (scratchpadManageHook $ W.RationalRect 0.0 0.0 1.0 0.5) <+> workspaceManageHook <+> manageDocks
         , logHook =  dynamicLogWithPP xmobarPP
                         { ppOutput = hPutStrLn xmobar_proc
                         , ppHidden = xmobarSwitchWs