diff --git a/flake.lock b/flake.lock
index 7e504a0..cd0aea8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733572789,
-        "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
+        "lastModified": 1733050161,
+        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
+        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1733863840,
-        "narHash": "sha256-OO/yx700wpyKjFmsNlxep57pUIVCA1OlfEN1qUrxgCY=",
+        "lastModified": 1733345341,
+        "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "eb6f90693f91a7ce082c0c2c78627049265bc599",
+        "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1733861262,
-        "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
+        "lastModified": 1733217105,
+        "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
+        "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733550349,
-        "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
+        "lastModified": 1733261153,
+        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
+        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1733759999,
-        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
+        "lastModified": 1733212471,
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {
diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix
index 4a75200..bfbafbd 100644
--- a/hosts/crocoite/crocoite.nix
+++ b/hosts/crocoite/crocoite.nix
@@ -67,7 +67,7 @@
 
     ../../modules/users
 
-    ../../modules/hardware
+    ../../modules/specific_hardware
 
     ../../modules/sec_auth
 
diff --git a/modules/plymouth.nix b/modules/boot_theming.nix
similarity index 100%
rename from modules/plymouth.nix
rename to modules/boot_theming.nix
diff --git a/modules/customisation.nix b/modules/customisation.nix
deleted file mode 100644
index 1179963..0000000
--- a/modules/customisation.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  #MANPAGER='nvim +Man!'
-  environment.systemPackages = [pkgs.neovim];
-  environment.variables = {
-    "MANPAGER" = "nvim +Man!";
-    "EDITOR" = "nvim";
-  };
-}
diff --git a/modules/default.nix b/modules/default.nix
index 1e0352a..9a104ec 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,6 @@
 {...}: {
   imports = [
-    #./plymouth.nix
-    ./customisation.nix
+    ./boot_theming.nix
     ./environment.nix
     ./locale.nix
     ./networking.nix
diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix
deleted file mode 100644
index 13c2a0b..0000000
--- a/modules/hardware/gpu.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics.enable = true;
-  hardware.graphics.extraPackages = with pkgs; [
-    libvdpau-va-gl
-  ];
-}
diff --git a/modules/hardware/trackpoint.nix b/modules/hardware/trackpoint.nix
deleted file mode 100644
index aca3024..0000000
--- a/modules/hardware/trackpoint.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}: {
-  # probably does nothing on my amd laptop. need to check
-  hardware.trackpoint.speed = 200;
-}
diff --git a/modules/networking.nix b/modules/networking.nix
index c11e001..a014593 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@@ -29,8 +33,8 @@
   # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [8080 10001 10002];
-  networking.firewall.allowedUDPPorts = [8080 10001 10002];
+  networking.firewall.allowedTCPPorts = [8080];
+  networking.firewall.allowedUDPPorts = [8080];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 
diff --git a/modules/pkg_mgrmnt/default.nix b/modules/pkg_mgrmnt/default.nix
index 57e40d2..85f07d2 100644
--- a/modules/pkg_mgrmnt/default.nix
+++ b/modules/pkg_mgrmnt/default.nix
@@ -3,6 +3,5 @@
     ./flatpak.nix
     ./podman.nix
     ./store_pkg_file.nix
-    ./garbage-collect.nix
   ];
 }
