diff --git a/flake.lock b/flake.lock
index 4c2813a..0615bd6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -116,28 +116,6 @@
         "type": "github"
       }
     },
-    "dankMaterialShell": {
-      "inputs": {
-        "dgop": "dgop",
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ],
-        "quickshell": "quickshell"
-      },
-      "locked": {
-        "lastModified": 1765685227,
-        "narHash": "sha256-vaQPiOV7vXHXoshHOu35IWDlIQJnaMP5OxSORxdhTGo=",
-        "owner": "AvengeMedia",
-        "repo": "DankMaterialShell",
-        "rev": "32f218d58cd0b4a8b5c3e16e0dd625728cf132e3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "DankMaterialShell",
-        "type": "github"
-      }
-    },
     "devenv": {
       "inputs": {
         "cachix": "cachix",
@@ -161,27 +139,6 @@
         "type": "github"
       }
     },
-    "dgop": {
-      "inputs": {
-        "nixpkgs": [
-          "dankMaterialShell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762835999,
-        "narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=",
-        "owner": "AvengeMedia",
-        "repo": "dgop",
-        "rev": "799301991cd5dcea9b64245f9d500dcc76615653",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "dgop",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -1669,32 +1626,9 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "dankMaterialShell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1764663772,
-        "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
-        "ref": "refs/heads/master",
-        "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
-        "revCount": 713,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      },
-      "original": {
-        "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      }
-    },
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
-        "dankMaterialShell": "dankMaterialShell",
         "devenv": "devenv",
         "disko": "disko",
         "flake-parts": "flake-parts_2",
diff --git a/flake.nix b/flake.nix
index 42283db..bf4f344 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,11 +87,6 @@
       };
     };
 
