diff --git a/programs/xmonad/xmonad.hs b/programs/xmonad/xmonad.hs
index 74d398f..b4056ac 100644
--- a/programs/xmonad/xmonad.hs
+++ b/programs/xmonad/xmonad.hs
@@ -21,7 +21,6 @@ import           XMonad.Layout.BoringWindows         (boringWindows)
 import           XMonad.Layout.Grid
 import           XMonad.Layout.LimitWindows          (limitWindows)
 import           XMonad.Layout.NoBorders
-import           XMonad.Layout.PerWorkspace
 import           XMonad.Util.EZConfig
 import           XMonad.Util.Run
 
@@ -61,7 +60,7 @@ myModMask       = mod1Mask
 --
 -- > workspaces = ["web", "irc", "code" ] ++ map show [4..9]
 --
-myWorkspaces    = ["1:web", "2:front", "3:back", "4:chat"] <> map show [5..9]
+myWorkspaces    = ["1:web", "2:code", "3:code", "4:code"] <> map show [5..6] <> ["7:fin", "8:cfg", "9:chat"]
 
 -- Border colors for unfocused and focused windows, respectively.
 --
@@ -113,9 +112,7 @@ defaults = def
 -- The available layouts.  Note that each layout is separated by |||,
 -- which denotes layout choice.
 --
-myLayout = avoidStruts
-  $ onWorkspaces ["2:front", "3:back"] (myMirror (2/3) ||| myTall (1/2) ||| myFull ||| Grid)
-  $ myTall (1/2) ||| myMirror (1/2) ||| myFull ||| Grid
+myLayout = avoidStruts (myMirror (2/3) ||| myTall (1/2) ||| myFull ||| Grid)
   where
     myMirror = limitWindows 5 . Mirror . myTall
 
@@ -176,8 +173,8 @@ myManageHook = composeAll
   , className =? "Gnome-calculator"       --> doFloat
   , className =? "Gnome-font-viewer"      --> doFloat
   , className =? "Org.gnome.Nautilus"     --> doFloat
-  , resource  =? "telegram-desktop"       --> doShift "4:chat"
-  , className =? "Thunderbird"            --> doShift "4:chat"
+  , resource  =? "telegram-desktop"       --> doShift "9:chat"
+  , className =? "Thunderbird"            --> doShift "9:chat"
   -- my libs
   , resource  =? "hwt"                    --> doFloat
   ]