diff --git a/modules/pkg_mgrmnt/garbage-collect.nix b/modules/pkg_mgrmnt/garbage-collect.nix
deleted file mode 100644
index 46a517b..0000000
--- a/modules/pkg_mgrmnt/garbage-collect.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{...}: {
-  nix = {
-    optimise = {
-      automatic = true;
-      dates = ["16:00" "08:00"];
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 2d";
-      persistent = true;
-      randomizedDelaySec = "1h";
-    };
-  };
-}
diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix
index 73c7dcf..7c6801a 100644
--- a/modules/sec_auth/login-manager.nix
+++ b/modules/sec_auth/login-manager.nix
@@ -7,14 +7,12 @@
     settings = {
       default_session = {
         command = ''          ${pkgs.greetd.tuigreet}/bin/tuigreet \
-                              --time \
-                              --time-format '%Y-%m-%dT%H:%M:%S %A' \
-                              --remember \
-                              --user-menu \
-                              --user-menu-min-uid 1000 \
-                              --user-menu-max-uid 2000 \
-                              --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \
-                              --cmd Hyprland'';
+                    	  --time \
+                    	  --time-format '%Y-%m-%dT%H:%M:%S %A' \
+                    	  --remember \
+                    	  --user-menu \
+                    	  --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \
+                    	  --cmd Hyprland'';
         # removed elements from theme: container
         user = "greeter";
       };
diff --git a/modules/software/android.nix b/modules/software/android.nix
deleted file mode 100644
index 766f4f4..0000000
--- a/modules/software/android.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  # for running android apps
-  # also starts the systemd service waydroid-container
-  virtualisation.waydroid.enable = true;
-}
diff --git a/modules/software/audio_video.nix b/modules/software/audio_video.nix
index ca73e58..0b9b463 100644
--- a/modules/software/audio_video.nix
+++ b/modules/software/audio_video.nix
@@ -26,7 +26,7 @@
                   "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
                   "label" = "noise_suppressor_stereo";
                   "control" = {
-                    "VAD Threshold (%)" = 75.0;
+                    "VAD Threshold (%)" = 50.0;
                   };
                 }
               ];
@@ -54,7 +54,5 @@
     easyeffects
     pwvucontrol
     lxqt.pavucontrol-qt
-
-    roc-toolkit
   ];
 }
diff --git a/modules/software/default.nix b/modules/software/default.nix
index 760ee11..d6f8fb9 100644
--- a/modules/software/default.nix
+++ b/modules/software/default.nix
@@ -7,6 +7,5 @@
     ./shell.nix
     ./software.nix
     ./virt.nix
-    ./android.nix
   ];
 }
diff --git a/modules/software/software.nix b/modules/software/software.nix
index d567312..441ab74 100644
--- a/modules/software/software.nix
+++ b/modules/software/software.nix
@@ -59,8 +59,7 @@
       nuclear
       mpv
       zathura
-      #feh
-      nomacs
+      feh
       #unstable.obsidian
       keepassxc
       #minecraft
diff --git a/modules/software/virt.nix b/modules/software/virt.nix
index 29a6c8e..b857c89 100644
--- a/modules/software/virt.nix
+++ b/modules/software/virt.nix
@@ -1,4 +1,9 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  config,
+  ...
+}: {
   # for running android apps
   virtualisation.waydroid.enable =
     true; # also starts the systemd service waydroid-container
@@ -6,7 +11,4 @@
   # virt manager, for running VM's
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
-  environment.systemPackages = with pkgs; [
-    virt-viewer
-  ];
 }
diff --git a/modules/hardware/bluetooth.nix b/modules/specific_hardware/bluetooth.nix
similarity index 100%
rename from modules/hardware/bluetooth.nix
rename to modules/specific_hardware/bluetooth.nix
diff --git a/modules/hardware/default.nix b/modules/specific_hardware/default.nix
similarity index 72%
rename from modules/hardware/default.nix
rename to modules/specific_hardware/default.nix
index 2b92f71..d64c479 100644
--- a/modules/hardware/default.nix
+++ b/modules/specific_hardware/default.nix
@@ -3,7 +3,5 @@
     ./bluetooth.nix
     ./fwupd.nix
     ./scan_and_print.nix
-    ./trackpoint.nix
-    ./gpu.nix
   ];
 }
