diff --git a/dotfiles/xmonad/lib/Bar.o b/dotfiles/xmonad/lib/Bar.o
index b50c09a..facd0b4 100644
Binary files a/dotfiles/xmonad/lib/Bar.o and b/dotfiles/xmonad/lib/Bar.o differ
diff --git a/dotfiles/xmonad/lib/PerWorkspaceDirs.o b/dotfiles/xmonad/lib/PerWorkspaceDirs.o
index 569759d..5e13496 100644
Binary files a/dotfiles/xmonad/lib/PerWorkspaceDirs.o and b/dotfiles/xmonad/lib/PerWorkspaceDirs.o differ
diff --git a/dotfiles/xmonad/lib/Spacing.o b/dotfiles/xmonad/lib/Spacing.o
index a536ff7..13853d2 100644
Binary files a/dotfiles/xmonad/lib/Spacing.o and b/dotfiles/xmonad/lib/Spacing.o differ
diff --git a/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o b/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o
index 17ba462..4d5326a 100644
Binary files a/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o and b/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o differ
diff --git a/dotfiles/xmonad/xmonad-x86_64-linux b/dotfiles/xmonad/xmonad-x86_64-linux
index 49a3ba9..3d6f4a1 100755
Binary files a/dotfiles/xmonad/xmonad-x86_64-linux and b/dotfiles/xmonad/xmonad-x86_64-linux differ
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index bcdf3e3..d72953c 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -194,7 +194,7 @@ main = do
     `additionalKeys`
     [((myModMask                , xK_q     ), spawn restartXmonad)
     ,((myModMask .|. shiftMask  , xK_c     ), kill)
-    ,((myModMask .|. shiftMask  , xK_b     ), spawn "google-chrome-stable")
+    ,((myModMask .|. shiftMask  , xK_b     ), spawn "chromium")
     ,((myModMask .|. shiftMask  , xK_p     ), spawn "mpc prev")
     ,((myModMask .|. shiftMask  , xK_n     ), spawn "mpc next")
     ,((myModMask .|. shiftMask  , xK_i     ), spawn "xcalib -invert -alter")
@@ -252,9 +252,9 @@ main = do
     ,((0                        , xF86XK_Sleep    ), spawn "pm-suspend")
     ,((0                        , xF86XK_MonBrightnessUp      ), spawn "xbacklight -inc 10")
     ,((0                        , xF86XK_MonBrightnessDown    ), spawn "xbacklight -dec 10")
-    ,((0                        , xF86XK_AudioMute), spawn "~/scripts/dvol2 -t")
-    ,((0                        , xF86XK_AudioLowerVolume), spawn "~/scripts/dvol2 -d 2 & mplayer /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")
-    ,((0                        , xF86XK_AudioRaiseVolume ), spawn "~/scripts/dvol2 -i 2 & mplayer /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")
+    ,((0                        , xF86XK_AudioMute), spawn "amixer -q set Master toggle")
+    ,((0                        , xF86XK_AudioLowerVolume), spawn "amixer -q set Master 5%-")
+    ,((0                        , xF86XK_AudioRaiseVolume ), spawn "amixer -q set Master 5%+")
     ]
     `additionalMouseBindings`
     [((myModMask, 6), \_ -> moveTo Next NonEmptyWS)
diff --git a/dotfiles/xmonad/xmonad.o b/dotfiles/xmonad/xmonad.o
index e157a2d..aad3ebf 100644
Binary files a/dotfiles/xmonad/xmonad.o and b/dotfiles/xmonad/xmonad.o differ
diff --git a/nix/audio/default.nix b/nix/audio/default.nix
index e826a09..4294543 100644
--- a/nix/audio/default.nix
+++ b/nix/audio/default.nix
@@ -1,7 +1,8 @@
 { config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    pulseaudioFull              # Audio	
+    pulseaudioFull              # Audio
+    spotify                     # Spotify
   ];
 
   hardware = {
diff --git a/nix/configuration.nix b/nix/configuration.nix
index 018628b..488c544 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -8,7 +8,9 @@
       ./audio
       ./input
       ./users
+      ./security
       ./development
+      ./games
       ./comms
       ./software
     ];
diff --git a/nix/games/default.nix b/nix/games/default.nix
new file mode 100644
index 0000000..2ef0f2d
--- /dev/null
+++ b/nix/games/default.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    nethack
+    steam
+    tibia
+  ];
+}
diff --git a/nix/security/default.nix b/nix/security/default.nix
new file mode 100644
index 0000000..9d28cc6
--- /dev/null
+++ b/nix/security/default.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    physlock
+  ];
+
+  # Set sudo to use user home
+  security.sudo.extraConfig = ''
+    Defaults !always_set_home
+    Defaults env_keep+="HOME"
+  '';
+
+  services = {
+    # Configure physlock
+    physlock = {
+      enable = true;
+      user = "taylor";
+      lockOn = {
+        suspend = true;
+        hibernate = true;
+      };
+    };
+  };
+}
diff --git a/nix/software/default.nix b/nix/software/default.nix
index 376f674..0e920a7 100644
--- a/nix/software/default.nix
+++ b/nix/software/default.nix
@@ -5,6 +5,7 @@
     chromium                    # Browser
     gtk                         # For GTK+ themes
     htop                        # System monitor
+    libreoffice                 # Libreoffice
     mplayer                     # Video player
     xdotool                     # Diagnostic tool for mouse and keyboard
   ];