diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 6faffd25..d83ece4e 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -236,10 +236,9 @@
             "SUPER, Q, killactive,"
             "SUPER SHIFT, Q, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show powermenu -modi powermenu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
             "SUPER, V, togglefloating"
-            "SUPER, M, fullscreen, 0"
-            "SUPER SHIFT, M, fullscreen, 1"
+            "SUPER, M, fullscreen, 1"
+            "SUPER SHIFT, M, fullscreen, 0"
             "SUPER, tab, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show window"
-            "SUPER, F, exec, pkill rofi || ${rofi.finalPackage}/bin/rofi -show filebrowser"
             "SUPER, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass"
             "SUPER SHIFT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --last-used"
             "SUPER ALT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --insert"
@@ -252,7 +251,6 @@
             "SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c"
             "SUPER, S, exec, ${alacritty.package}/bin/alacritty -e btm --group --battery"
             "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt --no-socket"
-            "SUPER SHIFT, W, exec, ${pkgs.firefox}/bin/firefox"
 
             # Misc useful binds
             '',Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"''
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index 3c24a636..e9e35b60 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -14,7 +14,7 @@
       '';
     };
     extraConfig = {
-      modi = "combi,drun,ssh,window,filebrowser";
+      modi = "combi,drun,ssh,window";
       combi-modi = "window,drun,ssh";
       sidebar-mode = true;
       sort = true;
@@ -29,7 +29,6 @@
       display-window = " 󰧨  Move ";
       display-run = " 󰅴  Run ";
       display-drun = " 󱓞  Apps ";
-      display-filebrowser = " 󰝰  Files ";
       display-ssh = " 󰢹  SSH ";
       display-combi = " 󰛡  Combi ";
     };
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 4a0b44b6..57585a8e 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -37,6 +37,7 @@
         "rewrite" = {
           "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
           "Alacritty" = " ";
+          "(.*) - Thunar" = "󰝰  $1";
           "Nyxt - (.*)" = "󰀹  $1";
           "(.*) — Mozilla Firefox" = "󰈹  $1";
           ".*WebCord (.*)" = "󰙯  $1";
diff --git a/system/hyprland.nix b/system/hyprland.nix
index f8a64e89..81afd95d 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [./desktop.nix ./firefox.nix ./chromium.nix];
   nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
   environment = {
@@ -24,9 +28,14 @@
   };
   security.pam.services.swaylock = {};
   services = {
+    xserver.enable = false;
     blueman.enable = true;
     udisks2.enable = true;
-    xserver.enable = false;
+    tumbler.enable = true;
+    gvfs = {
+      enable = true;
+      package = lib.mkForce pkgs.gnome3.gvfs;
+    };
     greetd.settings = let
       command = "Hyprland";
     in {
@@ -112,6 +121,10 @@
   programs = {
     dconf.enable = true;
     light.enable = true;
+    thunar = {
+      enable = true;
+      plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
+    };
     hyprland = {
       enable = true;
       xwayland.enable = true;