diff --git a/modules/hardware/fwupd.nix b/modules/specific_hardware/fwupd.nix
similarity index 100%
rename from modules/hardware/fwupd.nix
rename to modules/specific_hardware/fwupd.nix
diff --git a/modules/hardware/scan_and_print.nix b/modules/specific_hardware/scan_and_print.nix
similarity index 100%
rename from modules/hardware/scan_and_print.nix
rename to modules/specific_hardware/scan_and_print.nix
diff --git a/modules/wm_and_de/components/rofi.nix b/modules/wm_and_de/components/rofi.nix
deleted file mode 100644
index f7843aa..0000000
--- a/modules/wm_and_de/components/rofi.nix
+++ /dev/null
@@ -1,131 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    rofi-wayland
-  ];
-
-  xdg.configFile."rofi/theme.rasi".text = ''
-    * {
-      bg-col: #1D2021;
-      bg-col-light: #282828;
-      border-col: #A89984;
-      selected-col: #3C3836;
-      green: #98971A;
-      fg-col: #FBF1C7;
-      fg-col2: #EBDBB2;
-      grey: #BDAE93;
-      highlight: @green;
-    }
-  '';
-
-  xdg.configFile."rofi/config.rasi".text = ''
-    configuration{
-      modi: "run,drun,window";
-      lines: 5;
-      cycle: false;
-      font: "JetBrainsMono NF Bold 15";
-      show-icons: true;
-      icon-theme: "Papirus-dark";
-      terminal: "kitty";
-      drun-display-format: "{icon} {name}";
-      location: 0;
-      disable-history: true;
-      hide-scrollbar: true;
-      display-drun: " Apps ";
-      display-run: " Run ";
-      display-window: " Window ";
-      /* display-Network: " Network"; */
-      sidebar-mode: true;
-      sorting-method: "fzf";
-    }
-
-    @theme "theme"
-
-    element-text, element-icon , mode-switcher {
-      background-color: inherit;
-      text-color:       inherit;
-    }
-
-    window {
-      height: 600px;
-      width: 900px;
-      border: 2px;
-      border-color: @border-col;
-      background-color: @bg-col;
-    }
-
-    mainbox {
-      background-color: @bg-col;
-    }
-
-    inputbar {
-      children: [prompt,entry];
-      background-color: @bg-col-light;
-      border-radius: 5px;
-      padding: 0px;
-    }
-
-    prompt {
-      background-color: @green;
-      padding: 4px;
-      text-color: @bg-col-light;
-      border-radius: 3px;
-      margin: 10px 0px 10px 10px;
-    }
-
-    textbox-prompt-colon {
-      expand: false;
-      str: ":";
-    }
-
-    entry {
-      padding: 6px;
-      margin: 10px 10px 10px 5px;
-      text-color: @fg-col;
-      background-color: @bg-col;
-      border-radius: 3px;
-    }
-
-    listview {
-      border: 0px 0px 0px;
-      padding: 6px 0px 0px;
-      margin: 10px 0px 0px 6px;
-      columns: 3;
-      background-color: @bg-col;
-      cycle: true;
-    }
-
-    element {
-      padding: 8px;
-      margin: 0px 10px 4px 4px;
-      background-color: @bg-col;
-      text-color: @fg-col;
-    }
-
-    element-icon {
-      size: 28px;
-    }
-
-    element selected {
-      background-color:  @selected-col ;
-      text-color: @fg-col2  ;
-      border-radius: 3px;
-    }
-
-    mode-switcher {
-      spacing: 0;
-    }
-
-    button {
-      padding: 10px;
-      background-color: @bg-col-light;
-      text-color: @grey;
-      vertical-align: 0.5;
-      horizontal-align: 0.5;
-    }
-
-    button selected {
-      background-color: @bg-col;
-      text-color: @green;
-    }
-  '';
-}
diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix
index 9eb04e7..06d4f07 100644
--- a/modules/wm_and_de/hyprland.nix
+++ b/modules/wm_and_de/hyprland.nix
@@ -1,7 +1,4 @@
 {pkgs, ...}: {
-  #imports = [
-  #  ./components/rofi.nix
-  #];
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
   services.xserver.enable = false;