diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 89c934b8..fe104a41 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -96,8 +96,8 @@ in ''
   bind = SUPER, Q, killactive,
   bind = SUPER SHIFT, Q, exec, rofi -replace -show power-menu
   bind = SUPER, V, togglefloating
-  bind = SUPER, F, fullscreen, 0
-  bind = SUPER SHIFT, F, fullscreen, 1
+  bind = SUPER, M, fullscreen, 0
+  bind = SUPER SHIFT, M, fullscreen, 1
   bind = SUPER, tab, exec, rofi -replace -show window
   bind = SUPER, P, exec, pkill rofi || rofi-pass
   bind = SUPER SHIFT, P, exec, pkill rofi || rofi-pass --last-used
@@ -109,6 +109,7 @@ in ''
   bind = SUPER, Space, exec, rofi -replace -show combi
   bind = SUPER, Return, exec, foot
   bind = SUPER SHIFT, Return, exec, [float] foot
+  bind = SUPER, X, exec, emacsclient -c -a emacs
 
   # Misc useful binds
   bind=,Print,exec,grim -g "$(slurp)"
@@ -154,10 +155,6 @@ in ''
   windowrule = size 800 600,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor)
   windowrule = move onscreen 100%-820 60,(pavucontrol|.blueman-manager-wrapped|nm-connection-editor)
 
-  windowrule = nomaximizerequest,(libreoffice|soffice)(.*)
-  windowrule = nofullscreenrequest, (libreoffice|soffice)(.*)
-  windowrulev2 = float,title:(Open),class:(libreoffice|soffice)(.*))
-
   windowrule = nofullscreenrequest,(org.remmina.Remmina|Nxplayer.bin)
   windowrule = nomaximizerequest,(org.remmina.Remmina|Nxplayer.bin)
   windowrulev2 = float,title:(Remmina Remote Desktop Client|Remmina Preferences),class:(org.remmina.Remmina)
@@ -203,6 +200,15 @@ in ''
   bind = SUPER SHIFT, W, movetoworkspace, name:web
   windowrule = workspace name:web silent, (chromium-browser)
 
+  bind = SUPER, F, moveworkspacetomonitor, name:files current
+  bind = SUPER, F, workspace, name:files
+  bind = SUPER SHIFT, F, movetoworkspace, name:files
+  windowrule = workspace name:files silent, (thunar|czkawka_gui|org.nickvision.tagger)
+  windowrule = workspace name:files silent, (libreoffice|soffice)(.*)
+  windowrule = nomaximizerequest, (libreoffice|soffice)(.*)
+  windowrule = nofullscreenrequest, (libreoffice|soffice)(.*)
+  windowrulev2 = float,title:(Open),class:(libreoffice|soffice)(.*))
+
   bind = SUPER, B, moveworkspacetomonitor, name:btm current
   bind = SUPER, B, workspace, name:btm
   bind = SUPER SHIFT, B, movetoworkspace, name:btm
@@ -216,8 +222,8 @@ in ''
   bind = SUPER, G, workspace, name:games
   bind = SUPER SHIFT, G, movetoworkspace, name:games
   windowrule = workspace name:games silent, (steam)
-  # windowrulev2 = float,title:(Friends List),class:(steam)
-  # windowrulev2 = float,title:(Steam Settings),class:(steam)
+  windowrulev2 = float,title:(Friends List),class:(steam)
+  windowrulev2 = float,title:(Steam Settings),class:(steam)
 
   bind = SUPER, S, moveworkspacetomonitor, name:stream current
   bind = SUPER, S, workspace, name:stream
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 3f8e64a1..30035216 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -42,6 +42,7 @@
           "editor" = "";
           "term" = "󰆍";
           "web" = "󰀹";
+          "files" = "󰝰";
           "btm" = "";
           "chat" = "󰙯";
           "games" = "󰓓";
diff --git a/system/hyprland.nix b/system/hyprland.nix
index 5458a527..2bb201f4 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -43,6 +43,8 @@
   services = {
     blueman.enable = true;
     udisks2.enable = true;
+    gvfs.enable = true;
+    tumbler.enable = true;
     xserver.enable = false;
     greetd.settings = let command = "Hyprland";
     in {
@@ -54,7 +56,10 @@
   programs = {
     dconf.enable = true;
     light.enable = true;
-    noisetorch.enable = true;
+    thunar = {
+      enable = true;
+      plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
+    };
     hyprland = {
       enable = true;
       xwayland.enable = true;