diff --git a/flake.lock b/flake.lock
index 62bbe49..a12ceb7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1241,15 +1241,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1718419213,
-        "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=",
-        "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1",
+        "lastModified": 1720626042,
+        "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=",
+        "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz"
       }
     },
     "lix-module": {
@@ -1262,15 +1262,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1718778548,
-        "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=",
-        "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9",
+        "lastModified": 1720641669,
+        "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=",
+        "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
       }
     },
     "mnw": {
diff --git a/flake.nix b/flake.nix
index 3c8147a..474f431 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,16 @@
 {
   description = "My NixOS config flake";
-  outputs = inputs: {
-    inherit (inputs.nixpkgs) lib;
-    nixosConfigurations = import ./hosts {inherit inputs;};
-  };
+  outputs = inputs:
+    inputs.flake-parts.lib.mkFlake {inherit inputs;} (
+      {withSystem, ...}: {
+        systems = [
+          "x86-64_linux"
+        ];
+        flake = {
+          nixosConfigurations = import ./hosts {inherit inputs withSystem;};
+        };
+      }
+    );
   inputs = {
     # what am I doing to this config help
     flake-parts.url = "github:hercules-ci/flake-parts";
@@ -23,7 +30,7 @@
     };
     # Lix because fast rebuild times are cool
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/hosts/default.nix b/hosts/default.nix
index 281c7e7..93bfb03 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,10 +1,40 @@
-{inputs, ...}: let
+{
+  inputs,
+  withSystem,
+  ...
+}: let
   inherit (inputs) self;
-  inherit (self) lib;
+  inherit (inputs.nixpkgs) lib;
+
+  mkSystem = {
+    withSystem,
+    system,
+    ...
+  } @ args:
+    withSystem system (
+      {
+        inputs',
+        self',
+        ...
+      }:
+        lib.nixosSystem {
+          inherit system;
+          specialArgs =
+            lib.recursiveUpdate
+            {
+              inherit lib;
+              inherit inputs inputs';
+              inherit self self';
+              inherit system;
+            }
+            (args.specialArgs or {});
+          inherit (args) modules;
+        }
+    );
 in {
-  temperance = lib.nixosSystem rec {
+  temperance = mkSystem {
+    inherit withSystem;
     system = "x86_64-linux";
-    specialArgs = {inherit lib inputs self system;};
     modules = [
       ./vali/temperance
       ../modules
@@ -13,6 +43,19 @@ in {
       inputs.lix-module.nixosModules.default
     ];
   };
+
+  # temperance =
+  #   lib.nixosSystem rec {
+  #     system = "x86_64-linux";
+  #     specialArgs = {
+  #       inherit lib;
+  #       inherit
+  #         inputs
+  #         self
+  #         system
+  #         ;
+  #     };
+  #   });
   hermit = lib.nixosSystem rec {
     system = "x86_64-linux";
     specialArgs = {inherit lib inputs self system;};
diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix
index 2493e7f..875a477 100644
--- a/hosts/vali/temperance/configuration.nix
+++ b/hosts/vali/temperance/configuration.nix
@@ -51,7 +51,10 @@
     usrEnv = {
       desktops.hyprland.enable = true;
       programs = {
-        launchers.anyrun.enable = false;
+        launchers = {
+          anyrun.enable = true;
+          rofi.enable = true;
+        };
         media = {
           beets.enable = true;
           mpv.enable = true;
@@ -106,9 +109,9 @@
     };
     theming = {
       quickshell.enable = true;
-      gtk = {enable = false;};
+      gtk.enable = false;
       qt = {
-        enable = true;
+        enable = false;
         package = pkgs.kde-gruvbox;
         name = "Gruvbox-Dark";
       };
diff --git a/modules/default.nix b/modules/default.nix
index 6c0bed5..d4c4bd8 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,6 +7,7 @@ _: {
     ./services
     ./editors
     ./wms
+    ./runners
     ./styling
     ./options
   ];
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 4d88c06..89339d1 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -101,6 +101,7 @@
       direnv
       doom-modeline
       editorconfig
+      emacs-all-the-icons-fonts
       evil
       evil-collection
       evil-goggles
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
index 7428284..936dbfb 100644
--- a/modules/gui/default.nix
+++ b/modules/gui/default.nix
@@ -8,7 +8,6 @@ _: {
     ./qt.nix
     ./zathura.nix
     ./spicetify.nix
-    ./rofi.nix
     ./kitty.nix
     #./vivado.nix
     ./steam.nix
diff --git a/modules/gui/rofi.nix b/modules/gui/rofi.nix
deleted file mode 100644
index d9068cb..0000000
--- a/modules/gui/rofi.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  username = config.modules.other.system.username;
-  cfg = config.modules.programs.rofi;
-in {
-  options.modules.programs.rofi.enable = mkEnableOption "rofi";
-  config =
-    mkIf cfg.enable {environment.systemPackages = with pkgs; [rofi];};
-}
diff --git a/modules/gui/schizofox/default.nix b/modules/gui/schizofox/default.nix
index 19a352d..b0bb176 100644
--- a/modules/gui/schizofox/default.nix
+++ b/modules/gui/schizofox/default.nix
@@ -4,13 +4,11 @@
   lib,
   ...
 }: let
-  cfg = config.modules.programs.schizofox;
+  cfg = config.modules.system.programs.firefox;
   inherit (config.modules.other.system) username;
 
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkIf;
 in {
-  options.modules.programs.schizofox = {enable = mkEnableOption "schizofox";};
-
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
       imports = [inputs.schizofox.homeManagerModule];
@@ -18,23 +16,13 @@ in {
       programs.schizofox = {
         enable = true;
         theme = {
-          #  colors = {
-          #    background-darker = "181825";
-          #    background = "1e1e2e";
-          #    foreground = "cdd6f4";
-          #  };
           colors = {
             background-darker = "1d2021";
             background = "282828";
             foreground = "ebdbb2";
           };
 
-          font = "Lexend";
-          extraUserChrome = ''
-            body {
-                color: red !important;
-            }
-          '';
+          font = "ComicShannsMono Nerd Font";
         };
         search = {
           defaultSearchEngine = "DuckDuckGo";
@@ -92,7 +80,7 @@ in {
             {
               Name = "noogle";
               Descriptiom = "Noogle Search";
-              Alias = "!no";
+              Alias = "!ng";
               Method = "GET";
               URLTemplate = "https://noogle.dev/";
             }
@@ -132,13 +120,13 @@ in {
         security = {
           sanitizeOnShutdown = false;
           sandbox = true;
+          noSessionRestore = false;
           userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0";
         };
 
         misc = {
           drm.enable = true;
-          disableWebgl = true;
-          #startPageURL = "file://${./src}/index.html";
+          disableWebgl = false;
         };
       };
     };
diff --git a/modules/options/usrEnv/desktop.nix b/modules/options/usrEnv/desktop.nix
index 8ad6129..778d2de 100644
--- a/modules/options/usrEnv/desktop.nix
+++ b/modules/options/usrEnv/desktop.nix
@@ -1,5 +1,5 @@
 {
-  inputs,
+  inputs',
   config,
   pkgs,
   lib,
@@ -34,7 +34,7 @@ in {
 
         package = mkOption {
           type = package;
-          default = inputs.hyprland.packages.${pkgs.system}.hyprland;
+          default = inputs'.hyprland.packages.hyprland;
           description = ''
             The Hyprland package to be used.
           '';
diff --git a/modules/runners/anyrun/anyrun.nix b/modules/runners/anyrun/anyrun.nix
index 46db3e4..9fed020 100644
--- a/modules/runners/anyrun/anyrun.nix
+++ b/modules/runners/anyrun/anyrun.nix
@@ -1,13 +1,13 @@
 {
   config,
-  pkgs,
   lib,
   inputs,
+  inputs',
   ...
-}:
-with lib; let
+}: let
   inherit (config.modules.other.system) username;
   cfg = config.modules.usrEnv.programs.launchers.anyrun;
+  inherit (lib) mkIf;
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
@@ -16,7 +16,7 @@ in {
       programs.anyrun = {
         enable = true;
         config = {
-          plugins = with inputs.anyrun.packages.${pkgs.system}; [
+          plugins = with inputs'.anyrun.packages; [
             applications
             dictionary
             #rink
@@ -42,6 +42,7 @@ in {
             Config(
                 max_entries: 10,
                 terminal: Some("foot"),
+                desktop_actions: false
             )
           '';
           "websearch.ron".text = ''
diff --git a/modules/runners/rofi/default.nix b/modules/runners/rofi/default.nix
index f2c9746..120b8a5 100644
--- a/modules/runners/rofi/default.nix
+++ b/modules/runners/rofi/default.nix
@@ -4,203 +4,27 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf optionals;
   inherit (config.modules.other.system) username;
-  cfg = config.modules.programs.rofi;
-
-  rofiPackage = with pkgs; rofi-wayland;
+  cfg = config.modules.usrEnv.programs.launchers.rofi;
+  inherit (lib) mkIf;
 in {
-  config = mkIf env.programs.launchers.rofi.enable {
-    programs.rofi = {
-      enable = true;
-      package = rofiPackage.override {
-        plugins = [
-          pkgs.rofi-rbw
-        ];
-      };
-      font = "Iosevka Nerd Font 14";
-      extraConfig = {
-        modi = "drun,filebrowser,calc,emoji";
-        drun-display-format = " {name} ";
-        sidebar-mode = true;
-        matching = "prefix";
-        scroll-method = 0;
-        disable-history = false;
-        show-icons = true;
-
-        display-drun = " Run";
-        display-run = " Run";
-        display-filebrowser = " Files";
-        display-calc = "󰃬 Calculator";
-        display-emoji = "💀 Emoji";
-      };
-
-      theme = let
-        inherit (osConfig.modules.style.colorScheme) colors;
-        inherit (config.lib.formats.rasi) mkLiteral;
-      in {
-        "*" = {
-          background = mkLiteral "#${colors.base02}";
-          background-alt = mkLiteral "#${colors.base02}";
-          foreground = mkLiteral "#${colors.base05}";
-          selected = mkLiteral "#${colors.base00}";
-          active = mkLiteral "#${colors.base0D}";
-          urgent = mkLiteral "#${colors.base00}";
-        };
-        "window" = {
-          transparency = "real";
-          location = mkLiteral "center";
-          anchor = mkLiteral "center";
-          fullscreen = mkLiteral "false";
-          width = mkLiteral "600px";
-          x-offset = mkLiteral "0px";
-          y-offset = mkLiteral "0px";
-          enabled = mkLiteral "true";
-          border-radius = mkLiteral "20px";
-          border = mkLiteral "4px";
-          border-color = mkLiteral "#${colors.base02}";
-          cursor = "default";
-          background-color = mkLiteral "@background";
-        };
-        "mainbox" = {
-          enabled = true;
-          spacing = mkLiteral "0px";
-          background-color = mkLiteral "transparent";
-          orientation = mkLiteral "vertical";
-          children = mkLiteral "[inputbar,listbox]";
-        };
-        "listbox" = {
-          spacing = mkLiteral "10px";
-          padding = mkLiteral "10px 10px 10px 15px";
-          background-color = mkLiteral "transparent";
-          orientation = mkLiteral "vertical";
-          children = mkLiteral "[message,listview]";
-        };
-        "inputbar" = {
-          enabled = true;
-          spacing = mkLiteral "10px";
-          padding = mkLiteral "30px 20px 30px 20px";
-          background-color = mkLiteral "@selected";
-          text-color = mkLiteral "@foreground";
-          orientation = mkLiteral "horizontal";
-          children = mkLiteral "[prompt,entry]";
-        };
-        "entry" = {
-          enabled = true;
-          expand = true;
-          width = mkLiteral "300px";
-          padding = mkLiteral "12px 15px";
-          border-radius = mkLiteral "15px";
-          background-color = mkLiteral "@background-alt";
-          text-color = mkLiteral "inherit";
-          cursor = mkLiteral "text";
-          placeholder = "Search";
-          placeholder-color = mkLiteral "inherit";
-        };
-        "prompt" = {
-          width = mkLiteral "64px";
-          font = "Iosevka Nerd Font 13";
-          padding = mkLiteral "10px 20px 10px 20px";
-          border-radius = mkLiteral "15px";
-          background-color = mkLiteral "@background-alt";
-          text-color = mkLiteral "inherit";
-          cursor = mkLiteral "pointer";
-        };
-        "mode-switcher" = {
-          enabled = true;
-          spacing = mkLiteral "10px";
-          background-color = mkLiteral "transparent";
-          text-color = mkLiteral "@foreground";
-        };
-        "button" = {
-          width = mkLiteral "48px";
-          font = "Iosevka Nerd Font 14";
-          padding = mkLiteral "8px 5px 8px 8px";
-          border-radius = mkLiteral "15px";
-          background-color = mkLiteral "@background-alt";
-          text-color = mkLiteral "inherit";
-          cursor = mkLiteral "pointer";
-        };
-        "button selected" = {
-          background-color = mkLiteral "@selected";
-          text-color = mkLiteral "@foreground";
-        };
-        "listview" = {
-          enabled = true;
-          columns = 2;
-          lines = 7;
-          cycle = true;
-          dynamic = true;
-          srollbar = false;
-          layout = mkLiteral "vertical";
-          reverse = false;
-          fixed-height = true;
-          fixed-columns = false;
-          spacing = mkLiteral "5px";
-          background-color = mkLiteral "transparent";
-          text-color = mkLiteral "@foreground";
-          cursor = mkLiteral "default";
-        };
-        "element" = {
-          enabled = true;
-          spacing = mkLiteral "15px";
-          padding = mkLiteral "7px";
-          border-radius = mkLiteral "100%";
-          background-color = mkLiteral "transparent";
-          text-color = mkLiteral "@foreground";
-          cursor = mkLiteral "pointer";
-        };
-        "element normal.normal" = {
-          background-color = mkLiteral "inherit";
-          text-color = mkLiteral "inherit";
-        };
-        "element normal.urgent" = {
-          background-color = mkLiteral "@urgent";
-          text-color = mkLiteral "@foreground";
-        };
-        "element normal.active" = {
-          background-color = mkLiteral "@background";
-          text-color = mkLiteral "@active";
-        };
-        "element selected.normal" = {
-          background-color = mkLiteral "@selected";
-          text-color = mkLiteral "@foreground";
-        };
-        "element selected.urgent" = {
-          background-color = mkLiteral "@urgent";
-          text-color = mkLiteral "@foreground";
-        };
-        "element selected.active" = {
-          background-color = mkLiteral "@urgent";
-          text-color = mkLiteral "@active";
-        };
-        "element-icon" = {
-          background-color = mkLiteral "transparent";
-          text-color = mkLiteral "inherit";
-          size = mkLiteral "32px";
-          cursor = mkLiteral "inherit";
-        };
-        "element-text" = {
-          background-color = mkLiteral "transparent";
-          text-color = mkLiteral "inherit";
-          cursor = mkLiteral "inherit";
-          vertical-align = mkLiteral "0.5";
-          horizontal-align = mkLiteral "0.0";
-        };
-        "message" = {background-color = mkLiteral "transparent";};
-        "textbox" = {
-          padding = mkLiteral "12px";
-          border-radius = mkLiteral "100%";
-          background-color = mkLiteral "@background-alt";
-          text-color = mkLiteral "@foreground";
-          vertical-align = mkLiteral "0.5";
-          horizontal-align = mkLiteral "0.0";
-        };
-        "error-message" = {
-          padding = mkLiteral "12px";
-          border-radius = mkLiteral "20px";
-          background-color = mkLiteral "@background";
-          text-color = mkLiteral "@foreground";
+  config = mkIf cfg.enable {
+    home-manager.users.${username} = {
+      programs.rofi = {
+        enable = true;
+        package = pkgs.rofi-wayland;
+        location = "center";
+        extraConfig = {
+          modi = "drun,filebrowser";
+          drun-display-format = " {name} ";
+          sidebar-mode = true;
+          matching = "prefix";
+          scoll-method = 0;
+          disable_history = false;
+          show-icons = true;
+          display-drun = " Run";
+          display-run = " Run";
+          display-filebrowser = " Files";
         };
       };
     };
diff --git a/modules/runners/rofi/default2.nix b/modules/runners/rofi/default2.nix
new file mode 100644
index 0000000..f2c9746
--- /dev/null
+++ b/modules/runners/rofi/default2.nix
@@ -0,0 +1,208 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf optionals;
+  inherit (config.modules.other.system) username;
+  cfg = config.modules.programs.rofi;
+
+  rofiPackage = with pkgs; rofi-wayland;
+in {
+  config = mkIf env.programs.launchers.rofi.enable {
+    programs.rofi = {
+      enable = true;
+      package = rofiPackage.override {
+        plugins = [
+          pkgs.rofi-rbw
+        ];
+      };
+      font = "Iosevka Nerd Font 14";
+      extraConfig = {
+        modi = "drun,filebrowser,calc,emoji";
+        drun-display-format = " {name} ";
+        sidebar-mode = true;
+        matching = "prefix";
+        scroll-method = 0;
+        disable-history = false;
+        show-icons = true;
+
+        display-drun = " Run";
+        display-run = " Run";
+        display-filebrowser = " Files";
+        display-calc = "󰃬 Calculator";
+        display-emoji = "💀 Emoji";
+      };
+
+      theme = let
+        inherit (osConfig.modules.style.colorScheme) colors;
+        inherit (config.lib.formats.rasi) mkLiteral;
+      in {
+        "*" = {
+          background = mkLiteral "#${colors.base02}";
+          background-alt = mkLiteral "#${colors.base02}";
+          foreground = mkLiteral "#${colors.base05}";
+          selected = mkLiteral "#${colors.base00}";
+          active = mkLiteral "#${colors.base0D}";
+          urgent = mkLiteral "#${colors.base00}";
+        };
+        "window" = {
+          transparency = "real";
+          location = mkLiteral "center";
+          anchor = mkLiteral "center";
+          fullscreen = mkLiteral "false";
+          width = mkLiteral "600px";
+          x-offset = mkLiteral "0px";
+          y-offset = mkLiteral "0px";
+          enabled = mkLiteral "true";
+          border-radius = mkLiteral "20px";
+          border = mkLiteral "4px";
+          border-color = mkLiteral "#${colors.base02}";
+          cursor = "default";
+          background-color = mkLiteral "@background";
+        };
+        "mainbox" = {
+          enabled = true;
+          spacing = mkLiteral "0px";
+          background-color = mkLiteral "transparent";
+          orientation = mkLiteral "vertical";
+          children = mkLiteral "[inputbar,listbox]";
+        };
+        "listbox" = {
+          spacing = mkLiteral "10px";
+          padding = mkLiteral "10px 10px 10px 15px";
+          background-color = mkLiteral "transparent";
+          orientation = mkLiteral "vertical";
+          children = mkLiteral "[message,listview]";
+        };
+        "inputbar" = {
+          enabled = true;
+          spacing = mkLiteral "10px";
+          padding = mkLiteral "30px 20px 30px 20px";
+          background-color = mkLiteral "@selected";
+          text-color = mkLiteral "@foreground";
+          orientation = mkLiteral "horizontal";
+          children = mkLiteral "[prompt,entry]";
+        };
+        "entry" = {
+          enabled = true;
+          expand = true;
+          width = mkLiteral "300px";
+          padding = mkLiteral "12px 15px";
+          border-radius = mkLiteral "15px";
+          background-color = mkLiteral "@background-alt";
+          text-color = mkLiteral "inherit";
+          cursor = mkLiteral "text";
+          placeholder = "Search";
+          placeholder-color = mkLiteral "inherit";
+        };
+        "prompt" = {
+          width = mkLiteral "64px";
+          font = "Iosevka Nerd Font 13";
+          padding = mkLiteral "10px 20px 10px 20px";
+          border-radius = mkLiteral "15px";
+          background-color = mkLiteral "@background-alt";
+          text-color = mkLiteral "inherit";
+          cursor = mkLiteral "pointer";
+        };
+        "mode-switcher" = {
+          enabled = true;
+          spacing = mkLiteral "10px";
+          background-color = mkLiteral "transparent";
+          text-color = mkLiteral "@foreground";
+        };
+        "button" = {
+          width = mkLiteral "48px";
+          font = "Iosevka Nerd Font 14";
+          padding = mkLiteral "8px 5px 8px 8px";
+          border-radius = mkLiteral "15px";
+          background-color = mkLiteral "@background-alt";
+          text-color = mkLiteral "inherit";
+          cursor = mkLiteral "pointer";
+        };
+        "button selected" = {
+          background-color = mkLiteral "@selected";
+          text-color = mkLiteral "@foreground";
+        };
+        "listview" = {
+          enabled = true;
+          columns = 2;
+          lines = 7;
+          cycle = true;
+          dynamic = true;
+          srollbar = false;
+          layout = mkLiteral "vertical";
+          reverse = false;
+          fixed-height = true;
+          fixed-columns = false;
+          spacing = mkLiteral "5px";
+          background-color = mkLiteral "transparent";
+          text-color = mkLiteral "@foreground";
+          cursor = mkLiteral "default";
+        };
+        "element" = {
+          enabled = true;
+          spacing = mkLiteral "15px";
+          padding = mkLiteral "7px";
+          border-radius = mkLiteral "100%";
+          background-color = mkLiteral "transparent";
+          text-color = mkLiteral "@foreground";
+          cursor = mkLiteral "pointer";
+        };
+        "element normal.normal" = {
+          background-color = mkLiteral "inherit";
+          text-color = mkLiteral "inherit";
+        };
+        "element normal.urgent" = {
+          background-color = mkLiteral "@urgent";
+          text-color = mkLiteral "@foreground";
+        };
+        "element normal.active" = {
+          background-color = mkLiteral "@background";
+          text-color = mkLiteral "@active";
+        };
+        "element selected.normal" = {
+          background-color = mkLiteral "@selected";
+          text-color = mkLiteral "@foreground";
+        };
+        "element selected.urgent" = {
+          background-color = mkLiteral "@urgent";
+          text-color = mkLiteral "@foreground";
+        };
+        "element selected.active" = {
+          background-color = mkLiteral "@urgent";
+          text-color = mkLiteral "@active";
+        };
+        "element-icon" = {
+          background-color = mkLiteral "transparent";
+          text-color = mkLiteral "inherit";
+          size = mkLiteral "32px";
+          cursor = mkLiteral "inherit";
+        };
+        "element-text" = {
+          background-color = mkLiteral "transparent";
+          text-color = mkLiteral "inherit";
+          cursor = mkLiteral "inherit";
+          vertical-align = mkLiteral "0.5";
+          horizontal-align = mkLiteral "0.0";
+        };
+        "message" = {background-color = mkLiteral "transparent";};
+        "textbox" = {
+          padding = mkLiteral "12px";
+          border-radius = mkLiteral "100%";
+          background-color = mkLiteral "@background-alt";
+          text-color = mkLiteral "@foreground";
+          vertical-align = mkLiteral "0.5";
+          horizontal-align = mkLiteral "0.0";
+        };
+        "error-message" = {
+          padding = mkLiteral "12px";
+          border-radius = mkLiteral "20px";
+          background-color = mkLiteral "@background";
+          text-color = mkLiteral "@foreground";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/styling/stylix.nix b/modules/styling/stylix.nix
index 049d582..c515f18 100644
--- a/modules/styling/stylix.nix
+++ b/modules/styling/stylix.nix
@@ -13,11 +13,14 @@ in {
   config = mkIf cfg.enable {
     stylix = {
       enable = true;
-      homeManagerIntegration.followSystem = true;
+      autoEnable = true;
+      homeManagerIntegration = {
+        followSystem = true;
+        autoImport = true;
+      };
       base16Scheme = scheme;
       inherit image;
       polarity = "dark";
-      autoEnable = true;
       cursor = {
         inherit (cursor) size package name;
         # package = pkgs.bibata-cursors;
@@ -46,6 +49,7 @@ in {
         #   package = pkgs.lexend;
         #   name = "Lexend";
         # };
+
         emoji = {
           package = pkgs.noto-fonts-emoji;
           name = "Noto Color Emoji";
@@ -55,14 +59,14 @@ in {
         applications = 0.9;
         popups = 0.9;
         desktop = 0.9;
-        terminal = 1.0;
+        terminal = 0.9;
       };
       targets = {
         console.enable = true;
         fish.enable = true;
         grub.enable = false;
         grub.useImage = true;
-        gtk.enable = true;
+        #gtk.enable = true;
         lightdm.enable = true;
         nixos-icons.enable = true;
         nixvim.enable = true;
diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix
index 37625a3..4ebd743 100644
--- a/modules/wms/wayland/hypr/land.nix
+++ b/modules/wms/wayland/hypr/land.nix
@@ -2,20 +2,20 @@
   config,
   pkgs,
   lib,
-  inputs,
+  inputs',
   ...
 }: let
   cfg = config.modules.usrEnv.desktops.hyprland;
   inherit (config.modules.other.system) username;
-  inherit (inputs.anyrun.packages.${pkgs.system}) anyrun;
+  inherit (inputs'.anyrun.packages) anyrun;
   inherit
-    (inputs.nixpkgs-wayland.packages.${pkgs.system})
+    (inputs'.nixpkgs-wayland.packages)
     foot
     swww
     wlsunset
     ;
   inherit
-    (inputs.split-monitor-workspaces.packages.${pkgs.system})
+    (inputs'.split-monitor-workspaces.packages)
     split-monitor-workspaces
     ;
 in {
@@ -28,7 +28,7 @@ in {
       ];
       extraPortals = [
         pkgs.xdg-desktop-portal-gtk
-        inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
+        inputs'.hyprland.packages.xdg-desktop-portal-hyprland
       ];
       #config.common.default = "hyprland";
     };
@@ -205,6 +205,7 @@ in {
             "$mainMod, Q, killactive"
             "$mainMod, F, fullscreen, 0"
             "$mainMod, D, exec, ${pkgs.procps}/bin/pkill anyrun || ${anyrun}/bin/anyrun"
+            #"$mainMod, D, exec, killall rofi || rofi -show drun"
             "$mainMod, SPACE, togglefloating, active"
 
             # workspaces
@@ -262,7 +263,7 @@ in {
             "$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area"
 
             # File manager
-            "$mainMod, E, exec, ${pkgs.gnome.nautilus}/bin/nautilus"
+            "$mainMod, E, exec, ${pkgs.xfce.thunar}/bin/thunar"
             # Toggle the four different special workspaces.
             "$mainMod, B, togglespecialworkspace, btop"
             "$mainMod, V, togglespecialworkspace, pipewire"
diff --git a/options/desktop/fonts.nix b/options/desktop/fonts.nix
index 518873a..25e4f05 100644
--- a/options/desktop/fonts.nix
+++ b/options/desktop/fonts.nix
@@ -1,30 +1,31 @@
 {pkgs, ...}: {
   fonts = {
     packages = with pkgs; [
-      material-icons
       material-design-icons
-      (nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono" "ComicShannsMono"];})
+      (nerdfonts.override {fonts = ["JetBrainsMono" "ComicShannsMono"];})
       noto-fonts
-      noto-fonts-cjk
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
       noto-fonts-emoji
-      jetbrains-mono
-      lexend
-      emacs-all-the-icons-fonts
+      corefonts
     ];
     # What does this do?
+    # fonts.enableDefaultPackages: when set to true,
+    # causes some "basic" fonts to be installed for reasonable Unicode coverage.
+    # Set to true if you are unsure about what languages you
+    # might end up reading.
     enableDefaultPackages = false;
 
     # this fixes emoji stuff
-    fontconfig = {
-      defaultFonts = {
-        #monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"];
-
-        monospace = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
-        sansSerif = ["Lexend" "Noto Color Emoji"];
-        serif = ["Noto Serif" "Noto Color Emoji"];
-        emoji = ["Noto Color Emoji"];
-      };
-    };
+    # fontconfig = {
+    #   defaultFonts = {
+    #     #monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"];
+    #
+    #     monospace = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
+    #     sansSerif = ["Lexend" "Noto Color Emoji"];
+    #     serif = ["Noto Serif" "Noto Color Emoji"];
+    #     emoji = ["Noto Color Emoji"];
+    #   };
+    # };
   };
 }