diff --git a/lib/default.nix b/lib/default.nix
index 2dfe1a6a..9442c848 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,8 +11,8 @@
   };
 
   # Helper function for generating host configs
-  mkHost = { hostname, username, desktop ? null, installer ? null, gpu ? null }: inputs.nixpkgs.lib.nixosSystem {
-    specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu; };
+  mkHost = { hostname, username, desktop ? null, installer ? null, gpu ? null, platform ? "x86_64-linux" }: inputs.nixpkgs.lib.nixosSystem {
+    specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform; };
     modules = [
         ../nixos
         inputs.sops-nix.nixosModules.sops
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 620adc1f..e1e2cc6d 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -1,4 +1,4 @@
-{inputs, pkgs, gpu, ...}: {
+{inputs, pkgs, gpu, platform, ...}: {
 
   # nixpkgs = {
   #   overlays = [
@@ -76,14 +76,10 @@
     pkgs.swww                 # Wallpaper daemon
     pkgs.kitty                # Terminal emulator
     pkgs.rofi-wayland         # App Launcher
-    pkgs.networkmanagerapplet # NetworkManager control applet
     pkgs.grim                 # Screenshots
-    pkgs.scrot                # screenshots
     pkgs.slurp                # Screenshots
     pkgs.wl-clipboard         # Clipboard
     pkgs.font-awesome         # Fonts
-    pkgs.gruvbox-gtk-theme    # Gruvbox Theme
-    pkgs.papirus-icon-theme   # Papirus Icons
     pkgs.libinput-gestures    # Gesture Control
     pkgs.playerctl            # Control sublime-music from waybar?
     pkgs.pavucontrol          # Pulse Audio Volume CONTROL
@@ -94,7 +90,11 @@
     pkgs.nwg-bar              # Logout/shutdown/hibernate/lock screen modal UI
     pkgs.ranger               # TUI file manager
     pkgs.xdg-utils            # Utilities for better X/Wayland integration
-    inputs.nixpkgs-wayland.packages.x86_64-Linux.wayprompt            # from nixpkgs-wayland exclusively - pinentry UI
+    inputs.nixpkgs-wayland.packages.${platform}.wayprompt            # from nixpkgs-wayland exclusively - pinentry UI
+
+    # Themes
+    pkgs.gruvbox-gtk-theme    # Gruvbox Theme
+    pkgs.papirus-icon-theme   # Papirus Icons
   ];
 
   # Enable sound with pipewire.
diff --git a/nixos/default.nix b/nixos/default.nix
index 31fd0d80..e69dd62c 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, ... }: {
+{ lib, config, pkgs, hostname, stateVersion, username, desktop, gpu, inputs, platform, ... }: {
   imports = [ 
       # Services
       ./common/services/openssh.nix