diff --git a/modules/home/programs/gui/default.nix b/modules/home/programs/gui/default.nix
index f7b07b7..4666bc9 100644
--- a/modules/home/programs/gui/default.nix
+++ b/modules/home/programs/gui/default.nix
@@ -1,9 +1,10 @@
 { ... }:
 {
   imports = [
+    ./firefox
     ./foot
     ./imv
-    ./librewolf
+    ./looking-glass
     ./mangohud
     ./mpv
     ./obs
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/firefox/default.nix
similarity index 93%
rename from modules/home/programs/gui/librewolf/default.nix
rename to modules/home/programs/gui/firefox/default.nix
index d5973cb..cb06da0 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/firefox/default.nix
@@ -3,7 +3,6 @@
   config = lib.mkIf config.home.desktop.enable {
     programs.firefox = {
       enable = true;
-      package = pkgs.librewolf;
       profiles = let
         # FireFox css, based on https://github.com/Dook97/firefox-qutebrowser-userchrome
         themeFont = ''
@@ -263,25 +262,6 @@
             ${builtins.readFile ./quteFox.css}
           '';
         };
-        Misc = {
-          id = 2;
-          extensions = commonExtensions;
-          search = commonSearch;
-          bookmarks = commonBookmarks;
-          settings = commonSettings;
-        };
-      };
-    };
-
-    # Fixes
-    home.file = {
-      # Symlinks to Librewolf
-      ".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox";
-      
-      # Gnome theme
-      ".mozilla/firefox/Misc/chrome".source = fetchTarball {
-        url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/refs/tags/v132.zip";
-        sha256 = "095sv1ann2v7q5bfy65i118ylhp2vkpbgyf6fz84nd9yrx14rzwm";
       };
     };
   };
