diff --git a/xmobarrc b/xmobarrc
index 639f827..69204fc 100644
--- a/xmobarrc
+++ b/xmobarrc
@@ -1,10 +1,10 @@
 Config {
-  font = "xft:Fira Code:style=Regular:size=9"
-    , template = " %StdinReader%}{%battery% <fc=#2AA198>•</fc> %date% "
+      font = "xft:Fira Code:style=Regular:size=9"
+    , template = " %UnsafeStdinReader%}{%battery% <fc=#2AA198>•</fc> %date% "
     , commands =
-      [ Run StdinReader
-      , Run Date "%F %a <fc=#2AA198>•</fc> %T" "date" 10
-      , Run Battery [ "--template", "<leftvbar> <left>%<fc=#2AA198>/</fc><timeleft> <fc=#2AA198>• <acstatus> • <watts>W</fc>"
+      [ Run UnsafeStdinReader
+      , Run Date "%A %d %B %H:%M %Z" "date" 10
+      , Run Battery [ "--template", "<fn=1></fn> <left>% (<timeleft>) <fc=#2AA198>• <acstatus> • <watts>W</fc>"
       , "-L", "25"
       , "-H", "35"
       , "-l", "#FF0000"
@@ -22,7 +22,7 @@ Config {
     , borderColor = "#859900"
     , position = TopSize L 100 29
     , textOffset = 16
-    , additionalFonts = [ "xft:DejaVu Sans Mono:style=Regular:size=9" ]
+    , additionalFonts = [ "xft:FontAwesome:style=Regular:size=10" ]
 --    , sepChar
 --    , alignSep
 --    , iconOffset
diff --git a/xmonad.hs b/xmonad.hs
index 1d85316..2bebb8c 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -2,7 +2,7 @@
 -- including best practises.
 -- https://github.com/xmonad/xmonad-contrib/blob/master/XMonad/Config/Example.hs
 
-{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts, OverloadedStrings #-}
 
 module Main (main) where
 
@@ -33,7 +33,18 @@ import XMonad.Layout.LayoutModifier (ModifiedLayout)
 
 wkspcs :: [String]
 -------- ["●", "◕", "◑", "◔", "◯", "◐", "◒", "◓", "☦", "λ"]
-wkspcs = ["α", "β", "γ", "δ", "ε", "ζ", "η", "θ", "ι", "κ"]
+-------- ["α", "β", "γ", "δ", "ε", "ζ", "η", "θ", "ι", "κ"]
+wkspcs = [ wrap "<fn=1>" "</fn>" "\xF0E0" --  email
+         , wrap "<fn=1>" "</fn>" "\xF086" --  chat
+         , wrap "<fn=1>" "</fn>" "\xF121" --  work
+         , wrap "<fn=1>" "</fn>" "\xF126" --  work
+         , wrap "<fn=1>" "</fn>" "\xF120" --  work
+         , wrap "<fn=1>" "</fn>" "\xF09C" --  password
+         , wrap "<fn=1>" "</fn>" "\xF16C" --  web work
+         , wrap "<fn=1>" "</fn>" "\xF025" --  sound
+         , wrap "<fn=1>" "</fn>" "\xF269" --  web perso
+         , wrap "<fn=1>" "</fn>" "\xF03D" --  movie
+         ]
 
 barPP = def
   { ppCurrent         = xmobarColor' S.orange
@@ -41,6 +52,7 @@ barPP = def
   , ppHidden          = xmobarColor' S.foreground   -- other workspaces with windows
   , ppHiddenNoWindows = xmobarColor' S.foregroundll -- other workspaces
   , ppSep             = "  "
+  , ppWsSep           = " "
   , ppLayout          = printLayout
   , ppTitle           = printTitle
   }
@@ -88,6 +100,8 @@ myConfig = desktopConfig
       , ("M-S-<Right>", shiftToNext >> nextWS)
       , ("M-p", fuzzyPrompt myXPConfig)
       , ("<Tab>-b", sendMessage (Toggle "Full"))
+      , ("M-s", spawn "/run/current-system/sw/bin/scrot /tmp/screen.png")
+      , ("M-S-s", spawn "sleep 0.2 ; /run/current-system/sw/bin/scrot -s /tmp/screenSel.png")
       ]
 
     `additionalKeys`-- Add some more (automatic) key bindings: