diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index f026ac7..303f451 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -30,9 +30,9 @@ import qualified Data.Map as M
 -- Hooks
 import XMonad.Hooks.DynamicLog (dynamicLogWithPP, wrap, xmobarPP, xmobarColor, shorten, PP(..))
 import XMonad.Hooks.FadeInactive
-import XMonad.Hooks.ManageDocks (docks, avoidStruts, docksEventHook, manageDocks, ToggleStruts(..))
+import XMonad.Hooks.ManageDocks (docks, avoidStruts, manageDocks, ToggleStruts(..))
 import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat, doCenterFloat)
-import XMonad.Hooks.EwmhDesktops (ewmh, fullscreenEventHook)
+import XMonad.Hooks.EwmhDesktops (ewmh, ewmhFullscreen)
 import XMonad.Hooks.ServerMode
 import XMonad.Hooks.SetWMName
 import XMonad.Hooks.WorkspaceHistory
@@ -48,7 +48,6 @@ import XMonad.Layout.ThreeColumns
 -- Layouts modifiers
 import XMonad.Layout.LayoutModifier
 import XMonad.Layout.LimitWindows (limitWindows, increaseLimit, decreaseLimit)
-import XMonad.Layout.Magnifier
 import XMonad.Layout.MultiToggle (mkToggle, single, EOT(EOT), (??))
 import XMonad.Layout.MultiToggle.Instances (StdTransformers(NBFULL, MIRROR, NOBORDERS))
 import XMonad.Layout.NoBorders
@@ -211,7 +210,7 @@ spawnSelected' lst = gridselect conf lst >>= flip whenJust spawn
                    }
 
 myAppGrid = [ ("Runelite", "runelite")
-			, ("ProtonVPN", "protonvpn")
+            , ("ProtonVPN", "protonvpn")
             , ("Thunar", "thunar")
             , ("Calendar", "gnome-calendar")
             , ("Firefox", "firefox")
@@ -320,16 +319,16 @@ myStandardEZKeys =
     , ("M-v", sendMessage (IncMasterN (-1))) -- decrement windows in master
     , ("M-<F11>", sendMessage ToggleStruts) -- toggle bar
 
-	-- NOTE Scratchpads
-	-- NOTE Toggle show/hide these programs.  They run on a hidden workspace.
-	-- NOTE When you toggle them to show, it brings them to your current workspace.
-	-- NOTE Toggle them to hide and it sends them back to hidden workspace (NSP).
+        -- NOTE Scratchpads
+        -- NOTE Toggle show/hide these programs.  They run on a hidden workspace.
+        -- NOTE When you toggle them to show, it brings them to your current workspace.
+        -- NOTE Toggle them to hide and it sends them back to hidden workspace (NSP).
     , ("M-s t", namedScratchpadAction myScratchPads "terminal")
     , ("M-s m", namedScratchpadAction myScratchPads "plexamp")
     , ("M-s c", namedScratchpadAction myScratchPads "calculator")
     , ("M-s e", namedScratchpadAction myScratchPads "matrix")
 
-	-- NOTE Grid Select (CTR-g followed by a key)
+        -- NOTE Grid Select (CTR-g followed by a key)
     , ("C-g g", spawnSelected' myAppGrid)                 -- grid select favorite apps
     , ("C-g t", goToSelected $ mygridConfig myColorizer)  -- goto selected window
     , ("C-g b", bringSelected $ mygridConfig myColorizer) -- bring selected window
@@ -374,7 +373,7 @@ myStandardEZKeys =
     , ("M-S-/", spawn "xmonad-keys-help") -- show keybinds
     , ("M-<Print>", spawn "maimpick") -- take full screenshot
     ]
-	-- The following lines are needed for named scratchpads.
+    -- The following lines are needed for named scratchpads.
       where nonNSP          = WSIs (return (\ws -> W.tag ws /= "NSP"))
             nonEmptyNonNSP  = WSIs (return (\ws -> isJust (W.stack ws) && W.tag ws /= "NSP"))
 
@@ -429,11 +428,6 @@ tall     = renamed [Replace "tall"]
            $ mySpacing 8
         --    $ Mirror
            $ ResizableTall 1 (3/100) (1/2) []
-magnify  = renamed [Replace "magnify"]
-           $ magnifier
-           $ limitWindows 12
-           $ mySpacing 8
-           $ ResizableTall 1 (3/100) (1/2) []
 monocle  = renamed [Replace "monocle"]
            $ limitWindows 20 Full
 floats   = renamed [Replace "floats"]
@@ -495,7 +489,6 @@ myLayout = avoidStruts $ mouseResize $ windowArrange $ T.toggleLayouts floats
             -- ||| spirals
             -- ||| grid
             -- ||| floats
-            -- ||| magnify
             -- ||| threeRow
             -- ||| threeCol
 
@@ -519,11 +512,11 @@ myManageHook = composeAll
     , className =? "guake"                              --> doIgnore
     , className =? "barrier"                            --> doFloat
     , className =? "net-runelite-client-RuneLite"       --> doFloat
-    , className =? "processing-app-Base"				--> doFloat
+    , className =? "processing-app-Base"                --> doFloat
     , className =? "Yad"                                --> doCenterFloat
     , className =? "net-runelite-launcher-Launcher"     --> doIgnore
     , className =? "steam_app_221380"                   --> doIgnore
-    , className =? "zenity"			                    --> doIgnore
+    , className =? "zenity"                             --> doIgnore
     , resource  =? "desktop_window"                     --> doIgnore
     , (className =? "firefox" <&&> resource =? "Dialog")--> doFloat  -- Float Firefox Dialog
     , resource  =? "kdesktop"                           --> doIgnore
@@ -531,7 +524,7 @@ myManageHook = composeAll
     , className =? "Steam"                              --> doShift ( myWorkspaces !! (7-1) )
     , className =? "discord"                            --> doShift ( myWorkspaces !! (8-1) )
     , className =? "telegram-desktop"                   --> doShift ( myWorkspaces !! (8-1) )
-    , className =? "slack"                  			--> doShift ( myWorkspaces !! (8-1) )
+    , className =? "slack"                              --> doShift ( myWorkspaces !! (8-1) )
     , className =? "Pavucontrol"                        --> doShift ( myWorkspaces !! (5-1) )]
 ------------------------------------------------------------------------
 -- Event handling
@@ -624,7 +617,7 @@ mainDesktop = do
             -- hooks, layouts
             layoutHook         = showWName' myShowWNameTheme myLayout,
             manageHook         = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageDocks,
-            handleEventHook    = myEventHook <+> fullscreenEventHook,
+            handleEventHook    = myEventHook,
             -- logHook            = myLogHook,
             logHook            = myLogHook <+> dynamicLogWithPP xmobarPP
                                 { ppOutput = \x -> hPutStrLn xmproc0 x
@@ -671,7 +664,7 @@ xmonad $ ewmh $ docks def
         -- hooks, layouts
         layoutHook         = showWName' myShowWNameTheme myLayout,
         manageHook         = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageDocks,
-        handleEventHook    = myEventHook <+> fullscreenEventHook,
+        handleEventHook    = myEventHook,
         -- logHook            = myLogHook,
         logHook            = myLogHook <+> dynamicLogWithPP xmobarPP
                             { ppOutput = \x -> hPutStrLn xmproc x