diff --git a/modules/home/programs/gui/librewolf/quteFox.css b/modules/home/programs/gui/firefox/quteFox.css
similarity index 100%
rename from modules/home/programs/gui/librewolf/quteFox.css
rename to modules/home/programs/gui/firefox/quteFox.css
diff --git a/modules/home/programs/gui/looking-glass/default.nix b/modules/home/programs/gui/looking-glass/default.nix
new file mode 100644
index 0000000..cac6897
--- /dev/null
+++ b/modules/home/programs/gui/looking-glass/default.nix
@@ -0,0 +1,16 @@
+{ config, ... }:
+{
+  programs.looking-glass-client = {
+    enable = config.home.desktop.enable;
+    settings = {
+      input = {
+        rawMouse = true;
+        escapeKey = 62;
+      };
+      spice = {
+        enable = true;
+        audio = true;
+      };
+    };
+  };
+}
diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix
index 5d35144..98621b6 100644
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@@ -2,12 +2,12 @@
 {
   imports = [
     ./btop
+    ./eza
     ./fastfetch
     ./git
     ./ncmpcpp
     ./neovim
     ./nh
-    ./notfound
     ./ranger
     ./spotdl
     ./tmux
diff --git a/modules/home/programs/terminal/eza/default.nix b/modules/home/programs/terminal/eza/default.nix
new file mode 100644
index 0000000..6f8bc0b
--- /dev/null
+++ b/modules/home/programs/terminal/eza/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+{
+  programs.eza = {
+    enable = true;
+    git = true;
+    icons = "auto";
+    colors = "always";
+    extraOptions = [ "--group-directories-first" ];
+  };
+}
diff --git a/modules/home/programs/terminal/notfound/default.nix b/modules/home/programs/terminal/notfound/default.nix
deleted file mode 100644
index f5ed4b1..0000000
--- a/modules/home/programs/terminal/notfound/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.command-not-found.enable = true;
-}
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index dbc4fc8..b0554ee 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -35,8 +35,8 @@
         command = ''mpv --shuffle --no-audio-display -- "$@"'';
       }
       {
-        condition = ''ext x?html?|pdf, has librewolf, X, flag f'';
-        command = ''librewolf -- "$@"'';
+        condition = ''ext x?html?|pdf, has firefox, X, flag f'';
+        command = ''firefox -- "$@"'';
       }
       {
         condition = ''ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f'';
diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix
index 7d353a9..15ed467 100644
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@@ -7,7 +7,10 @@
     oh-my-zsh = {
       enable = true;
       theme = "agnoster";
-      plugins = [ "git" ];
+      plugins = [
+        "git"
+        "history"
+      ];
     };
     initExtra = ''
       pfetch
diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix
index 6b5b16f..510a186 100644
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@@ -14,7 +14,6 @@
     # Shortcuts
     ff = "clear && fastfetch";
     ip = "ip -c";
-    ls = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first --icons";
     cat = "${pkgs.bat}/bin/bat --paging never";
     copycat = "wl-copy <";
     myip = "curl ifconfig.co";
diff --git a/modules/home/wms/niri/autostart/default.nix b/modules/home/wms/niri/autostart/default.nix
index 585feeb..b963d27 100644
--- a/modules/home/wms/niri/autostart/default.nix
+++ b/modules/home/wms/niri/autostart/default.nix
@@ -14,7 +14,6 @@
     spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
     
     // Foreground
-    //spawn-at-startup "librewolf" "-p" "Misc" "--name" "MiscBrowser"
     spawn-at-startup "thunderbird"
     spawn-at-startup "vesktop"
   '';
diff --git a/modules/home/wms/niri/hotkeys/default.nix b/modules/home/wms/niri/hotkeys/default.nix
index a19cd8b..33c795f 100644
--- a/modules/home/wms/niri/hotkeys/default.nix
+++ b/modules/home/wms/niri/hotkeys/default.nix
@@ -9,9 +9,8 @@
       //// Launchers
     
       // Browser
-      ${primeMod}+F1 { spawn "sh" "-c" "librewolf -p Main --name MainBrowser | notify-send \"Main Browser\""; }
-      ${primeMod}+F2 { spawn "sh" "-c" "librewolf -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
-      ${primeMod}+F3 { spawn "sh" "-c" "librewolf -p Misc --name MiscBrowser | notify-send \"Miscellaneous Browser\""; }
+      ${primeMod}+F1 { spawn "sh" "-c" "firefox -p Main --name MainBrowser | notify-send \"Main Browser\""; }
+      ${primeMod}+F2 { spawn "sh" "-c" "firefox -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
     
       // Virtual machines
       ${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; }
diff --git a/modules/home/wms/niri/rules/default.nix b/modules/home/wms/niri/rules/default.nix
index a5ee0ec..be30e59 100644
--- a/modules/home/wms/niri/rules/default.nix
+++ b/modules/home/wms/niri/rules/default.nix
@@ -27,20 +27,16 @@
     }
 
     // Etc
-    window-rule {
-      match app-id="looking-glass-client"
-      open-on-workspace "${config.ws.w2a}"
-    }
     window-rule {
       match app-id="com.obsproject.Studio"
       open-on-workspace "${config.ws.w4a}"
     }
 
-    //// Layer rules (Uncomment after 0.1.11)
-    //layer-rule {
-    //  match namespace="^notifications$"
-    //  block-out-from "screencast"
-    //}
+    // Layer rules
+    layer-rule {
+      match namespace="^notifications$"
+      block-out-from "screencast"
+    }
 
     // Everything else
     screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 4697927..6db48af 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -15,9 +15,9 @@
       all-outputs = true;
       tooltip = false;
       rewrite = {
-        "(.*) — LibreWolf" = "   $1";
-        "LibreWolf" = "   Firefox";
-        "(.*) - LibreWolf — Firefox" = "󰗃   $1";
+        "(.*) — Mozilla Firefox" = "   $1";
+        "Mozilla Firefox" = "   Firefox";
+        "(.*) - Mozilla Firefox — Firefox" = "󰗃   $1";
       };
     };
 
diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix
index 26fff27..b94eda7 100644
--- a/modules/home/wms/sway/hotkeys/default.nix
+++ b/modules/home/wms/sway/hotkeys/default.nix
@@ -12,9 +12,9 @@
       ## Launchers
 
       # Browser profiles
-      "${primeMod}+F1" = ''exec librewolf -p Main --name MainBrowser | notify-send "Main Browser"'';
-      "${primeMod}+F2" = ''exec librewolf -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
-      "${primeMod}+F3" = ''exec librewolf -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';
+      "${primeMod}+F1" = ''exec firefox -p Main --name MainBrowser | notify-send "Main Browser"'';
+      "${primeMod}+F2" = ''exec firefox -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
+      "${primeMod}+F3" = ''exec firefox -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';
 
       # Virtual machines
       "${primeMod}+F4" = ''exec virt-manager | notify-send "Virtual Machines"'';
diff --git a/modules/home/wms/sway/rules/default.nix b/modules/home/wms/sway/rules/default.nix
index 0a50d13..592bbe7 100644
--- a/modules/home/wms/sway/rules/default.nix
+++ b/modules/home/wms/sway/rules/default.nix
@@ -65,7 +65,6 @@
         { class = "steam"; }
         { app_id = "heroic"; }
       ];
-      "22:${config.ws.w2a}" = [{ app_id = "looking-glass-client"; }];
       "44:${config.ws.w4a}" = [{ app_id = "com.obsproject.Studio"; }];
     };
     focus.newWindow = "focus";
