diff --git a/flake.lock b/flake.lock
index 4a6c96d..10beeda 100644
--- a/flake.lock
+++ b/flake.lock
@@ -913,7 +913,7 @@
     "oisd": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-fgfgm5GHDqq/RIRF8M1j6H3OZ/r1DVPgwMvwikdauNI=",
+        "narHash": "sha256-QIpM9e7dye+EDO9rvlhSbDVLtmcgw8aLtg0DncPHK2s=",
         "type": "file",
         "url": "https://big.oisd.nl/domainswild"
       },
diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index 3650301..0832657 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -29,7 +29,6 @@ in
       fwupd
       fw-ectool
       monero-gui
-      remmina
     ];
     etc.hosts.mode = "0700";
   };
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index e683cd2..ee91626 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -56,7 +56,7 @@
 
   home.file.".cache/nwg-dock-pinned".text = ''
     chromium-browser
-    nautilus
+    thunar
     ${if (host == "sakura") then "darktable" else ""}
     ${if (host == "sakura") then "flstudio" else ""}
     ${if (host == "iris") then "steam" else ""}
@@ -79,13 +79,13 @@
     }
 
     listener {
-      timeout = 300 # 5m in seconds
-      on-timeout = if [ -f "$HOME/.config/hypr/caffeine_mode" ]; then exit 0; else pgrep hyprlock || hyprlock; fi
+      timeout = 165 # in seconds
+      on-timeout = pgrep hyprlock || hyprlock
     }
 
     listener {
-      timeout = 1800 # 30m in seconds
-      on-timeout = if [ -f "$HOME/.config/hypr/caffeine_mode" ]; then exit 0; else systemctl suspend; hyprlock; fi
+      timeout = 1800 # in seconds
+      on-timeout = systemctl suspend; hyprlock
     }
   '';
 
@@ -264,7 +264,7 @@
         "$mainMod, D, exec, bemenu-run -l 5 --ignorecase"
         "SUPER SHIFT, L, exec, swaylock --image /home/${username}/.local/share/bg.png"
         "SUPER, L, exec, swaylock --image /home/${username}/.local/share/bg.png"
-        "$mainMod, E, exec, nautilus"
+        "$mainMod, E, exec, thunar"
         "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped"
         "$mainMod, C,exec, hyprpicker -a"
         "$mainMod, W,exec, wallpaper-picker"
diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix
index e215b35..75c10ad 100644
--- a/modules/home/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -12,7 +12,6 @@
     direnv
     nwg-dock-hyprland
     hyprland-monitor-attached
