diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index accf7df7..1e0b575e 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit accf7df727f20f030dc91d7648f9b6f2cd68ca9a
+Subproject commit 1e0b575e6b8ca58ff5f3ecf44f6d9951761520ea
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 4463af07..fe6dba55 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -42,10 +42,10 @@ import                  System.Taffybar.NetMonitor
 import                  System.Taffybar.SNITray
 import                  System.Taffybar.SimpleClock
 import                  System.Taffybar.SimpleConfig
-import                  System.Taffybar.ToggleMonitor
+import                  System.Taffybar.DBus.Toggle
 import                  System.Taffybar.Widgets.PollingGraph
 import                  System.Taffybar.WindowSwitcher
-import                  System.Taffybar.WorkspaceHUD
+import                  System.Taffybar.Workspaces
 import                  Text.Printf
 import                  Text.Read hiding (lift)
 import                  Unsafe.Coerce
@@ -199,8 +199,8 @@ main = do
       mpris = mpris2New
       cpu = pollingGraphNew cpuCfg 0.5 cpuCallback
       mem = pollingGraphNew memCfg 1 memCallback
-      myHUDConfig =
-        defaultWorkspaceHUDConfig
+      myWorkspacesConfig =
+        defaultWorkspacesConfig
         { underlineHeight = 3
         , underlinePadding = 2
         , minWSWidgetSize = Nothing
@@ -222,15 +222,14 @@ main = do
         , labelSetter = workspaceNamesLabelSetter
         }
       netMonitor = netMonitorMultiNew 1.5 interfaceNames
-      -- makeUnderline = underlineWidget myHUDConfig
   -- pgr <- pagerNew pagerConfig
   -- tray2 <- movableWidget tray
-  let hud = buildWorkspaceHUD myHUDConfig
+  let workspaces = workspacesNew myWorkspacesConfig
       los = layoutSwitcherNew defaultLayoutSwitcherConfig
       wnd = windowSwitcherNew defaultWindowSwitcherConfig
       simpleTaffyConfig =
         defaultSimpleTaffyConfig
-        { startWidgets = [hud, los, addClass "WindowSwitcher" wnd]
+        { startWidgets = [workspaces, los, addClass "WindowSwitcher" wnd]
         , endWidgets =
             [ batteryBarNewWithFormat defaultBatteryConfig "$percentage$% ($time$) - $status$" 1.0
             , makeContents buildSNITray "Cpu"
@@ -243,7 +242,7 @@ main = do
             ]
         , barPosition = Top
         , barPadding = 5
-        , barHeight = (underlineHeight myHUDConfig + windowIconSize myHUDConfig + 15)
+        , barHeight = (underlineHeight myWorkspacesConfig + windowIconSize myWorkspacesConfig + 15)
         , widgetSpacing = 0
         }
   dyreTaffybar $ handleDBusToggles $ toTaffyConfig simpleTaffyConfig