diff --git a/home/sway/waybar/config.nix b/home/sway/waybar/config.nix
index 36e93f8..421f618 100644
--- a/home/sway/waybar/config.nix
+++ b/home/sway/waybar/config.nix
@@ -5,7 +5,7 @@
     "clock"
     "sway/mode"
   ];
-  modules-center = [ "hyprland/workspaces" ];
+  modules-center = [ "sway/workspaces" ];
   modules-right = [
     "backlight"
     "pulseaudio"
@@ -169,11 +169,11 @@
     scroll-step = 1;
     tooltip = false;
   };
-  #"sway/mode" = {
-  #format = "{}";
-  #max-length = 50;
-  #};
-  "hyprland/workspaces" = {
+  "sway/mode" = {
+    format = "{}";
+    max-length = 50;
+  };
+  "sway/workspaces" = {
     all-outputs = true;
     disable-scroll = true;
     format = "{name}";
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 77bac31..3b086d5 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -30,7 +30,7 @@ in
 
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   # Configure keymap in X11
   services.xserver.xkb = {