diff --git a/flake.nix b/flake.nix
index e93e57e..7b5e0d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
         nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
         home-manager.url = "github:nix-community/home-manager";
         home-manager.inputs.nixpkgs.follows = "nixpkgs";
+        nix-colors.url = "github:misterio77/nix-colors";
     };
 
     outputs = {  nixpkgs, home-manager, ... }:
@@ -18,10 +19,10 @@
     {
         homeConfigurations = {
             ooks = home-manager.lib.homeManagerConfiguration {
-                inherit pkgs;
-                extraSpecialArgs = { inherit nixpkgs system; };
+                pkgs = nixpkgs.legacyPackages.x86_64-linux;
+                extraSpecialArgs = { inherit inputs outputs; };
                 modules = [
-                    ./users/main/home.nix 
+                    ./home/ooks/home.nix 
                 ];
             };
         };
diff --git a/home/ooks/modules/common/default.nix b/home/ooks/modules/common/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/user/ooks/modules/environment/hypr-variable.nix b/home/ooks/modules/environment/hypr-variable.nix
similarity index 100%
rename from user/ooks/modules/environment/hypr-variable.nix
rename to home/ooks/modules/environment/hypr-variable.nix
diff --git a/user/ooks/modules/desktop/hyprland/home.nix b/home/ooks/modules/feature/desktop/hyprland/home.nix
similarity index 100%
rename from user/ooks/modules/desktop/hyprland/home.nix
rename to home/ooks/modules/feature/desktop/hyprland/home.nix
diff --git a/user/ooks/modules/programs/default.nix b/home/ooks/modules/programs/default.nix
similarity index 100%
rename from user/ooks/modules/programs/default.nix
rename to home/ooks/modules/programs/default.nix
diff --git a/user/ooks/modules/programs/firefox/default.nix b/home/ooks/modules/programs/firefox/default.nix
similarity index 100%
rename from user/ooks/modules/programs/firefox/default.nix
rename to home/ooks/modules/programs/firefox/default.nix
diff --git a/user/ooks/modules/programs/imgview/default.nix b/home/ooks/modules/programs/imgview/default.nix
similarity index 100%
rename from user/ooks/modules/programs/imgview/default.nix
rename to home/ooks/modules/programs/imgview/default.nix
diff --git a/user/ooks/modules/programs/joshuto/config/bookmarks.toml b/home/ooks/modules/programs/joshuto/config/bookmarks.toml
similarity index 100%
rename from user/ooks/modules/programs/joshuto/config/bookmarks.toml
rename to home/ooks/modules/programs/joshuto/config/bookmarks.toml
diff --git a/user/ooks/modules/programs/joshuto/config/joshuto.toml b/home/ooks/modules/programs/joshuto/config/joshuto.toml
similarity index 100%
rename from user/ooks/modules/programs/joshuto/config/joshuto.toml
rename to home/ooks/modules/programs/joshuto/config/joshuto.toml
diff --git a/user/ooks/modules/programs/joshuto/config/keymap.toml b/home/ooks/modules/programs/joshuto/config/keymap.toml
similarity index 100%
rename from user/ooks/modules/programs/joshuto/config/keymap.toml
rename to home/ooks/modules/programs/joshuto/config/keymap.toml
diff --git a/user/ooks/modules/programs/joshuto/config/mimetype.toml b/home/ooks/modules/programs/joshuto/config/mimetype.toml
similarity index 100%
rename from user/ooks/modules/programs/joshuto/config/mimetype.toml
rename to home/ooks/modules/programs/joshuto/config/mimetype.toml
diff --git a/user/ooks/modules/programs/joshuto/config/preview_file.sh b/home/ooks/modules/programs/joshuto/config/preview_file.sh
similarity index 100%
rename from user/ooks/modules/programs/joshuto/config/preview_file.sh
rename to home/ooks/modules/programs/joshuto/config/preview_file.sh
diff --git a/user/ooks/modules/programs/joshuto/config/theme.toml b/home/ooks/modules/programs/joshuto/config/theme.toml
similarity index 100%
rename from user/ooks/modules/programs/joshuto/config/theme.toml
rename to home/ooks/modules/programs/joshuto/config/theme.toml
diff --git a/user/ooks/modules/programs/joshuto/default.nix b/home/ooks/modules/programs/joshuto/default.nix
similarity index 100%
rename from user/ooks/modules/programs/joshuto/default.nix
rename to home/ooks/modules/programs/joshuto/default.nix
diff --git a/user/ooks/modules/programs/kitty/default.nix b/home/ooks/modules/programs/kitty/default.nix
similarity index 100%
rename from user/ooks/modules/programs/kitty/default.nix
rename to home/ooks/modules/programs/kitty/default.nix
diff --git a/user/ooks/modules/programs/lazygit/default.nix b/home/ooks/modules/programs/lazygit/default.nix
similarity index 100%
rename from user/ooks/modules/programs/lazygit/default.nix
rename to home/ooks/modules/programs/lazygit/default.nix
diff --git a/user/ooks/modules/programs/mpv/default.nix b/home/ooks/modules/programs/mpv/default.nix
similarity index 100%
rename from user/ooks/modules/programs/mpv/default.nix
rename to home/ooks/modules/programs/mpv/default.nix
diff --git a/user/ooks/modules/programs/mpv/mpv.conf b/home/ooks/modules/programs/mpv/mpv.conf
similarity index 100%
rename from user/ooks/modules/programs/mpv/mpv.conf
rename to home/ooks/modules/programs/mpv/mpv.conf
diff --git a/user/ooks/modules/programs/mpv/scripts/file-browser.lua b/home/ooks/modules/programs/mpv/scripts/file-browser.lua
similarity index 100%
rename from user/ooks/modules/programs/mpv/scripts/file-browser.lua
rename to home/ooks/modules/programs/mpv/scripts/file-browser.lua
diff --git a/user/ooks/modules/programs/neofetch/default.nix b/home/ooks/modules/programs/neofetch/default.nix
similarity index 100%
rename from user/ooks/modules/programs/neofetch/default.nix
rename to home/ooks/modules/programs/neofetch/default.nix
diff --git a/user/ooks/modules/programs/notify/default.nix b/home/ooks/modules/programs/notify/default.nix
similarity index 100%
rename from user/ooks/modules/programs/notify/default.nix
rename to home/ooks/modules/programs/notify/default.nix
diff --git a/user/ooks/modules/programs/resource-monitor/default.nix b/home/ooks/modules/programs/resource-monitor/default.nix
similarity index 100%
rename from user/ooks/modules/programs/resource-monitor/default.nix
rename to home/ooks/modules/programs/resource-monitor/default.nix
diff --git a/user/ooks/modules/programs/search/default.nix b/home/ooks/modules/programs/search/default.nix
similarity index 100%
rename from user/ooks/modules/programs/search/default.nix
rename to home/ooks/modules/programs/search/default.nix
diff --git a/user/ooks/modules/programs/starship/default.nix b/home/ooks/modules/programs/starship/default.nix
similarity index 100%
rename from user/ooks/modules/programs/starship/default.nix
rename to home/ooks/modules/programs/starship/default.nix
diff --git a/user/ooks/modules/programs/youtube-tui/default.nix b/home/ooks/modules/programs/youtube-tui/default.nix
similarity index 100%
rename from user/ooks/modules/programs/youtube-tui/default.nix
rename to home/ooks/modules/programs/youtube-tui/default.nix
diff --git a/user/ooks/modules/programs/yt-dlp/default.nix b/home/ooks/modules/programs/yt-dlp/default.nix
similarity index 100%
rename from user/ooks/modules/programs/yt-dlp/default.nix
rename to home/ooks/modules/programs/yt-dlp/default.nix
diff --git a/user/ooks/modules/programs/zathura/default.nix b/home/ooks/modules/programs/zathura/default.nix
similarity index 100%
rename from user/ooks/modules/programs/zathura/default.nix
rename to home/ooks/modules/programs/zathura/default.nix
diff --git a/user/ooks/home.nix b/home/ooks/ooksdesk.nix
similarity index 100%
rename from user/ooks/home.nix
rename to home/ooks/ooksdesk.nix
diff --git a/home/ooks/ooksx1.nix b/home/ooks/ooksx1.nix
new file mode 100644
index 0000000..835ec37
--- /dev/null
+++ b/home/ooks/ooksx1.nix
@@ -0,0 +1,70 @@
+{ config, pkgs, ... }:
+
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = "ooks";
+  home.homeDirectory = "/home/ooks";
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "23.05"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  home.packages = [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # You can also manage environment variables but you will have to manually
+  # source
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/ooks/etc/profile.d/hm-session-vars.sh
+  #
+  # if you don't want to manage your shell through Home Manager.
+  home.sessionVariables = {
+    # EDITOR = "emacs";
+  };
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}
diff --git a/system/laptop/fonts.nix b/system/laptop/fonts.nix
deleted file mode 100644
index b258ebb..0000000
--- a/system/laptop/fonts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-
-{ pkgs, ... }
-{
-
-# Fonts
-
-	font.fonts = with pkgs; [
-		(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-		];
diff --git a/system/laptop/hardware-configuration.nix b/system/ooksx1/hardware-configuration.nix
similarity index 100%
rename from system/laptop/hardware-configuration.nix
rename to system/ooksx1/hardware-configuration.nix
diff --git a/system/laptop/laptop.nix b/system/ooksx1/laptop.nix
similarity index 97%
rename from system/laptop/laptop.nix
rename to system/ooksx1/laptop.nix
index 4024438..f71d1ab 100644
--- a/system/laptop/laptop.nix
+++ b/system/ooksx1/laptop.nix
@@ -46,10 +46,6 @@
 
 	nixpkgs.system = "x86_64-linux";
 
-# Allow Unfree
-# -------------------------------------------------------------------------------------------------
-
-	nixpkgs.config.allowUnfree = true;
 
 # Networking
 # -------------------------------------------------------------------------------------------------
diff --git a/system/ooksx1/modules/networking.nix b/system/ooksx1/modules/networking.nix
new file mode 100644
index 0000000..e69de29
diff --git a/system/laptop/packages.nix b/system/ooksx1/modules/packages.nix
similarity index 100%
rename from system/laptop/packages.nix
rename to system/ooksx1/modules/packages.nix
diff --git a/system/ooksx1/modules/security.nix b/system/ooksx1/modules/security.nix
new file mode 100644
index 0000000..6e0e943
--- /dev/null
+++ b/system/ooksx1/modules/security.nix
@@ -0,0 +1,46 @@
+
+
+
+
+{ config, pkgs, ... }:
+
+
+{
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  security = {
+    rtkit = {
+      enable = true;
+    };
+    polkit = {
+      enable = true;
+    };
+    sudo = {
+      enable = true;
+      extraConfig = ''
+        ooks ALL=(ALL) NOPASSWD:ALL
+        '';
+    }
+  };
+
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = [ "graphical-session.target" ];
+      wants = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      serviceConfig = {
+          Type = "simple";
+          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+          Restart = "on-failure";
+          RestartSec = 1;
+          TimeoutStopSec = 10;
+        };
+    };
+  };
+
+
+}