diff --git a/xmonad.hs b/xmonad.hs
index f547b0b..b909191 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -61,7 +61,7 @@ import XMonad.Hooks.DynamicLog
     xmobarBorder,
     xmobarColor,
     xmobarRaw,
-    xmobarStrip,
+    xmobarStrip, ppVisible
   )
 import XMonad.Hooks.EwmhDesktops
   ( activateLogHook,
@@ -92,7 +92,7 @@ import XMonad.Util.SpawnOnce (spawnOnce)
 import XMonad.Util.Ungrab (unGrab)
 import XMonad.Util.WorkspaceCompare (getSortByIndex)
 import XMonad.Layout (Resize(Expand,Shrink) )
-import XMonad.Layout.DwmStyle (dwmStyle, shrinkText)
+import XMonad.Layout.NoBorders
 
 main :: IO ()
 main = do
@@ -145,8 +145,9 @@ myXmobarPP colors =
       ppTitleSanitize = xmobarStrip,
       ppCurrent = wrap " " "" . xmobarBorder "Top" (colors !! 6) 2,
       ppHidden = white . wrap " " "",
-      ppHiddenNoWindows = white . wrap " " "",
+      ppHiddenNoWindows = lowWhite . wrap " " "",
       ppUrgent = red . wrap (yellow "!") (yellow "!"),
+      ppVisible = wrap " " "" . xmobarBorder "Bottom" (colors !! 6) 2,
       ppOrder = \[ws, l, _, wins] -> [ws, l, wins],
       ppExtras = [logTitles formatFocused formatUnfocused],
       ppSort = hideWorkspaces
@@ -179,6 +180,7 @@ myStartupHook :: X ()
 myStartupHook = do
   spawnOnce "picom &"
   spawnOnce "sh $HOME/.fehbg"
+  spawnOnce "setxkbmap -option caps:escape"
 
 getWalColors :: IO [String]
 getWalColors = do
@@ -193,7 +195,7 @@ mySpacing' i = spacingRaw True (Border i 0 i i) True (Border i 0 i i) True
 --myWorkspaces = [" dev ", " www ", " sys ", " doc ", " vbox ", " chat ", " mus ", " vid ", " gfx "]
 myWorkspaces :: [String]
 myWorkspaces = show <$> ([1 .. 9] ::[Integer] )
-myLayout =  windowNavigation tiled ||| Mirror tiled ||| Full
+myLayout =  smartBorders $ windowNavigation tiled ||| smartBorders Full ||| Mirror tiled
   where
     tiled = mySpacing' 8 $ Tall nmaster delta ratio
     nmaster = 1 -- Default number of windows in the master pane
@@ -221,9 +223,11 @@ myManageHook =
       title =? "Mozilla Firefox" --> viewShift (myWorkspaces !! 1),
       title =? "Signal" --> viewShift (myWorkspaces !! 2),
       className =? "TelegramDesktop" --> viewShift (myWorkspaces !! 2),
+      className =? "Element" --> viewShift (myWorkspaces !! 2),
+      className =? "Thunderbird" --> viewShift (myWorkspaces !! 2),
       className =? "Gimp" --> doShift (myWorkspaces !! 8),
       (className =? "firefox" <&&> resource =? "Dialog") --> doFloat, -- Float Firefox Dialog
-      className =? "alfaview" --> viewShift (myWorkspaces !! 5),
+      className =? "alfaview" --> viewShift (myWorkspaces !! 3),
       className =? "jetbrains-idea" --> viewShift (myWorkspaces !! 4),
       (className =? "jetbrains-studio") <&&> (title ~=? "win") --> doIgnore
     ]