diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs
index f323ada..c141c6c 100644
--- a/lib/KeyBindings.hs
+++ b/lib/KeyBindings.hs
@@ -34,16 +34,20 @@ modify conf = conf
     , ("<Tab>-b", sendMessage (Toggle "Full"))
     , ("<XF86MonBrightnessDown>", spawn "/run/current-system/sw/bin/xbacklight -10")
     , ("<XF86MonBrightnessUp>", spawn "/run/current-system/sw/bin/xbacklight +10")
+    , ("<XF86AudioPlay>", spawn "/run/current-system/sw/bin/playerctl play-pause")
+    , ("<XF86AudioNext>", spawn "/run/current-system/sw/bin/playerctl next")
+    , ("<XF86AudioPrev>", spawn "/run/current-system/sw/bin/playerctl previous")
     , ("M-<Delete>", kill)
     , ("M-<Down>", windows W.focusDown)
     , ("M-<Esc>", sendMessage (Toggle "Full"))
     , ("M-$", sendMessage (Toggle "Full"))
     , ("M-<Left>", prevWS)
+    , ("M-i", prevScreen)
     , ("M-e", nextScreen)
     , ("M-<Right>", nextWS)
     , ("M-<Tab>", toggleWS' ["NSP"])
     , ("M-<Up>", windows W.focusUp)
-    , ("M-S-<Delete>", spawn "/run/current-system/sw/bin/i3lock-fancy -g -p")
+    , ("M-S-<Delete>", spawn "/run/current-system/sw/bin/i3lock -f -t -c 002b36")
     , ("M-S-<Left>", shiftToPrev >> prevWS)
     , ("M-S-<Right>", shiftToNext >> nextWS)
     , ("M-s s", spawn "sleep 0.2 ; /run/current-system/sw/bin/scrot -s /tmp/screenSel.png")
diff --git a/xmobarrc b/xmobarrc
index 7c1004b..e304ab5 100644
--- a/xmobarrc
+++ b/xmobarrc
@@ -1,10 +1,20 @@
 Config {
-      font = "xft:Iosevka Term:style=Regular:size=8"
-    , template = " %UnsafeStdinReader%}{%date% "
+      font = "xft:Fira Code:style=Regular:size=9"
+    , template = " %UnsafeStdinReader%}{%battery%  <fn=1></fn> %date% "
     , commands =
       [ Run UnsafeStdinReader
       , Run Date "%A %d %B %H:%M %Z" "date" 10
-    ]
+      , Run Battery [ "--template", "<acstatus> <left>% (<timeleft>, <watts>W)"
+                    , "-L", "25"
+                    , "-H", "35"
+                    , "-l", "#DC322F"
+                    , "-n", "#CB4B16"
+                    , "--"
+                    , "-O", "<fn=1></fn>"
+                    , "-i", "<fn=1></fn>"
+                    , "-o", "<fn=1></fn>"
+                    ] 50
+      ]
     , bgColor = "#002b36"
     , fgColor = "#839496"
     , border = BottomB
diff --git a/xmonad.hs b/xmonad.hs
index 713d9ee..7bee53c 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -34,13 +34,16 @@ layouts = toggleLayouts fullscreen    tiled
 -- For className, use the second value that xprop gives you.
 -------------- Here be the law of windows
 myManageHook = composeOne
-  [ className =? "Pinentry"     -?> doFloat
-  , className =? "mpv"          -?> doFullFloat <+> (doShift "flims")
-  , className =? "Steam"        -?> doShift "steam"
-  , className =? "csgo_linux64" -?> doShift "csgo"
-  , className =? "Pavucontrol"  -?> doShift "music"
-  , className =? "qutebrowser"  -?> doShift "web"
-  , isDialog                    -?> doCenterFloat
+  [ className =? "Pavucontrol"        -?> doShift "music"
+  , className =? "Pinentry"           -?> doFloat
+  , className =? "Steam"              -?> doShift "steam"
+  , className =? "VirtualBox"         -?> doFloat
+  , className =? "csgo_linux64"       -?> doShift "csgo"
+  , className =? "mpv"                -?> doFullFloat <+> (doShift "flims")
+  , className =? "qemu-system-x86_64" -?> doFloat
+  , className =? "qutebrowser"        -?> doShift "web"
+  , isDialog                          -?> doCenterFloat
+  , isDialog                          -?> doCenterFloat
 
     -- Move transient windows to their parent:
   , transience