diff --git a/modules/system/accounts/users/custom/main/default.nix b/modules/system/accounts/users/custom/main/default.nix
index 4d6c847..b49e6d8 100644
--- a/modules/system/accounts/users/custom/main/default.nix
+++ b/modules/system/accounts/users/custom/main/default.nix
@@ -3,16 +3,17 @@
   users.users."${config.sysusers.main}" = {
     hashedPassword = config.secrets.mainAccPass;
     isNormalUser = true;
+    openssh.authorizedKeys.keyFiles = [
+      ../../../../../../hosts/tower/id_ed25519.pub
+
+      ../../../../../../hosts/envy/id_ed25519.pub
+      ../../../../../../hosts/redmond/id_ed25519.pub
+
+      ../../../../../../hosts/kitty/id_ed25519.pub
+      ../../../../../../hosts/midas/id_ed25519.pub
+      ../../../../../../hosts/prophet/id_ed25519.pub
+    ];
     openssh.authorizedKeys.keys = [
-      (builtins.readFile ../../../../../../hosts/tower/id_ed25519.pub)
-
-      (builtins.readFile ../../../../../../hosts/envy/id_ed25519.pub)
-      (builtins.readFile ../../../../../../hosts/redmond/id_ed25519.pub)
-
-      (builtins.readFile ../../../../../../hosts/kitty/id_ed25519.pub)
-      (builtins.readFile ../../../../../../hosts/midas/id_ed25519.pub)
-      (builtins.readFile ../../../../../../hosts/prophet/id_ed25519.pub)
-
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
     ];
     extraGroups = [
diff --git a/modules/system/devices/bluetooth/default.nix b/modules/system/devices/bluetooth/default.nix
index b2a1b45..766aec7 100644
--- a/modules/system/devices/bluetooth/default.nix
+++ b/modules/system/devices/bluetooth/default.nix
@@ -9,8 +9,6 @@
       };
     };
 
-    systemd.tmpfiles.rules = [ "f /var/lib/systemd/linger/${config.sysusers.main}" ];
-
     environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
   };
 }
diff --git a/modules/system/services/general/libvirtd/default.nix b/modules/system/services/general/libvirtd/default.nix
index 0759b77..9324286 100644
--- a/modules/system/services/general/libvirtd/default.nix
+++ b/modules/system/services/general/libvirtd/default.nix
@@ -3,39 +3,30 @@
   options.system.libvirtd.enable = lib.mkEnableOption "Enable libvirtd services";
 
   config = lib.mkIf config.system.libvirtd.enable {
-    virtualisation = {
-      libvirtd = {
-        enable = true;
-        onBoot = "ignore";
-        onShutdown = "shutdown";
-        qemu = {
-          ovmf = {
-            enable = true;
-            packages = with pkgs; [ OVMFFull.fd ];
-          };
-          swtpm.enable = true;
+    virtualisation.libvirtd = {
+      enable = true;
+      onBoot = "ignore";
+      onShutdown = "shutdown";
+      qemu = {
+        ovmf = {
+          enable = true;
+          packages = with pkgs; [ OVMFFull.fd ];
         };
+        vhostUserPackages = with pkgs; [ virtiofsd ];
+        swtpm.enable = true;
       };
     };
 
-    environment = {
-      systemPackages = with pkgs; [
-        virt-manager
-        virtiofsd
-        dnsmasq
-        spice-vdagent
-        looking-glass-client
-      ];
+    programs.virt-manager.enable = true;
 
-      persistence."/persist".directories = [
-        "/var/lib/libvirt/dnsmasq"
-        "/var/lib/libvirt/nwfilter"
-        "/var/lib/libvirt/qemu"
-        "/var/lib/libvirt/secrets"
-        "/var/lib/libvirt/storage"
-        "/var/lib/libvirt/swtpm"
-      ];
-    };
+    environment.persistence."/persist".directories = [
+      "/var/lib/libvirt/dnsmasq"
+      "/var/lib/libvirt/nwfilter"
+      "/var/lib/libvirt/qemu"
+      "/var/lib/libvirt/secrets"
+      "/var/lib/libvirt/storage"
+      "/var/lib/libvirt/swtpm"
+    ];
 
     # Needed to make NAT work
     networking.firewall.trustedInterfaces = [
@@ -43,6 +34,6 @@
       "virbr1"
     ];
 
-    systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 ${config.sysusers.main} libvirtd -" ];
+    systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 - libvirtd -" ];
   };
 }
diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix
index 082f6cb..b897e31 100644
--- a/modules/system/services/server/forgejo/default.nix
+++ b/modules/system/services/server/forgejo/default.nix
@@ -1,10 +1,11 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   imports = [ ./nginx ];
 
   config = lib.mkIf config.system.server.enable {
     services.forgejo = {
       enable = true;
+      package = pkgs.forgejo;
       settings = {
         server = {
           DOMAIN = "git.${config.domains.p2}";
@@ -33,8 +34,6 @@
 
     services.ddclient.domains = [ "git.${config.domains.p2}" ];
 
-    environment.persistence."/persist".directories = [
-      "/var/lib/forgejo"
-    ];
+    environment.persistence."/persist".directories = [ "/var/lib/forgejo" ];
   };
 }