diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix
index bf68b61..b0e72df 100644
--- a/hosts/vali/hermit/configuration.nix
+++ b/hosts/vali/hermit/configuration.nix
@@ -29,7 +29,6 @@
   modules = {
     system = {
       hardware = {
-        nvidia.enable = true;
         bluetooth = {
           enable = true;
           powerOnBoot = false;
@@ -75,6 +74,7 @@
       };
       style = {
         gtk.enable = true;
+        qt.enable = true;
         stylix = {
           enable = false;
           scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml";
diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix
index fb82a38..bc030d5 100644
--- a/hosts/vali/hermit/programs.nix
+++ b/hosts/vali/hermit/programs.nix
@@ -14,12 +14,8 @@ in {
     bluetuith
     bluez
     #botany
-    broot
-    browsh
-    bun
     cachix
     calc
-    calcure
     calibre
     cbonsai
     cmake
diff --git a/modules/options/style/module.nix b/modules/options/style/module.nix
index 5f0543f..5ac7f44 100644
--- a/modules/options/style/module.nix
+++ b/modules/options/style/module.nix
@@ -8,7 +8,7 @@
 in {
   imports = [
     ./stylix.nix
-    #    ./qt.nix
+    ./qt.nix
     ./gtk.nix
   ];
 
diff --git a/modules/options/style/qt.nix b/modules/options/style/qt.nix
index 1c60539..14b4ef0 100644
--- a/modules/options/style/qt.nix
+++ b/modules/options/style/qt.nix
@@ -3,57 +3,31 @@
   lib,
   pkgs,
   ...
-}:
-with lib; let
-  theme = {
-    package = pkgs.gruvbox-gtk-theme;
-    name = "Gruvbox-Dark-BL";
-  };
-  cfg = config.modules.theming.qt;
-  inherit (config.modules.other.system) username;
+}: let
+  inherit (lib) mkEnableOption mkOption;
+  inherit (lib.types) str package;
 in {
-  options.modules.theming.qt = {
+  options.modules.usrEnv.style.qt = {
     enable = mkEnableOption "qt theming";
     name = mkOption {
       description = "qt theme name";
-      type = types.str;
+      default = "Catppuccin-Mocha-Dark";
+      type = str;
     };
     variant = mkOption {
       description = "qt theme variant";
-      type = types.str;
+      default = "mocha";
+      type = str;
     };
     accentColor = mkOption {
       description = "accent colour for qt theme";
-      type = types.str;
+      default = "green";
+      type = str;
     };
     package = mkOption {
       description = "qt theme package";
-      type = types.package;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.sessionVariables = {QT_QPA_PLATFORMTHEME = "qt5ct";};
-    environment.variables = {
-      QT_STYLE_OVERRIDE = lib.mkForce "kvantum";
-      GTK_THEME = theme.name;
-    };
-
-    home-manager.users.${username} = {
-      qt = {
-        enable = true;
-        # style = {
-        #     inherit (cfg) name package;
-        # };
-      };
-      home = {
-        packages = with pkgs; [
-          qt5.qttools
-          libsForQt5.qt5ct
-          libsForQt5.qtstyleplugin-kvantum
-          breeze-icons
-        ];
-      };
+      default = pkgs.catppuccin-kde;
+      type = package;
     };
   };
 }
diff --git a/modules/options/system/module.nix b/modules/options/system/module.nix
index 144ed91..bdbe821 100644
--- a/modules/options/system/module.nix
+++ b/modules/options/system/module.nix
@@ -97,12 +97,6 @@ in {
       nvidia = mkEnableOption "Nvidia graphics drivers";
       amd = mkEnableOption "AMD graphics drivers";
     };
-    hardware = {
-      nvidia = {
-        enable = mkEnableOption "Nvidia Nvidia graphics drivers";
-      };
-      amd.enable = mkEnableOption "AMD graphics drivers";
-    };
 
     hardware.bluetooth = {
       enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)";
diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix
index 3b86e98..b43851e 100644
--- a/modules/style/fonts.nix
+++ b/modules/style/fonts.nix
@@ -9,21 +9,20 @@
   inherit (config.modules.other.system) username;
 in {
   # A (somewhat) sane list of default fonts to be installed.
-  fonts.packages = with pkgs;
-    [
-      material-design-icons
-      papirus-icon-theme
-      (nerdfonts.override {fonts = ["ComicShannsMono"];}) # ComicShanns my beloved
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-cjk-serif
-      noto-fonts-color-emoji
-      corefonts
-    ]
-    ++ optional (extraFonts != null) extraFonts;
+  fonts.packages = with pkgs; [
+    material-design-icons
+    papirus-icon-theme
+    (nerdfonts.override {fonts = ["ComicShannsMono"];}) # ComicShanns my beloved
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
+    noto-fonts-color-emoji
+    corefonts
+  ];
+  # ++ optional (extraFonts != null) extraFonts;
   # this fixes emoji stuff
   home-manager.users.${username} = {
-    fontconfig = {
+    fonts.fontconfig = {
       defaultFonts = {
         monospace = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
         sansSerif = ["ComicShannsMono Nerd Font" "Noto Color Emoji"];
diff --git a/modules/style/qt.nix b/modules/style/qt.nix
index de05a9f..7f2f32a 100644
--- a/modules/style/qt.nix
+++ b/modules/style/qt.nix
@@ -9,7 +9,7 @@ with lib; let
     package = pkgs.gruvbox-gtk-theme;
     name = "Gruvbox-Dark-BL";
   };
-  cfg = config.modules.style.qt;
+  cfg = config.modules.usrEnv.style.qt;
   inherit (config.modules.other.system) username;
 in {
   config = mkIf cfg.enable {
@@ -38,7 +38,6 @@ in {
           qt6Packages.qtstyleplugin-kvantum
           libsForQt5.qtstyleplugin-kvantum
           libsForQt5.qt5ct
-          breeze-icons
         ];
 
         sessionVariables = {
diff --git a/modules/system/hardware/bluetooth.nix b/modules/system/hardware/bluetooth.nix
index a1290ed..3fb0a6c 100644
--- a/modules/system/hardware/bluetooth.nix
+++ b/modules/system/hardware/bluetooth.nix
@@ -14,7 +14,7 @@ in {
       powerOnBoot = mkIf cfg.powerOnBoot true;
     };
 
-    home-manager.users.${username}.home.Packages = with pkgs; [
+    home-manager.users.${username}.home.packages = with pkgs; [
       bluetuith
     ];
   };
diff --git a/modules/system/hardware/graphics.nix b/modules/system/hardware/graphics.nix
index a320151..0c238f5 100644
--- a/modules/system/hardware/graphics.nix
+++ b/modules/system/hardware/graphics.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (config.modules.system.hardware) nvidia amd;
+  cfg = config.modules.system.hardware;
   inherit (lib) mkIf;
 in {
   config = {
@@ -12,24 +12,24 @@ in {
       graphics = {
         enable = true;
         extraPackages = with pkgs;
-          mkIf amd.enable [
+          mkIf cfg.amd.enable [
             mesa
             libva
             vaapiVdpa
           ];
       };
-    };
-    nvidia = mkIf nvidia.enable {
-      modesetting.enable = true;
-      open = false;
-      powerManagement = {
-        enable = true;
-        finegrained = false;
+      nvidia = mkIf cfg.nvidia.enable {
+        modesetting.enable = true;
+        open = false;
+        powerManagement = {
+          enable = true;
+          finegrained = false;
+        };
         nvidiaSettings = false;
         package = config.boot.kernelPackages.nvidiaPackages.beta;
       };
     };
-    boot.initrd.kernelModules = mkIf amd.enable ["amdgpu"];
-    services.xserver.videoDrivers = mkIf nvidia.enable ["nvidia"];
+    boot.initrd.kernelModules = mkIf cfg.amd.enable ["amdgpu"];
+    services.xserver.videoDrivers = mkIf cfg.nvidia.enable ["nvidia"];
   };
 }