diff --git a/dotfiles/biscuit/home.nix b/dotfiles/biscuit/home.nix
index 3c84079..2b71745 100644
--- a/dotfiles/biscuit/home.nix
+++ b/dotfiles/biscuit/home.nix
@@ -10,7 +10,7 @@
   imports = [
     ../../modules/biscuit/editor.nix
     ../../modules/biscuit/xserver.nix
-    ../../modules/biscuit/optional.nix
+    ../../modules/biscuit/misc.nix
   ];
 
   programs.home-manager.enable = true;
diff --git a/modules/system.nix b/modules/system.nix
index 5d9bae7..dcea852 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,16 +1,13 @@
 { ... }: {
   imports = [
     ../system/bootloader.nix
-    ../system/browser.nix
     ../system/firewall.nix
     ../system/locale.nix
     ../system/networking.nix
-    ../system/print.nix
     ../system/term.nix
     ../system/development.nix
     # ../system/proxy.nix
     # ../system/recovery.nix # only supports non-flake conf
-    ../system/sound.nix
     ../system/ssh.nix
     ../system/timezone.nix
     # ../system/touchpad.nix
diff --git a/modules/xserver.nix b/modules/xserver.nix
index f149542..d1128d1 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -1,6 +1,9 @@
 {...}: {
  imports = [
     ../system/wayland.nix
+    ../system/sound.nix
+    ../system/print.nix
+    ../system/browser.nix
     ../system/font.nix 
     ../system/theme.nix
     ../system/cursor.nix
diff --git a/nixos/biscuit/configuration.nix b/nixos/biscuit/configuration.nix
index 77af307..21daaaa 100644
--- a/nixos/biscuit/configuration.nix
+++ b/nixos/biscuit/configuration.nix
@@ -9,7 +9,7 @@
     ./hardware-configuration.nix
     ../../modules/system.nix
     ../../modules/xserver.nix
-    ../../modules/misc.nix
+    ../../modules/optional.nix
   ];
 
   environment.systemPackages = with pkgs; [