-    dankMaterialShell = {
-      url = "github:AvengeMedia/DankMaterialShell";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-
     niri-flake = {
       url = "github:sodiboo/niri-flake";
       # url = "github:Daholli/niri-flake/1067d35dd18f6a55f79873c944f1427a9eb7caa7"; # for debugging
diff --git a/modules/desktop/addons/dms/clsettings.json b/modules/desktop/addons/dms/clsettings.json
deleted file mode 100644
index 0b03628..0000000
--- a/modules/desktop/addons/dms/clsettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "maxHistory": 100,
-  "maxEntrySize": 5242880,
-  "autoClearDays": 1,
-  "clearAtStartup": true,
-  "disabled": true,
-  "disableHistory": true,
-  "disablePersist": true
-}
\ No newline at end of file
diff --git a/modules/desktop/addons/dms/default.nix b/modules/desktop/addons/dms/default.nix
deleted file mode 100644
index 81ab113..0000000
--- a/modules/desktop/addons/dms/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  flake.modules.homeManager.cholli =
-    {
-      inputs,
-      lib,
-      osConfig,
-      ...
-    }:
-    let
-      picture-path = "/home/cholli/Pictures/firewatch.jpg";
-    in
-    {
-      imports = [
-        inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-        inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
-      ];
-
-      config = lib.mkIf osConfig.programs.niri.enable {
-        home.file = {
-          ".config/DankMaterialShell/settings.json".source = ./settings.json;
-          ".config/DankMaterialShell/clsettings.json".source = ./clsettings.json;
-          # https://www.reddit.com/r/WidescreenWallpaper/comments/13hib3t/purple_firewatch_3840x1620/
-          "Pictures/firewatch.jpg".source = ../firewatch.jpg;
-        };
-
-        programs.dankMaterialShell = {
-          enable = true;
-          niri = {
-            enableKeybinds = true;
-            enableSpawn = true;
-          };
-
-          enableVPN = false;
-          enableDynamicTheming = false;
-          enableAudioWavelength = false;
-          enableCalendarEvents = false;
-        };
-      };
-    };
-}
diff --git a/modules/desktop/addons/dms/settings.json b/modules/desktop/addons/dms/settings.json
deleted file mode 100644
index fbe9fb1..0000000
--- a/modules/desktop/addons/dms/settings.json
+++ /dev/null
@@ -1,391 +0,0 @@
-{
-  "currentThemeName": "cat-lavender",
-  "customThemeFile": "",
-  "matugenScheme": "scheme-tonal-spot",
-  "runUserMatugenTemplates": true,
-  "matugenTargetMonitor": "",
-  "popupTransparency": 1,
-  "dockTransparency": 1,
-  "widgetBackgroundColor": "sch",
-  "widgetColorMode": "default",
-  "cornerRadius": 12,
-  "use24HourClock": true,
-  "showSeconds": false,
-  "useFahrenheit": false,
-  "nightModeEnabled": false,
-  "animationSpeed": 1,
-  "customAnimationDuration": 500,
-  "wallpaperFillMode": "Fill",
-  "blurredWallpaperLayer": false,
-  "blurWallpaperOnOverview": false,
-  "showLauncherButton": true,
-  "showWorkspaceSwitcher": true,
-  "showFocusedWindow": true,
-  "showWeather": true,
-  "showMusic": true,
-  "showClipboard": true,
-  "showCpuUsage": true,
-  "showMemUsage": true,
-  "showCpuTemp": true,
-  "showGpuTemp": true,
-  "selectedGpuIndex": 0,
-  "enabledGpuPciIds": [],
-  "showSystemTray": true,
-  "showClock": true,
-  "showNotificationButton": true,
-  "showBattery": true,
-  "showControlCenterButton": true,
-  "showCapsLockIndicator": true,
-  "controlCenterShowNetworkIcon": true,
-  "controlCenterShowBluetoothIcon": true,
-  "controlCenterShowAudioIcon": true,
-  "controlCenterShowVpnIcon": true,
-  "controlCenterShowBrightnessIcon": false,
-  "controlCenterShowMicIcon": false,
-  "controlCenterShowBatteryIcon": false,
-  "controlCenterShowPrinterIcon": false,
-  "showPrivacyButton": true,
-  "privacyShowMicIcon": false,
-  "privacyShowCameraIcon": false,
-  "privacyShowScreenShareIcon": false,
-  "controlCenterWidgets": [
-    {
-      "id": "volumeSlider",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "brightnessSlider",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "wifi",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "bluetooth",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "audioOutput",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "audioInput",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "nightMode",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "darkMode",
-      "enabled": true,
-      "width": 50
-    }
-  ],
-  "showWorkspaceIndex": false,
-  "showWorkspacePadding": false,
-  "workspaceScrolling": false,
-  "showWorkspaceApps": true,
-  "maxWorkspaceIcons": 3,
-  "workspacesPerMonitor": true,
-  "showOccupiedWorkspacesOnly": true,
-  "dwlShowAllTags": false,
-  "workspaceNameIcons": {
-    "01-communication": {
-      "type": "icon",
-      "value": "call"
-    }
-  },
-  "waveProgressEnabled": true,
-  "scrollTitleEnabled": true,
-  "audioVisualizerEnabled": true,
-  "clockCompactMode": false,
-  "focusedWindowCompactMode": false,
-  "runningAppsCompactMode": true,
-  "keyboardLayoutNameCompactMode": false,
-  "runningAppsCurrentWorkspace": true,
-  "runningAppsGroupByApp": false,
-  "centeringMode": "index",
-  "clockDateFormat": "yyyy-MM-dd",
-  "lockDateFormat": "",
-  "mediaSize": 1,
-  "appLauncherViewMode": "list",
-  "spotlightModalViewMode": "list",
-  "sortAppsAlphabetically": false,
-  "appLauncherGridColumns": 4,
-  "spotlightCloseNiriOverview": true,
-  "niriOverviewOverlayEnabled": true,
-  "weatherLocation": "Heidelberg, Baden-Württemberg",
-  "weatherCoordinates": "49.4093582,8.6947240",
-  "useAutoLocation": false,
-  "weatherEnabled": true,
-  "networkPreference": "auto",
-  "vpnLastConnected": "",
-  "iconTheme": "System Default",
-  "launcherLogoMode": "apps",
-  "launcherLogoCustomPath": "",
-  "launcherLogoColorOverride": "",
-  "launcherLogoColorInvertOnMode": false,
-  "launcherLogoBrightness": 0.5,
-  "launcherLogoContrast": 1,
-  "launcherLogoSizeOffset": 0,
-  "fontFamily": "Inter Variable",
-  "monoFontFamily": "Fira Code",
-  "fontWeight": 400,
-  "fontScale": 1.2,
-  "notepadUseMonospace": true,
-  "notepadFontFamily": "",
-  "notepadFontSize": 14,
-  "notepadShowLineNumbers": false,
-  "notepadTransparencyOverride": -1,
-  "notepadLastCustomTransparency": 0.7,
-  "soundsEnabled": true,
-  "useSystemSoundTheme": false,
-  "soundNewNotification": true,
-  "soundVolumeChanged": true,
-  "soundPluggedIn": true,
-  "acMonitorTimeout": 3600,
-  "acLockTimeout": 900,
-  "acSuspendTimeout": 0,
-  "acSuspendBehavior": 0,
-  "acProfileName": "",
-  "batteryMonitorTimeout": 0,
-  "batteryLockTimeout": 0,
-  "batterySuspendTimeout": 0,
-  "batterySuspendBehavior": 0,
-  "batteryProfileName": "",
-  "lockBeforeSuspend": false,
-  "loginctlLockIntegration": true,
-  "fadeToLockEnabled": true,
-  "fadeToLockGracePeriod": 5,
-  "launchPrefix": "",
-  "brightnessDevicePins": {},
-  "wifiNetworkPins": {},
-  "bluetoothDevicePins": {
-    "preferredDevice": "C8:7B:23:59:57:41"
-  },
-  "audioInputDevicePins": {},
-  "audioOutputDevicePins": {},
-  "gtkThemingEnabled": false,
-  "qtThemingEnabled": false,
-  "syncModeWithPortal": true,
-  "terminalsAlwaysDark": false,
-  "runDmsMatugenTemplates": true,
-  "matugenTemplateGtk": true,
-  "matugenTemplateNiri": true,
-  "matugenTemplateQt5ct": true,
-  "matugenTemplateQt6ct": true,
-  "matugenTemplateFirefox": true,
-  "matugenTemplatePywalfox": true,
-  "matugenTemplateVesktop": true,
-  "matugenTemplateGhostty": true,
-  "matugenTemplateKitty": true,
-  "matugenTemplateFoot": true,
-  "matugenTemplateAlacritty": true,
-  "matugenTemplateWezterm": true,
-  "matugenTemplateDgop": true,
-  "matugenTemplateKcolorscheme": true,
-  "matugenTemplateVscode": true,
-  "showDock": false,
-  "dockAutoHide": false,
-  "dockGroupByApp": false,
-  "dockOpenOnOverview": false,
-  "dockPosition": 1,
-  "dockSpacing": 4,
-  "dockBottomGap": 0,
-  "dockMargin": 0,
-  "dockIconSize": 40,
-  "dockIndicatorStyle": "circle",
-  "dockBorderEnabled": false,
-  "dockBorderColor": "surfaceText",
-  "dockBorderOpacity": 1,
-  "dockBorderThickness": 1,
-  "notificationOverlayEnabled": false,
-  "modalDarkenBackground": true,
-  "lockScreenShowPowerActions": true,
-  "lockScreenShowSystemIcons": true,
-  "lockScreenShowTime": true,
-  "lockScreenShowDate": true,
-  "lockScreenShowProfileImage": true,
-  "lockScreenShowPasswordField": true,
-  "enableFprint": false,
-  "maxFprintTries": 15,
-  "lockScreenActiveMonitor": "all",
-  "lockScreenInactiveColor": "#000000",
-  "hideBrightnessSlider": false,
-  "notificationTimeoutLow": 5000,
-  "notificationTimeoutNormal": 5000,
-  "notificationTimeoutCritical": 0,
-  "notificationPopupPosition": 0,
-  "osdAlwaysShowValue": false,
-  "osdPosition": 5,
-  "osdVolumeEnabled": true,
-  "osdMediaVolumeEnabled": true,
-  "osdBrightnessEnabled": true,
-  "osdIdleInhibitorEnabled": true,
-  "osdMicMuteEnabled": true,
-  "osdCapsLockEnabled": true,
-  "osdPowerProfileEnabled": false,
-  "osdAudioOutputEnabled": true,
-  "powerActionConfirm": true,
-  "powerActionHoldDuration": 0.5,
-  "powerMenuActions": [
-    "reboot",
-    "logout",
-    "poweroff",
-    "lock"
-  ],
-  "powerMenuDefaultAction": "logout",
-  "powerMenuGridLayout": true,
-  "customPowerActionLock": "",
-  "customPowerActionLogout": "",
-  "customPowerActionSuspend": "",
-  "customPowerActionHibernate": "",
-  "customPowerActionReboot": "",
-  "customPowerActionPowerOff": "",
-  "updaterUseCustomCommand": false,
-  "updaterCustomCommand": "",
-  "updaterTerminalAdditionalParams": "",
-  "displayNameMode": "system",
-  "screenPreferences": {
-    "wallpaper": [
-      {
-        "name": "DP-1",
-        "model": "M34WQ"
-      }
-    ],
-    "osd": [
-      {
-        "name": "DP-1",
-        "model": "M34WQ"
-      }
-    ],
-    "toast": [
-      {
-        "name": "DP-1",
-        "model": "M34WQ"
-      }
-    ],
-    "notepad": [
-      {
-        "name": "DP-1",
-        "model": "M34WQ"
-      }
-    ],
-    "notifications": [
-      {
-        "name": "DP-1",
-        "model": "M34WQ"
-      }
-    ],
-    "dock": [
-      {
-        "name": "DP-1",
-        "model": "M34WQ"
-      }
-    ]
-  },
-  "showOnLastDisplay": {
-    "osd": false,
-    "toast": false,
-    "notifications": false,
-    "dock": false
-  },
-  "barConfigs": [
-    {
-      "id": "default",
-      "name": "Main Bar",
-      "enabled": true,
-      "position": 0,
-      "screenPreferences": [
-        {
-          "name": "DP-1",
-          "model": "M34WQ"
-        }
-      ],
-      "showOnLastDisplay": false,
-      "leftWidgets": [
-        "launcherButton",
-        "workspaceSwitcher"
-      ],
-      "centerWidgets": [
-        {
-          "id": "clock",
-          "enabled": true,
-          "clockCompactMode": false
-        }
-      ],
-      "rightWidgets": [
-        {
-          "id": "cpuUsage",
-          "enabled": true
-        },
-        {
-          "id": "memUsage",
-          "enabled": true,
-          "showSwap": false
-        },
-        {
-          "id": "cpuTemp",
-          "enabled": true
-        },
-        {
-          "id": "gpuTemp",
-          "enabled": true,
-          "selectedGpuIndex": 0,
-          "pciId": "1002:7550"
-        },
-        {
-          "id": "controlCenterButton",
-          "enabled": true
-        },
-        {
-          "id": "systemTray",
-          "enabled": true
-        },
-        {
-          "id": "notificationButton",
-          "enabled": true
-        }
-      ],
-      "spacing": 4,
-      "innerPadding": 4,
-      "bottomGap": 0,
-      "transparency": 1,
-      "widgetTransparency": 1,
-      "squareCorners": false,
-      "noBackground": false,
-      "gothCornersEnabled": false,
-      "gothCornerRadiusOverride": false,
-      "gothCornerRadiusValue": 12,
-      "borderEnabled": false,
-      "borderColor": "surfaceText",
-      "borderOpacity": 1,
-      "borderThickness": 1,
-      "widgetOutlineEnabled": false,
-      "widgetOutlineColor": "primary",
-      "widgetOutlineOpacity": 1,
-      "widgetOutlineThickness": 1,
-      "fontScale": 1,
-      "autoHide": false,
-      "autoHideDelay": 250,
-      "openOnOverview": false,
-      "visible": true,
-      "popupGapsAuto": true,
-      "popupGapsManual": 4,
-      "maximizeDetection": true,
-      "scrollEnabled": true,
-      "scrollXBehavior": "column",
-      "scrollYBehavior": "workspace"
-    }
-  ],
-  "configVersion": 2
-}
\ No newline at end of file
diff --git a/modules/desktop/addons/hypridle.nix b/modules/desktop/addons/hypridle.nix
index 2392b07..94c7ea6 100644
--- a/modules/desktop/addons/hypridle.nix
+++ b/modules/desktop/addons/hypridle.nix
@@ -2,7 +2,7 @@
   flake.modules.homeManager.cholli =
     { lib, osConfig, ... }:
     {
-      config = lib.mkIf osConfig.programs.hyprland.enable {
+      config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {
         services.hypridle = {
           enable = true;
           settings = {
diff --git a/modules/desktop/addons/hyprlock.nix b/modules/desktop/addons/hyprlock.nix
index d1899db..16277e5 100644
--- a/modules/desktop/addons/hyprlock.nix
+++ b/modules/desktop/addons/hyprlock.nix
@@ -36,7 +36,7 @@
         hyprlock-package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock;
       in
       {
-        config = lib.mkIf osConfig.programs.hyprland.enable {
+        config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {
           programs.hyprlock = {
             enable = true;
             package = hyprlock-package;
diff --git a/modules/desktop/addons/hyprpaper.nix b/modules/desktop/addons/hyprpaper.nix
index 2af9cf6..fde7dd6 100644
--- a/modules/desktop/addons/hyprpaper.nix
+++ b/modules/desktop/addons/hyprpaper.nix
@@ -5,7 +5,7 @@
       picture-path = "/home/cholli/Pictures/firewatch.jpg";
     in
     {
-      config = lib.mkIf osConfig.programs.hyprland.enable {
+      config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {
 
         home.file = {
           # https://www.reddit.com/r/WidescreenWallpaper/comments/13hib3t/purple_firewatch_3840x1620/
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 02d600e..7f2ad76 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -45,17 +45,17 @@
     homeManager.cholli =
       { pkgs, osConfig, ... }:
       {
-        # dconf = {
-        #   settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
-        # };
+        dconf = {
+          settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
+        };
 
-        # gtk = {
-        #   enable = true;
-        #   theme = {
-        #     name = "Adwaita-dark";
-        #     package = pkgs.gnome-themes-extra;
-        #   };
-        # };
+        gtk = {
+          enable = true;
+          theme = {
+            name = "Adwaita-dark";
+            package = pkgs.gnome-themes-extra;
+          };
+        };
 
         # qt = {
         #   enable = true;
diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index 1f81685..056b52c 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -3,6 +3,7 @@
     nixos.niri =
       { inputs, pkgs, ... }:
       {
+
         programs.niri = {
           enable = true;
           package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
@@ -75,6 +76,25 @@
             cursors = {
               enable = true;
             };
+
+            fuzzel = {
+              enable = true;
+            };
+
+            mako = {
+              enable = true;
+            };
+          };
+
+          services.mako = {
+            enable = true;
+            settings = {
+              border-radius = 15;
+            };
+          };
+
+          programs.fuzzel = {
+            enable = true;
           };
 
           programs.niri.settings = {
@@ -323,6 +343,8 @@
                   "Ctrl+Alt+Delete".action = actions.quit;
 
                   "Mod+Return".action.spawn = "${lib.getExe pkgs.kitty}";
+                  "Mod+D".action.spawn = "${lib.getExe pkgs.fuzzel}";
+                  "Mod+Alt+L".action.spawn = "hyprlock-blur";
 
                   "Mod+Escape" = {
                     allow-inhibiting = false;
@@ -418,6 +440,8 @@
                   # Window Sizes
                   "Mod+BracketLeft".action = actions.consume-or-expel-window-left;
                   "Mod+BracketRight".action = actions.consume-or-expel-window-right;
+                  "Mod+Comma".action = actions.consume-window-into-column;
+                  "Mod+Period".action = actions.expel-window-from-column;
 
                   "Mod+R".action = actions.switch-preset-column-width;
                   "Mod+Shift+R".action = actions.switch-preset-window-height;
@@ -426,6 +450,9 @@
                   "Mod+Shift+F".action = actions.fullscreen-window;
                   "Mod+Ctrl+F".action = actions.expand-column-to-available-width;
 
+                  "Mod+C".action = actions.center-column;
+                  "Mod+V".action = actions.toggle-window-floating;
+
                   # Xwayland keyboard stuff
                   "Mod+Shift+C".action = actions.spawn [
                     "sh"
@@ -437,10 +464,48 @@
                     "-c"
                     "wl-paste -n | env DISPLAY=:0 xsel -ib"
                   ];
+
+                  "XF86AudioRaiseVolume" = {
+                    action.spawn = [
+                      "wpctl"
+                      "set-volume"
+                      "@DEFAULT_AUDIO_SINK@"
+                      "0.1+"
+                    ];
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioLowerVolume" = {
+                    action.spawn = [
+                      "wpctl"
+                      "set-volume"
+                      "@DEFAULT_AUDIO_SINK@"
+                      "0.1-"
+                    ];
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioMute" = {
+                    action.spawn = [
+                      "wpctl"
+                      "set-mute"
+                      "@DEFAULT_AUDIO_SINK@"
+                      "toggle"
+                    ];
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioMicMute" = {
+                    action.spawn = [
+                      "wpctl"
+                      "set-mute"
+                      "@DEFAULT_AUDIO_SOURCE@"
+                      "toggle"
+                    ];
+                    allow-when-locked = true;
+                  };
                 }
               ];
 
             spawn-at-startup = [
+              { argv = [ "${lib.getExe config.programs.waybar.package}" ]; }
               { argv = [ "zen-beta" ]; }
               { argv = [ "obsidian" ]; }
               { argv = [ "discord" ]; }