diff --git a/flake.lock b/flake.lock
index 7e0e366d..bde8df2d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "anyrun": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691439091,
-        "narHash": "sha256-TfyjuHyt7+6pnwFPgSZQoKGSMEWRKNF+OQ+XTA/dahg=",
-        "owner": "Kirottu",
-        "repo": "anyrun",
-        "rev": "59e0bf6e570bb5461b0f3a1f62b15165e37a08a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Kirottu",
-        "repo": "anyrun",
-        "type": "github"
-      }
-    },
     "catppuccin-alacritty": {
       "flake": false,
       "locked": {
@@ -133,27 +112,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "anyrun",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -236,7 +194,6 @@
     },
     "root": {
       "inputs": {
-        "anyrun": "anyrun",
         "catppuccin-alacritty": "catppuccin-alacritty",
         "catppuccin-bat": "catppuccin-bat",
         "catppuccin-fish": "catppuccin-fish",
diff --git a/flake.nix b/flake.nix
index f9013af3..f51d3c5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,6 @@
       url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    anyrun = {
-      url = "github:Kirottu/anyrun";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
     catppuccin-alacritty = {
       url = "github:catppuccin/alacritty";
@@ -178,7 +174,6 @@
               extraSpecialArgs = {
                 inherit hostName user shell inputs catppuccin-themes;
                 hyprland = inputs.hyprland;
-                anyrun = inputs.anyrun;
                 wallpapers = inputs.wallpapers;
               };
               users.${user} = let
@@ -218,8 +213,6 @@
           pkgs = nixpkgs.legacyPackages.${system};
           extraSpecialArgs = {
             inherit hostName user shell inputs catppuccin-themes;
-            hyprland = inputs.hyprland;
-            anyrun = inputs.anyrun;
             wallpapers = inputs.wallpapers;
           };
           modules = [
diff --git a/home/hyprland/anyrun/default.nix b/home/hyprland/anyrun/default.nix
deleted file mode 100644
index 223b8d2a..00000000
--- a/home/hyprland/anyrun/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, anyrun, ... }:
-let anyrunPackages = anyrun.packages.${pkgs.system};
-in {
-  imports = [ anyrun.homeManagerModules.default ];
-  home.packages = with pkgs; [ rink ];
-  programs.anyrun = {
-    enable = true;
-    config = {
-      plugins = with anyrunPackages; [
-        applications
-        dictionary
-        rink
-        shell
-        stdin
-        symbols
-        translate
-      ];
-      hideIcons = false;
-      ignoreExclusiveZones = false;
-      layer = "overlay";
-      hidePluginInfo = false;
-      closeOnClick = true;
-      showResultsImmediately = false;
-      maxEntries = null;
-    };
-  };
-}
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 2815bcff..e7f8cdb0 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, anyrun, theme, ... }:
+{ config, pkgs, theme, ... }:
 let
-  anyrunPackage = anyrun.packages.${pkgs.system}.anyrun;
   emacsPackage = pkgs.emacs29-pgtk;
   firefoxPackage = pkgs.firefox-wayland;
   rofiPackage = pkgs.rofi-wayland;
@@ -90,30 +89,19 @@ in ''
   bind = SUPER SHIFT, P, exec, pkill rofi || ${rofiPackage}/bin/rofi -show power-menu
 
   # Common program shortcuts
+  bind = SUPER, E, exec, ${emacsPackage}/bin/emacsclient -c -a 'emacs'
+  bind = SUPER, B, exec, pkill rofi || ${rofiPackage}/bin/rofi -show filebrowser
   bind = SUPER, Space, exec, pkill rofi || ${rofiPackage}/bin/rofi -show combi
   bind = SUPER, Return, exec, ${pkgs.alacritty}/bin/alacritty
   bind = SUPER SHIFT, Return, exec, pkill rofi || ${rofiPackage}/bin/rofi -show run
 
-  bind = SUPER ALT, Space, submap, launch
-  bind = SUPER, E, exec, ${emacsPackage}/bin/emacsclient -c -a 'emacs'
   bind = SUPER ALT, W, exec, [workspace 2] ${firefoxPackage}/bin/firefox
-  bind = SUPER ALT, F, exec, [workspace 4] ${pkgs.xfce.thunar}/bin/thunar
-  bind = SUPER ALT, Z, exec, [workspace 4] ${pkgs.zotero}/bin/zotero
+  bind = SUPER ALT, F, exec, [workspace 4] ${pkgs.alacritty}/bin/alacritty -e mc
   bind = SUPER ALT, S, exec, [workspace 5] ${pkgs.alacritty}/bin/alacritty -e ncspot
 
-  submap = launch
-  bind = , W, exec, [workspace 2 silent] ${firefoxPackage}/bin/firefox
-  bind = , F, exec, [workspace 4 silent] ${pkgs.xfce.thunar}/bin/thunar
-  bind = , Z, exec, [workspace 4 silent] ${pkgs.zotero}/bin/zotero
-  bind = , S, exec, [workspace 5 silent] ${pkgs.alacritty}/bin/alacritty -e ncspot
-  bind = , Space, submap, reset
-  bind = SUPER, Space, submap, reset
-  bind = SUPER ALT, Space, submap, reset
-  submap = reset
-
   # Misc useful binds
   bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
-  bind=,XF86Calculator,exec,${anyrunPackage}/bin/anyrun
+  bind=,XF86Calculator,exec,pkill rofi || ${rofiPackage}/bin/rofi -show calc
   # Sound
   bindl=,XF86AudioMute,exec,${pkgs.pamixer}/bin/pamixer -t
   bindl=,XF86AudioMicMute,exec,${pkgs.pamixer}/bin/pamixer --default-source -t
@@ -149,6 +137,8 @@ in ''
   windowrule = move 100%-820 10%,(nm-connection-editor)
   windowrule = float,(Pinentry)
   windowrule = center,(Pinentry)
+  windowrule = float,(thunar)
+  windowrule = center,(thunar)
   windowrule = nofullscreenrequest,(org.remmina.Remmina)
   windowrule = nomaximizerequest,(org.remmina.Remmina)
   windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
@@ -179,7 +169,6 @@ in ''
   bind = SUPER, F, workspace, 4
   bind = SUPER SHIFT, F, movetoworkspace, 4
   windowrule = workspace 4,^(libreoffice).*
-  windowrule = workspace 4,(thunar)
   windowrulev2 = workspace 4,title:(Open),class:(soffice)
 
   # 5: [s]potify (or mu[s]ic)
@@ -214,10 +203,10 @@ in ''
   windowrule = workspace 9,(steam)
 
   # Special workspaces
-  bind = SUPER, comma, workspace, -1
-  bind = SUPER SHIFT, comma, movetoworkspace, -1
-  bind = SUPER, period, workspace, +1
-  bind = SUPER SHIFT, period, movetoworkspace, +1
+  bind = SUPER, comma, workspace, m-1
+  bind = SUPER SHIFT, comma, movetoworkspace, r-1
+  bind = SUPER, period, workspace, m+1
+  bind = SUPER SHIFT, period, movetoworkspace, r+1
   bind = SUPER, N, workspace, empty
   bind = SUPER SHIFT, N, movetoworkspace, empty
   bind = SUPER, minus, togglespecialworkspace
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 866586b0..8392ed17 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, hyprland, anyrun, wallpapers, catppuccin-themes, ... }:
+{ config, lib, pkgs, hyprland, wallpapers, catppuccin-themes, ... }:
 
 {
   imports = [
@@ -7,7 +7,6 @@
     ./waybar/default.nix
     ./swaync/default.nix
     ./rofi/default.nix
-    ./anyrun/default.nix
     ./swaylock.nix
     ./gtk.nix
   ];
@@ -41,7 +40,7 @@
       hidpi = true;
     };
     extraConfig = import ./config.nix {
-      inherit config pkgs anyrun;
+      inherit config pkgs;
       theme = catppuccin-themes.hyprland;
     };
   };
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
index 2d30f20f..583a26f7 100644
--- a/home/hyprland/rofi/default.nix
+++ b/home/hyprland/rofi/default.nix
@@ -1,15 +1,15 @@
 { pkgs, config, ... }:
 let icon-theme = config.gtk.iconTheme.name;
 in {
-  home.packages = with pkgs; [ rofi-power-menu ];
+  home.packages = with pkgs; [ rofi-power-menu libqalculate ];
   programs.rofi = {
     enable = true;
     location = "center";
     pass.enable = true;
+    plugins = with pkgs; [ rofi-calc ];
     extraConfig = {
-      modi =
-        "window,run,drun,ssh,combi,power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
-      combi-modi = "window,drun,ssh";
+      modi = "window,run,drun,ssh,filebrowser,calc,combi";
+      combi-modi = "window,drun,ssh,filebrowser";
       sort = true;
       sorting-method = "fzf";
       matching = "fuzzy";
@@ -23,6 +23,8 @@ in {
       display-run = " 󰅴  Run ";
       display-drun = " 󱓞  Launch ";
       display-ssh = " 󰢹  SSH ";
+      display-filebrowser = " 󰝰  Files ";
+      display-calc = " 󰪚  Calculator ";
       display-combi = " 󰛡  Combi ";
     };
     theme = ./theme.rasi;