-    hypridle
   ];
   # systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
   wayland.windowManager.hyprland = {
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index fa19aea..7fe86cd 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -30,7 +30,6 @@
     gnumake
     python3
     nautilus
-    qbittorrent
 
     # CLI shit
     bitwarden-cli
diff --git a/modules/home/qutebrowser.nix b/modules/home/qutebrowser.nix
index 543becb..2fc880f 100644
--- a/modules/home/qutebrowser.nix
+++ b/modules/home/qutebrowser.nix
@@ -34,16 +34,6 @@ in
   programs.qutebrowser = {
     enable = true;
 
-    keyBindings = {
-      normal = {
-        "d" = "scroll-page 0 0.5";
-        "u" = "scroll-page 0 -0.5";
-        "x" = "tab-close -o";
-        "<Ctrl-Shift-T>" = "undo";
-        ",v" = "spawn mpv {url}";
-      };
-    };
-
     settings = {
       fonts = {
         default_family = "GohuFont 14 Nerd Font Mono";
diff --git a/modules/home/scripts/scripts.nix b/modules/home/scripts/scripts.nix
index 3767e57..3ca810e 100644
--- a/modules/home/scripts/scripts.nix
+++ b/modules/home/scripts/scripts.nix
@@ -15,7 +15,6 @@ let
   dock-on-all-monitors = pkgs.writeScriptBin "dock-on-all-monitors" (
     builtins.readFile ./scripts/dock-on-all-monitors.sh
   );
-  caffeine = pkgs.writeScriptBin "caffeine" (builtins.readFile ./scripts/caffeine);
 in
 {
   home.packages = with pkgs; [
@@ -30,6 +29,5 @@ in
     toggle_oppacity
     ascii
     dock-on-all-monitors
-    caffeine
   ];
 }
diff --git a/modules/home/scripts/scripts/caffeine b/modules/home/scripts/scripts/caffeine
deleted file mode 100755
index 0bc1bd3..0000000
--- a/modules/home/scripts/scripts/caffeine
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-CAFFEINE_FILE="$HOME/.config/hypr/caffeine_mode"
-
-if [ -f "$CAFFEINE_FILE" ]; then
-	rm "$CAFFEINE_FILE"
-	notify-send "Caffeine" "Disabled"
-else
-	touch "$CAFFEINE_FILE"
-	notify-send "Caffeine" "Enabled"
-fi
diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index 6f2bfbf..dec5655 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -109,12 +109,11 @@
           },
 
           "custom/music": {
-            "interval": "once",
+            "interval": 5,
             "return-type": "json",
             "exec": "~/.local/bin/waybar-music",
             "on-click": "playerctl play-pause",
-            "escape": true,
-            "signal": 2
+            "escape": true
           },
 
           "custom/devices": {
diff --git a/modules/home/waybar/scripts.nix b/modules/home/waybar/scripts.nix
index c3723c0..7db02b1 100644
--- a/modules/home/waybar/scripts.nix
+++ b/modules/home/waybar/scripts.nix
@@ -97,10 +97,8 @@ in
         #!/usr/bin/env zsh
 
         typeset -A known=(
-          'ch700n' '38:18:4C:D1:AE:48'
+          'headphones' '38:18:4C:D1:AE:48'
           'airpods' '2C:18:09:EF:BD:11'
-          'headphones' '38:18:4C:D4:B7:B4'
-          'trackpad' '38:18:4C:D4:B7:B4'
         )
 
         function get_addr_or_fail () {
@@ -196,18 +194,18 @@ in
 
           if [[ "$(echo $MICROPHONE_STATE | grep 'Microphone: Connected')" ]]; then
           	MIC=1
-          	MTEXT="microphone: available!"
+          	MTEXT="󰍬 - available!"
           else
           	MIC=0
-          	MTEXT=""
+          	MTEXT=" "
           fi
 
           if [[ "$(echo $CAMERA_STATE | grep 'Camera: Connected')" ]]; then
           	CAM=1
-          	CTEXT="camera: available!"
+          	CTEXT="󰄀 - available!"
           else
           	CAM=0
-          	CTEXT=""
+          	CTEXT="󰗟 "
           fi
 
           echo "$CTEXT $MTEXT"
diff --git a/modules/security/dnscrypt.nix b/modules/security/dnscrypt.nix
index a14d80d..3541520 100644
--- a/modules/security/dnscrypt.nix
+++ b/modules/security/dnscrypt.nix
@@ -25,7 +25,7 @@ in
           "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
           "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
         ];
-        minisign_key = "sha256-fgfgm5GHDqq/RIRF8M1j6H3OZ/r1DVPgwMvwikdauNI="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
+        minisign_key = "sha256-QIpM9e7dye+EDO9rvlhSbDVLtmcgw8aLtg0DncPHK2s="; # See https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
         cache_file = "/var/lib/dnscrypt/public-resolvers.md";
       };
 
diff --git a/roles/creative.nix b/roles/creative.nix
index cb2762d..37a9200 100644
--- a/roles/creative.nix
+++ b/roles/creative.nix
@@ -16,28 +16,13 @@ in
   };
 
   config = mkIf cfg.enable {
-    programs.obs-studio = {
-      enable = true;
-      enableVirtualCamera = true;
-    };
-    environment.systemPackages = [
-      (pkgs.wrapOBS {
-        plugins = with pkgs.obs-studio-plugins; [
-          wlrobs
-          obs-backgroundremoval
-          obs-pipewire-audio-capture
-          obs-vaapi # optional AMD hardware acceleration
-          obs-gstreamer
-          obs-vkcapture
-        ];
-      })
-    ];
     home-manager = {
       users.${username} = {
         home.packages = with pkgs; [
           gimp
           darktable
           audacity
+          obs-studio
           kdePackages.kdenlive
           orca-slicer
           freecad
diff --git a/roles/gui.nix b/roles/gui.nix
index bf34e9a..9c44843 100644
--- a/roles/gui.nix
+++ b/roles/gui.nix
@@ -76,8 +76,7 @@ in
         nsxiv
         imv
         libreoffice
-        #xfce.thunar
-        nautilus
+        xfce.thunar
         # spotify
         spotify-player
         thunderbird