diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal
index 93976d70..b555f3bc 100644
--- a/dotfiles/config/taffybar/imalison-taffybar.cabal
+++ b/dotfiles/config/taffybar/imalison-taffybar.cabal
@@ -30,7 +30,7 @@ executable imalison-taffybar
                      , hslogger
                      , process
                      , split
-                     , taffybar
+                     , taffybar>=3.2.0
                      , transformers
                      , xdg-basedir
                      , xmonad-contrib>=0.13
diff --git a/dotfiles/config/taffybar/ivanm-dfinity-razer.css b/dotfiles/config/taffybar/ivanm-dfinity-razer.css
index 955b43f3..a75e7023 100644
--- a/dotfiles/config/taffybar/ivanm-dfinity-razer.css
+++ b/dotfiles/config/taffybar/ivanm-dfinity-razer.css
@@ -5,7 +5,7 @@
 
 @define-color active-window-color @white;
 @define-color urgent-window-color @taffy-blue;
-@define-color font-color @white;
+@define-color font-color @black;
 @define-color menu-background-color @white;
 @define-color menu-font-color @black;
 
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 07656d70..811068a2 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 07656d70f6bf59a4d1355243f595805b9c0a25df
+Subproject commit 811068a21758ac70f66583e8fc07fa7189c6dc9a
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 5b310a50..eceaa62e 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -93,6 +93,8 @@ enableLogger logger level = do
   saveGlobalLogger $ setLevel level logger
 
 logDebug = do
+  global <- getLogger ""
+  saveGlobalLogger $ setLevel DEBUG global
   logger3 <- getLogger "System.Taffybar"
   saveGlobalLogger $ setLevel DEBUG logger3
   logger <- getLogger "System.Taffybar.Widget.Generic.AutoSizeImage"
@@ -140,9 +142,15 @@ main = do
         , labelSetter = workspaceNamesLabelSetter
         }
       workspaces = workspacesNew myWorkspacesConfig
+      myClock =
+        textClockNewWith
+        defaultClockConfig
+        { clockUpdateStrategy = RoundedTargetInterval 60 0.0
+        , clockFormatString = "%a %b %_d %I:%M %p"
+        }
       fullEndWidgets =
         map (>>= buildContentsBox)
-              [ textClockNewWith defaultClockConfig
+              [ myClock
               , sniTrayNew
               , cpuGraph
               , memoryGraph
@@ -155,8 +163,9 @@ main = do
         map (>>= buildContentsBox)
                        [ batteryIconNew
                        , textBatteryNew "$percentage$%"
-                       , textClockNewWith defaultClockConfig
+                       , myClock
                        , sniTrayNew
+                       , mpris2New
                        ]
       longLaptopEndWidgets =
         map (>>= buildContentsBox)
@@ -172,7 +181,7 @@ main = do
       baseConfig =
         defaultSimpleTaffyConfig
         { startWidgets =
-            workspaces : map (>>= buildContentsBox) [layout, windows]
+             workspaces : map (>>= buildContentsBox) [layout, windows]
         , endWidgets = fullEndWidgets
         , barPosition = Top
         , barPadding = 0
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 2a23f89e..a73fe7ca 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -24,12 +24,11 @@ let
   notifications-tray-icon-source = pkgs.fetchFromGitHub {
     owner = "IvanMalison";
     repo = "notifications-tray-icon";
-    rev = "6f3b8da1d32dd655c5e484940cfb9d7e392f3235";
-    sha256 = "0ag4gqiihgyiw3dfinz7a1c1dcnj30bs62f63zyk11fs37ys93rz";
+    rev = "f28288849a39feec8972a4181ce18ccdde6cc483";
+    sha256 = "11r95m316x93bs1dj0bvas8adpd0xgql2jz8a8dnzv0fv4mw7aj4";
   };
-  ntiHaskellPackages =
-    (import (notifications-tray-icon-source.outPath + "/overlay.nix"))
-    (import /home/imalison/Projects/nixpkgs {});
+  ntiOverlay = (import (notifications-tray-icon-source.outPath + "/overlay.nix"));
+  ntiHaskellPackages = (ntiOverlay pkgs pkgs).haskellPackages;
 in
 {
   nixpkgs.overlays = [
@@ -125,9 +124,10 @@ in
     # Desktop
     (haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
     (haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
+    (ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
     haskellPackages.status-notifier-item
     haskellPackages.xmonad
-    (ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
+
     autorandr
     betterlockscreen
     blueman
@@ -193,6 +193,7 @@ in
     # Tools
     automake
     bazaar
+    bind
     binutils
     dex
     direnv
@@ -202,8 +203,9 @@ in
     file
     gcc
     gdb
-    gitAndTools.git-sync
+    gitAndTools.git-crypt
     gitAndTools.git-fame
+    gitAndTools.git-sync
     gitAndTools.hub
     gitFull
     glxinfo
@@ -216,6 +218,7 @@ in
     jq
     mercurial
     networkmanager-openvpn
+    networkmanager_strongswan
     ncdu
     neofetch
     openvpn