diff --git a/home/ooks/modules/feature/desktop/common/fonts.nix b/home/ooks/modules/feature/desktop/common/fonts.nix
index 9d596e5..5716802 100644
--- a/home/ooks/modules/feature/desktop/common/fonts.nix
+++ b/home/ooks/modules/feature/desktop/common/fonts.nix
@@ -2,7 +2,7 @@
   fontProfiles = {
     enable = true;
     monospace = {
-      family = "JetBrains Nerd Font";
+      family = "JetBrainsMono Nerd Font";
       package = pkgs.nerdfonts.override { fonts = [ "JetBrains" ]; };
     };
     regular = {
diff --git a/home/ooks/modules/feature/desktop/common/gtk.nix b/home/ooks/modules/feature/desktop/common/gtk.nix
index f62d59e..f5d42a1 100644
--- a/home/ooks/modules/feature/desktop/common/gtk.nix
+++ b/home/ooks/modules/feature/desktop/common/gtk.nix
@@ -15,7 +15,7 @@ rec {
       package = gtkThemeFromScheme { scheme = config.colorscheme; };
     };
     iconTheme = {
-      name = "Papirus";
+      name = "Papirus-Dark";
       package = pkgs.papirus-icon-theme;
     };
   };
diff --git a/modules/home-manager/fonts.nix b/modules/home-manager/fonts.nix
new file mode 100644
index 0000000..523ecae
--- /dev/null
+++ b/modules/home-manager/fonts.nix
@@ -0,0 +1,32 @@
+{ lib, config, ... }:
+
+let
+  mkFontOption = kind: {
+    family = lib.mkOption {
+      type = lib.types.str;
+      default = null;
+      description = "Family name for ${kind} font profile";
+      example = "Fira Code";
+    };
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = null;
+      description = "Package for ${kind} font profile";
+      example = "pkgs.fira-code";
+    };
+  };
+  cfg = config.fontProfiles;
+in
+{
+  options.fontProfiles = {
+    enable = lib.mkEnableOption "Whether to enable font profiles";
+    monospace = mkFontOption "monospace";
+    regular = mkFontOption "regular";
+  };
+
+
+  config = lib.mkIf cfg.enable {
+    fonts.fontconfig.enable = true;
+    home.packages = [ cfg.monospace.package cfg.regular.package ];
+  };
+}
diff --git a/system/common/global/systemdboot.nix b/system/common/global/systemdboot.nix
index 6ea69ef..40d04b2 100644
--- a/system/common/global/systemdboot.nix
+++ b/system/common/global/systemdboot.nix
@@ -2,6 +2,7 @@
   boot.loader = {
     systemd-boot = {
       enable = true;
+      consoleMode = "max";
     };
     efi.canTouchEfiVariables = true;
   };
diff --git a/system/common/opt/bluetooth.nix b/system/common/opt/bluetooth.nix
new file mode 100644
index 0000000..038980c
--- /dev/null
+++ b/system/common/opt/bluetooth.nix
@@ -0,0 +1,6 @@
+{ config, lib, pkgs, ... }:
+
+{
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
+}
diff --git a/system/ooksx1/ooksx1.nix b/system/ooksx1/ooksx1.nix
index 3bd2020..68d663e 100644
--- a/system/ooksx1/ooksx1.nix
+++ b/system/ooksx1/ooksx1.nix
@@ -2,7 +2,7 @@
 
 
 
-{ config, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 
 # Imports
 # -------------------------------------------------------------------------------------------------
@@ -10,94 +10,38 @@
 {
 	imports = [
     inputs.hardware.nixosModules.common-pc-ssd
+    inputs.hardware.nixosModules.common-cpu-intel
+    inputs.hardware.nixosModules.common-gpu-intel
 
 		./hardware-configuration.nix
     
     ../common/user/ooks
     ../common/global/
-
+    ../common/opt/bluetooth.nix
 
 		];
 
-# Bootloader
-# -------------------------------------------------------------------------------------------------
-
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-
-
-# Nix Settings
-# -------------------------------------------------------------------------------------------------
-
-	nix = {
-		settings = {
-			auto-optimise-store = true;
-			experimental-features = "nix-command flakes";
-			};
-		
-
-# Garbage Collection
-# -------------------------------------------------------------------------------------------------
-
-	gc = {
-		automatic = true;
-		dates = "weekly";
-		options = "--delete-older-than 2d";
-		};
-	};
-
-# System Architecture
-# -------------------------------------------------------------------------------------------------
-
-
-	nixpkgs.system = "x86_64-linux";
-
-
 # Hostname and networking
 # -------------------------------------------------------------------------------------------------
 
 	networking = {
-		hostName = "ooksthink"; 		
+		hostName = "ooksx1"; 		
     networkmanager.enable = true;
 		};
 
 
-# X Server
-# -------------------------------------------------------------------------------------------------
-
-	services.xserver = {
-		 enable = true;
-		 displayManager = {
-		 	defaultSession = null;
-			startx.enable = true;
-			};
-	# displayManager.gdm = { 
-	# enable = true;
-	# wayland = true;
-	# };
-};
-
-# X11 Keymap
-# -------------------------------------------------------------------------------------------------
-
-	# services.xserver.layout = "us";
-	# services.xserver.xkbOptions = "eurosign:e,caps:escape";
-
 # Printing
 # -------------------------------------------------------------------------------------------------
 
   services.printing.enable = true;
 
-# Sound
-# -------------------------------------------------------------------------------------------------
+# Kernel
+# ------------------------------------------------------------------------------------------------
 
-	sound.enable = false;
-	hardware.pulseaudio.enable = false;
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_zen;
+  };
 
-# Touchpad
-# -------------------------------------------------------------------------------------------------
-
-	# services.xserver.libinput.enable = true;
 
 # Laptop Programs
 # -------------------------------------------------------------------------------------------------
@@ -112,32 +56,26 @@
 # XDG Portal
 # ------------------------------------------------------------------------------------------------
 
-xdg.portal = {
-  enable = true;
-  wlr.enable = true;
-};
+  xdg.portal = {
+    enable = true;
+    wlr.enable = true;
+  };
 
-# Fonts
+# gnupg
 # -------------------------------------------------------------------------------------------------
 
-fonts.fonts = with pkgs; [
-	(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-	];
-
-# Programs
-# -------------------------------------------------------------------------------------------------
-
-	programs.mtr.enable = true;
 	programs.gnupg.agent = {
 		enable = true;
 		enableSSHSupport = true;
- 		};
+ 	};
 
 # Services
 # -------------------------------------------------------------------------------------------------
 
 	services = {
-		};
+    logind = {
+      lidSwitch = "suspend";
+    };
 		dbus = {
       enable = true;
       packages = [ pkgs.gcr ];
@@ -152,11 +90,10 @@ fonts.fonts = with pkgs; [
 				charger = {
 					governor = "performance";
 					turbo = "auto";
-					};
 				};
 			};
-
-	};	
+		};
+  };	
 
 	systemd = {
 		user.services.polkit-gnome-authentication-agent-1 = {
@@ -170,14 +107,9 @@ fonts.fonts = with pkgs; [
 				Restart = "on-failure";
 				RestartSec = 1;
 				TimeoutStopSec = 10;
-				};
 			};
 		};
-
-# D-Bus
-# -------------------------------------------------------------------------------------------------
-
-	services.dbus.enable = true;
+	};
 
 # Firewall
 # -------------------------------------------------------------------------------------------------