diff --git a/CLAUDE.md b/CLAUDE.md
index c22c238..78374b3 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,35 +2,42 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
+## Project Notes
+- **Repository**: https://github.com/TheArctesian/omnixy
+- **System Name**: The system uses "omnixy" for flake names and commands
+- **Git Setup**: The installation process requires users to set up their GitHub account manually before initializing the git repository
+
 ## Overview
-This repository contains Omarchy NixOS, a declarative system configuration that transforms NixOS into a beautiful, modern development environment based on Hyprland. Unlike the original Arch-based Omarchy, this version uses Nix's declarative configuration management for reproducible systems.
+This repository contains OmniXY NixOS (https://github.com/TheArctesian/omnixy), a declarative system configuration that transforms NixOS into a beautiful, modern development environment based on Hyprland. This version uses Nix's declarative configuration management for reproducible systems.
 
 ## Key Commands
 
 ### System Management
 ```bash
 # Rebuild system configuration
-sudo nixos-rebuild switch --flake /etc/nixos#omarchy
-omarchy-rebuild  # Convenience wrapper
+sudo nixos-rebuild switch --flake /etc/nixos#omnixy
+omnixy-rebuild  # Convenience wrapper
 
 # Update system and flake inputs
-omarchy update
+omnixy update
 
 # Clean and optimize Nix store
-omarchy clean
+omnixy clean
 
 # Search for packages
-omarchy search <package-name>
+omnixy search <package-name>
 ```
 
 ### Development Workflows
 ```bash
 # Test configuration changes
-nixos-rebuild build --flake .#omarchy  # Build without switching
+nixos-rebuild build --flake .#omnixy  # Build without switching
 
 # Enter development shell
 nix develop  # Uses flake.nix devShell
 nix develop .#python  # Language-specific shell
+nix develop .#node    # Node.js development
+nix develop .#rust    # Rust development
 
 # Format Nix code
 nixpkgs-fmt *.nix
@@ -47,7 +54,7 @@ deadnix .       # Dead code elimination
 ls modules/themes/
 
 # Test theme switch
-omarchy theme tokyo-night
+omnixy theme tokyo-night
 
 # Create new theme
 cp modules/themes/tokyo-night.nix modules/themes/my-theme.nix
@@ -95,7 +102,7 @@ The configuration is split into focused modules:
 1. **System packages**: Add to `modules/packages.nix` in appropriate category
 2. **User packages**: Add to `home.nix` home.packages
 3. **Development only**: Add to devShell in flake.nix
-4. Always rebuild/test: `nixos-rebuild build --flake .#omarchy`
+4. Always rebuild/test: `nixos-rebuild build --flake .#omnixy`
 
 ### Creating Modules
 1. Follow NixOS module structure with options and config sections
@@ -122,8 +129,8 @@ The configuration is split into focused modules:
 - Export packages and apps for external consumption
 
 ### Testing Changes
-- Build configuration: `nixos-rebuild build --flake .#omarchy`
-- Test in VM: `nixos-rebuild build-vm --flake .#omarchy`
+- Build configuration: `nixos-rebuild build --flake .#omnixy`
+- Test in VM: `nixos-rebuild build-vm --flake .#omnixy`
 - Check evaluation: `nix flake check`
 - Format code: `nixpkgs-fmt .`
 
diff --git a/README.md b/README.md
index 1d98616..4be3d94 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Omarchy NixOS
+# OmniXY NixOS
 
-Transform your NixOS installation into a fully-configured, beautiful, and modern development system based on Hyprland by running a single command. Omarchy brings the elegance of declarative configuration to desktop Linux, creating a reproducible and version-controlled development environment.
+Transform your NixOS installation into a fully-configured, beautiful, and modern development system based on Hyprland by running a single command. OmniXY brings the elegance of declarative configuration to desktop Linux, creating a reproducible and version-controlled development environment.
 
 ## ✨ Features
 
@@ -63,20 +63,20 @@ sudo nixos-rebuild switch --flake .#omnixy
 ### System Management
 
 ```bash
-omarchy help              # Show all available commands
-omarchy update            # Update system and flake inputs
-omarchy clean             # Clean and optimize Nix store
-omarchy info              # Show system information
-omarchy-rebuild           # Rebuild system configuration
+omnixy help              # Show all available commands
+omnixy update            # Update system and flake inputs
+omnixy clean             # Clean and optimize Nix store
+omnixy info              # Show system information
+omnixy-rebuild           # Rebuild system configuration
 ```
 
 ### Theme Management
 
 ```bash
-omarchy theme             # List available themes
-omarchy theme tokyo-night # Switch to Tokyo Night theme
-omarchy-theme-list        # List all available themes
-omarchy-theme-set catppuccin  # Set Catppuccin theme
+omnixy theme             # List available themes
+omnixy theme tokyo-night # Switch to Tokyo Night theme
+omnixy-theme-list        # List all available themes
+omnixy-theme-set catppuccin  # Set Catppuccin theme
 ```
 
 ### Development Environments
@@ -102,12 +102,12 @@ dev-mongodb               # MongoDB container
 ### Package Management
 
 ```bash
-omarchy search firefox    # Search for packages
+omnixy search firefox    # Search for packages
 nix search nixpkgs python # Alternative package search
 
 # Install packages by editing configuration
 # Add to modules/packages.nix, then:
-omarchy-rebuild           # Apply changes
+omnixy-rebuild           # Apply changes
 ```
 
 ## ⌨️ Key Bindings
@@ -129,7 +129,7 @@ omarchy-rebuild           # Apply changes
 ## 📁 Project Structure
 
 ```
-omarchy-nixos/
+omnixy/
 ├── configuration.nix          # Main NixOS configuration entry point
 ├── flake.nix                  # Flake definition with inputs/outputs
 ├── home.nix                   # Home-manager user configuration
@@ -211,7 +211,7 @@ environment.systemPackages = with pkgs; [
 
 Then rebuild:
 ```bash
-omarchy-rebuild
+omnixy-rebuild
 ```
 
 ### Adding User Packages
@@ -243,7 +243,7 @@ currentTheme = "my-theme";
 
 4. Rebuild to apply:
 ```bash
-omarchy-rebuild
+omnixy-rebuild
 ```
 
 ### Creating Development Environments
@@ -270,11 +270,11 @@ Use with: `nix develop .#myproject`
 
 ```bash
 # Test configuration without switching
-nixos-rebuild build --flake .#omarchy
+nixos-rebuild build --flake .#omnixy
 
 # Test in virtual machine
-nixos-rebuild build-vm --flake .#omarchy
-./result/bin/run-omarchy-vm
+nixos-rebuild build-vm --flake .#omnixy
+./result/bin/run-omnixy-vm
 
 # Check flake evaluation
 nix flake check
@@ -312,7 +312,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 - [Home Manager Manual](https://nix-community.github.io/home-manager/) - User environment management
 - [Hyprland Wiki](https://wiki.hyprland.org/) - Hyprland configuration reference
 - [Nix Package Search](https://search.nixos.org/) - Search available packages
-- [GitHub Issues](https://github.com/yourusername/omarchy-nixos/issues) - Report bugs or request features
+- [GitHub Issues](https://github.com/TheArctesian/omnixy/issues) - Report bugs or request features
 
 ## 📚 Learning Resources
 
diff --git a/boot.sh b/boot.sh
index db982b5..3274582 100755
--- a/boot.sh
+++ b/boot.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# Omarchy NixOS Bootstrap Script
-# Downloads and installs Omarchy on a fresh NixOS system
+# OmniXY NixOS Bootstrap Script
+# Downloads and installs OmniXY on a fresh NixOS system
 
 set -e
 
@@ -42,7 +42,7 @@ check_nixos() {
 main() {
     show_banner
 
-    echo -e "${BLUE}Welcome to Omarchy NixOS Bootstrap!${NC}"
+    echo -e "${BLUE}Welcome to OmniXY NixOS Bootstrap!${NC}"
     echo
     check_nixos
 
@@ -53,25 +53,25 @@ main() {
     fi
 
     # Use custom repo if specified, otherwise default
-    OMARCHY_REPO="${OMARCHY_REPO:-yourusername/omarchy-nixos}"
-    OMARCHY_REF="${OMARCHY_REF:-main}"
+    OMNIXY_REPO="${OMNIXY_REPO:-TheArctesian/omnixy}"
+    OMNIXY_REF="${OMNIXY_REF:-main}"
 
-    echo -e "${BLUE}Cloning Omarchy from: https://github.com/${OMARCHY_REPO}.git${NC}"
+    echo -e "${BLUE}Cloning OmniXY from: https://github.com/${OMNIXY_REPO}.git${NC}"
 
     # Remove existing directory
-    rm -rf ~/.local/share/omarchy-nixos/
+    rm -rf ~/.local/share/omnixy/
 
     # Clone repository
-    git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy-nixos
+    git clone "https://github.com/${OMNIXY_REPO}.git" ~/.local/share/omnixy
 
     # Use custom branch if specified
-    if [[ $OMARCHY_REF != "main" ]]; then
-        echo -e "${GREEN}Using branch: $OMARCHY_REF${NC}"
-        cd ~/.local/share/omarchy-nixos
-        git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
+    if [[ $OMNIXY_REF != "main" ]]; then
+        echo -e "${GREEN}Using branch: $OMNIXY_REF${NC}"
+        cd ~/.local/share/omnixy
+        git fetch origin "${OMNIXY_REF}" && git checkout "${OMNIXY_REF}"
     fi
 
-    cd ~/.local/share/omarchy-nixos
+    cd ~/.local/share/omnixy
 
     echo -e "${BLUE}Starting installation...${NC}"
     ./install.sh
diff --git a/configuration.nix b/configuration.nix
index a4d5e1e..23a52e5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-# Omarchy NixOS Configuration
+# OmniXY NixOS Configuration
 # This is the main NixOS configuration file
 # Edit this file to define what should be installed on your system
 
@@ -6,7 +6,7 @@
 
 let
   # Import custom modules
-  omarchy = import ./modules { inherit config pkgs lib; };
+  omnixy = import ./modules { inherit config pkgs lib; };
 
   # Current theme - can be changed easily
   currentTheme = "tokyo-night";
@@ -67,7 +67,7 @@ in
     # Plymouth for boot splash
     plymouth = {
       enable = true;
-      theme = "omarchy";
+      theme = "omnixy";
       themePackages = [ (pkgs.callPackage ./packages/plymouth-theme.nix {}) ];
     };
 
@@ -77,7 +77,7 @@ in
 
   # Networking
   networking = {
-    hostName = "omarchy";
+    hostName = "omnixy";
     networkmanager.enable = true;
 
     # Firewall
@@ -143,8 +143,8 @@ in
   # System version
   system.stateVersion = "24.05";
 
-  # Custom Omarchy settings
-  omarchy = {
+  # Custom OmniXY settings
+  omnixy = {
     enable = true;
     theme = currentTheme;
 
diff --git a/flake.nix b/flake.nix
index faeb3dd..43097fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Omarchy - NixOS configuration for modern development";
+  description = "OmniXY - NixOS configuration for modern development";
 
   inputs = {
     # Nixpkgs
@@ -61,7 +61,7 @@
     {
       # NixOS configuration
       nixosConfigurations = {
-        omarchy = nixpkgs.lib.nixosSystem {
+        omnixy = nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = { inherit inputs; };
           modules = [
@@ -116,18 +116,18 @@
           ];
 
           shellHook = ''
-            echo "🚀 Welcome to Omarchy development environment!"
+            echo "🚀 Welcome to OmniXY development environment!"
             echo ""
             echo "Available commands:"
-            echo "  omarchy-rebuild  - Rebuild system configuration"
-            echo "  omarchy-update   - Update flake inputs"
-            echo "  omarchy-clean    - Garbage collect nix store"
+            echo "  omnixy-rebuild  - Rebuild system configuration"
+            echo "  omnixy-update   - Update flake inputs"
+            echo "  omnixy-clean    - Garbage collect nix store"
             echo ""
 
             # Setup aliases
-            alias omarchy-rebuild="sudo nixos-rebuild switch --flake .#omarchy"
-            alias omarchy-update="nix flake update"
-            alias omarchy-clean="nix-collect-garbage -d"
+            alias omnixy-rebuild="sudo nixos-rebuild switch --flake .#omnixy"
+            alias omnixy-update="nix flake update"
+            alias omnixy-clean="nix-collect-garbage -d"
 
             # Initialize starship prompt
             eval "$(starship init bash)"
@@ -175,11 +175,11 @@
 
       # Packages that can be built
       packages.${system} = {
-        # Omarchy scripts as packages
-        omarchy-scripts = pkgs.callPackage ./packages/scripts.nix {};
+        # OmniXY scripts as packages
+        omnixy-scripts = pkgs.callPackage ./packages/scripts.nix {};
 
         # Plymouth theme
-        plymouth-theme-omarchy = pkgs.callPackage ./packages/plymouth-theme.nix {};
+        plymouth-theme-omnixy = pkgs.callPackage ./packages/plymouth-theme.nix {};
       };
 
       # Apps that can be run
@@ -187,12 +187,12 @@
         # Installer
         installer = {
           type = "app";
-          program = "${pkgs.writeShellScriptBin "omarchy-install" ''
+          program = "${pkgs.writeShellScriptBin "omnixy-install" ''
             #!/usr/bin/env bash
             set -e
 
-            echo "🚀 Omarchy NixOS Installer"
-            echo "========================="
+            echo "🚀 OmniXY NixOS Installer"
+            echo "========================"
             echo ""
 
             # Check if running on NixOS
@@ -201,7 +201,7 @@
               exit 1
             fi
 
-            echo "This will install Omarchy configuration to your NixOS system."
+            echo "This will install OmniXY configuration to your NixOS system."
             read -p "Continue? (y/n) " -n 1 -r
             echo
 
@@ -214,7 +214,7 @@
             sudo cp -r /etc/nixos /etc/nixos.backup.$(date +%Y%m%d-%H%M%S)
 
             # Copy new configuration
-            echo "📝 Installing Omarchy configuration..."
+            echo "📝 Installing OmniXY configuration..."
             sudo cp -r ${self}/* /etc/nixos/
 
             # Initialize flake
@@ -225,12 +225,12 @@
 
             # Rebuild
             echo "🏗️  Rebuilding system..."
-            sudo nixos-rebuild switch --flake /etc/nixos#omarchy
+            sudo nixos-rebuild switch --flake /etc/nixos#omnixy
 
             echo ""
             echo "✅ Installation complete!"
-            echo "🎉 Welcome to Omarchy!"
-          ''}/bin/omarchy-install";
+            echo "🎉 Welcome to OmniXY!"
+          ''}/bin/omnixy-install";
         };
       };
     };
diff --git a/home.nix b/home.nix
index 8255614..3fdc074 100644
--- a/home.nix
+++ b/home.nix
@@ -145,13 +145,13 @@
       find = "fd";
 
       # NixOS specific
-      rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#omarchy";
+      rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#omnixy";
       update = "nix flake update";
       clean = "nix-collect-garbage -d";
 
-      # Omarchy specific
-      omarchy-theme = "omarchy-theme-set";
-      omarchy-update = "omarchy-update";
+      # OmniXY specific
+      omnixy-theme = "omnixy-theme-set";
+      omnixy-update = "omnixy-update";
     };
 
     initExtra = ''
@@ -260,7 +260,7 @@
 
     profiles.default = {
       settings = {
-        "browser.startup.homepage" = "https://omarchy.org";
+        "browser.startup.homepage" = "https://github.com/TheArctesian/omnixy";
         "privacy.donottrackheader.enabled" = true;
         "privacy.trackingprotection.enabled" = true;
         "privacy.trackingprotection.socialtracking.enabled" = true;
diff --git a/install.sh b/install.sh
index 9c6145b..9190248 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# Omarchy NixOS Installation Script
-# This script helps install Omarchy on an existing NixOS system
+# OmniXY NixOS Installation Script
+# This script helps install OmniXY on an existing NixOS system
 
 set -e
 
@@ -17,15 +17,14 @@ show_banner() {
     echo -e "${BLUE}"
     cat << 'EOF'
      ▄▄▄
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
-███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
-███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
-                                       ███   █▀
+ ▄█████▄     ▄████▄    ██▄   ▄██  ██▄  ▄██  ▄██   ▄██    ▄█  ▄█   █▄    ▄█   █▄
+███   ███   ███  ███   ███▄ ▄███  ███  ███  ███   ███   ███ ███   ███  ███   ███
+███   ███  ███    ███  ████▀████  ███▄▄███  ███▄  ███   ███ ███   ███  ███   ███
+███   ███  ███    ███  ███   ███  ████████  █████████   ███ ▄███▄▄▄███▄ ███▄▄▄███
+███   ███  ███    ███  ███   ███  ███  ███  ███ █████   ███ ▀▀███▀▀▀███  ▀▀▀▀▀▀███
+███   ███  ███    ███  ███   ███  ███  ███  ███  ████   ███  ███   ███  ▄██   ███
+███   ███   ███  ███   ███   ███  ███  ███  ███   ███   ███  ███   ███  ███   ███
+ ▀█████▀     ▀████▀    ███   ███  ███  ███  ███   ███    ▀█  ███   █▀    ▀█████▀
 
                             NixOS Edition
 EOF
@@ -156,19 +155,19 @@ generate_hardware_config() {
 }
 
 # Initialize git repository
-init_git() {
-    echo -e "${BLUE}📚 Initializing git repository...${NC}"
-
-    cd /etc/nixos
-
-    if [ ! -d .git ]; then
-        sudo git init
-        sudo git add .
-        sudo git commit -m "Initial Omarchy configuration"
-    fi
-
-    echo -e "${GREEN}✓ Git repository initialized${NC}"
-}
+# init_git() {
+#     echo -e "${BLUE}📚 Initializing git repository...${NC}"
+# 
+#     cd /etc/nixos
+# 
+#     if [ ! -d .git ]; then
+#         sudo git init
+#         sudo git add .
+#         sudo git commit -m "Initial Omarchy configuration"
+#     fi
+# 
+#     echo -e "${GREEN}✓ Git repository initialized${NC}"
+# }
 
 # Build and switch to new configuration
 build_system() {
@@ -176,7 +175,7 @@ build_system() {
     echo "This may take a while on first run..."
 
     # Build the system
-    sudo nixos-rebuild switch --flake /etc/nixos#omarchy
+    sudo nixos-rebuild switch --flake /etc/nixos#omnixy
 
     echo -e "${GREEN}✓ System built successfully!${NC}"
 }
@@ -189,9 +188,9 @@ show_complete() {
     echo -e "${GREEN}╰──────────────────────────────────────────╯${NC}"
     echo
     echo -e "${BLUE}Quick Start Guide:${NC}"
-    echo "  • Run 'omarchy help' for available commands"
-    echo "  • Run 'omarchy-theme-list' to see available themes"
-    echo "  • Run 'omarchy update' to update your system"
+    echo "  • Run 'omnixy help' for available commands"
+    echo "  • Run 'omnixy-theme-list' to see available themes"
+    echo "  • Run 'omnixy update' to update your system"
     echo
     echo -e "${BLUE}Key Bindings (Hyprland):${NC}"
     echo "  • Super + Return: Open terminal"
@@ -201,7 +200,7 @@ show_complete() {
     echo
     echo -e "${YELLOW}Note: You may need to reboot for all changes to take effect.${NC}"
     echo
-    echo "For more information, visit: https://omarchy.org"
+    echo "For more information, visit: https://github.com/TheArctesian/omnixy"
 }
 
 # Main installation flow
@@ -240,9 +239,9 @@ main() {
         show_complete
     else
         echo -e "${YELLOW}Installation paused. To complete, run:${NC}"
-        echo "  sudo nixos-rebuild switch --flake /etc/nixos#omarchy"
+        echo "  sudo nixos-rebuild switch --flake /etc/nixos#omnixy"
     fi
 }
 
 # Run main function
-main "$@"
\ No newline at end of file
+main "$@"
diff --git a/modules/core.nix b/modules/core.nix
index 862fe74..6370b80 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -3,11 +3,11 @@
 with lib;
 
 let
-  cfg = config.omarchy;
+  cfg = config.omnixy;
 in
 {
-  options.omarchy = {
-    enable = mkEnableOption "Omarchy system configuration";
+  options.omnixy = {
+    enable = mkEnableOption "OmniXY system configuration";
 
     user = mkOption {
       type = types.str;
@@ -33,7 +33,7 @@ in
     # Basic system configuration
     system.autoUpgrade = {
       enable = true;
-      flake = "/etc/nixos#omarchy";
+      flake = "/etc/nixos#omnixy";
       flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
       dates = "weekly";
     };
@@ -178,15 +178,15 @@ in
       GOPATH = "$HOME/go";
       NPM_CONFIG_PREFIX = "$HOME/.npm";
 
-      # Omarchy specific
-      OMARCHY_ROOT = "/etc/nixos";
-      OMARCHY_VERSION = "1.0.0";
+      # OmniXY specific
+      OMNIXY_ROOT = "/etc/nixos";
+      OMNIXY_VERSION = "1.0.0";
     };
 
     # Shell configuration
     programs.bash = {
       interactiveShellInit = ''
-        # Omarchy bash initialization
+        # OmniXY bash initialization
         export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/go/bin:$HOME/.npm/bin:$PATH"
 
         # Aliases
@@ -198,14 +198,14 @@ in
         alias vim='nvim'
         alias vi='nvim'
 
-        # Omarchy specific aliases
-        alias omarchy-rebuild='sudo nixos-rebuild switch --flake /etc/nixos#omarchy'
-        alias omarchy-update='nix flake update --flake /etc/nixos'
-        alias omarchy-clean='sudo nix-collect-garbage -d'
-        alias omarchy-search='nix search nixpkgs'
+        # OmniXY specific aliases
+        alias omnixy-rebuild='sudo nixos-rebuild switch --flake /etc/nixos#omnixy'
+        alias omnixy-update='nix flake update --flake /etc/nixos'
+        alias omnixy-clean='sudo nix-collect-garbage -d'
+        alias omnixy-search='nix search nixpkgs'
 
         # Functions
-        omarchy-theme() {
+        omnixy-theme() {
           local theme=$1
           if [ -z "$theme" ]; then
             echo "Available themes: tokyo-night, catppuccin, gruvbox, nord, everforest, rose-pine, kanagawa"
@@ -215,19 +215,19 @@ in
           echo "Switching to theme: $theme"
           # This would need to update the configuration and rebuild
           sudo sed -i "s/currentTheme = \".*\"/currentTheme = \"$theme\"/" /etc/nixos/configuration.nix
-          omarchy-rebuild
+          omnixy-rebuild
         }
 
-        omarchy-help() {
+        omnixy-help() {
           cat << EOF
-        Omarchy Commands:
-        ================
-        omarchy-rebuild  - Rebuild system configuration
-        omarchy-update   - Update flake inputs
-        omarchy-clean    - Garbage collect nix store
-        omarchy-search   - Search for packages
-        omarchy-theme    - Change system theme
-        omarchy-help     - Show this help message
+        OmniXY Commands:
+        ===============
+        omnixy-rebuild  - Rebuild system configuration
+        omnixy-update   - Update flake inputs
+        omnixy-clean    - Garbage collect nix store
+        omnixy-search   - Search for packages
+        omnixy-theme    - Change system theme
+        omnixy-help     - Show this help message
 
         Key Bindings (Hyprland):
         =======================
@@ -239,13 +239,13 @@ in
         Super + F        - Fullscreen
         Super + Space    - Toggle floating
 
-        For more information, visit: https://omarchy.org
+        For more information, visit: https://github.com/TheArctesian/omnixy
         EOF
         }
 
         # Welcome message
         if [ -z "$IN_NIX_SHELL" ]; then
-          echo "Welcome to Omarchy! Type 'omarchy-help' for available commands."
+          echo "Welcome to OmniXY! Type 'omnixy-help' for available commands."
         fi
       '';
 
@@ -287,12 +287,12 @@ in
       nixpkgs-fmt
       nil
 
-      # Custom Omarchy scripts
-      (writeShellScriptBin "omarchy-info" ''
+      # Custom OmniXY scripts
+      (writeShellScriptBin "omnixy-info" ''
         #!/usr/bin/env bash
-        echo "Omarchy NixOS"
-        echo "============="
-        echo "Version: ${config.omarchy.version or "1.0.0"}"
+        echo "OmniXY NixOS"
+        echo "============"
+        echo "Version: ${config.omnixy.version or "1.0.0"}"
         echo "Theme: ${cfg.theme}"
         echo "User: ${cfg.user}"
         echo ""
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index 99eee78..025e9de 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -3,11 +3,11 @@
 with lib;
 
 let
-  cfg = config.omarchy.desktop;
+  cfg = config.omnixy.desktop;
 in
 {
-  options.omarchy.desktop = {
-    enable = mkEnableOption "Omarchy Hyprland desktop environment";
+  options.omnixy.desktop = {
+    enable = mkEnableOption "OmniXY Hyprland desktop environment";
 
     monitors = mkOption {
       type = types.listOf types.str;
@@ -139,10 +139,10 @@ in
 
     # Create Hyprland config directory structure
     system.activationScripts.hyprlandConfig = ''
-      mkdir -p /etc/omarchy/hyprland
+      mkdir -p /etc/omnixy/hyprland
 
       # Main Hyprland configuration
-      cat > /etc/omarchy/hyprland/hyprland.conf <<'EOF'
+      cat > /etc/omnixy/hyprland/hyprland.conf <<'EOF'
       # Omarchy Hyprland Configuration
       # See https://wiki.hyprland.org/Configuring/
 
@@ -387,7 +387,7 @@ in
     '';
 
     # Waybar configuration
-    home-manager.users.${config.omarchy.user or "user"} = {
+    home-manager.users.${config.omnixy.user or "user"} = {
       programs.waybar = {
         enable = true;
         systemd.enable = true;
diff --git a/modules/development.nix b/modules/development.nix
index ca77160..e0e7ed1 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.omarchy.features.development;
+  cfg = config.omnixy.features.development;
 in
 {
   config = mkIf cfg {
diff --git a/modules/packages.nix b/modules/packages.nix
index 90f336d..9986ac9 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -3,11 +3,11 @@
 with lib;
 
 let
-  cfg = config.omarchy;
+  cfg = config.omnixy;
 in
 {
-  options.omarchy.packages = {
-    enable = mkEnableOption "Omarchy packages";
+  options.omnixy.packages = {
+    enable = mkEnableOption "OmniXY packages";
 
     categories = {
       base = mkEnableOption "Base system packages" // { default = true; };
diff --git a/modules/services.nix b/modules/services.nix
index 5e7db8b..c520426 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.omarchy;
+  cfg = config.omnixy;
 in
 {
   # System services configuration
@@ -218,7 +218,7 @@ in
     #   enable = true;
     #   allowReboot = false;
     #   dates = "04:00";
-    #   flake = "/etc/nixos#omarchy";
+    #   flake = "/etc/nixos#omnixy";
     # };
 
     # Earlyoom - out of memory killer
@@ -232,7 +232,7 @@ in
     logrotate = {
       enable = true;
       settings = {
-        "/var/log/omarchy/*.log" = {
+        "/var/log/omnixy/*.log" = {
           frequency = "weekly";
           rotate = 4;
           compress = true;
@@ -270,25 +270,25 @@ in
     };
 
     # Custom Omarchy services
-    services.omarchy-init = {
+    services.omnixy-init = {
       description = "Omarchy initialization service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
-        ExecStart = pkgs.writeShellScript "omarchy-init" ''
+        ExecStart = pkgs.writeShellScript "omnixy-init" ''
           #!/usr/bin/env bash
           echo "Initializing Omarchy..."
 
           # Create necessary directories
-          mkdir -p /var/log/omarchy
-          mkdir -p /var/lib/omarchy
-          mkdir -p /etc/omarchy
+          mkdir -p /var/log/omnixy
+          mkdir -p /var/lib/omnixy
+          mkdir -p /etc/omnixy
 
           # Set up initial configuration
-          if [ ! -f /etc/omarchy/initialized ]; then
-            echo "$(date): Omarchy initialized" > /etc/omarchy/initialized
+          if [ ! -f /etc/omnixy/initialized ]; then
+            echo "$(date): OmniXY initialized" > /etc/omnixy/initialized
             echo "Welcome to Omarchy!" > /etc/motd
           fi
         '';
diff --git a/modules/themes/catppuccin.nix b/modules/themes/catppuccin.nix
index 202b680..4343b42 100644
--- a/modules/themes/catppuccin.nix
+++ b/modules/themes/catppuccin.nix
@@ -5,14 +5,14 @@
   config = {
     # Color palette
     environment.variables = {
-      OMARCHY_THEME = "catppuccin";
-      OMARCHY_THEME_BG = "#1e1e2e";
-      OMARCHY_THEME_FG = "#cdd6f4";
-      OMARCHY_THEME_ACCENT = "#cba6f7";
+      OMNIXY_THEME = "catppuccin";
+      OMNIXY_THEME_BG = "#1e1e2e";
+      OMNIXY_THEME_FG = "#cdd6f4";
+      OMNIXY_THEME_ACCENT = "#cba6f7";
     };
 
     # Home-manager theme configuration
-    home-manager.users.${config.omarchy.user or "user"} = {
+    home-manager.users.${config.omnixy.user or "user"} = {
       # Alacritty theme
       programs.alacritty.settings.colors = {
         primary = {
diff --git a/modules/themes/tokyo-night.nix b/modules/themes/tokyo-night.nix
index 1e0ede0..917650c 100644
--- a/modules/themes/tokyo-night.nix
+++ b/modules/themes/tokyo-night.nix
@@ -5,14 +5,14 @@
   config = {
     # Color palette
     environment.variables = {
-      OMARCHY_THEME = "tokyo-night";
-      OMARCHY_THEME_BG = "#1a1b26";
-      OMARCHY_THEME_FG = "#c0caf5";
-      OMARCHY_THEME_ACCENT = "#7aa2f7";
+      OMNIXY_THEME = "tokyo-night";
+      OMNIXY_THEME_BG = "#1a1b26";
+      OMNIXY_THEME_FG = "#c0caf5";
+      OMNIXY_THEME_ACCENT = "#7aa2f7";
     };
 
     # Home-manager theme configuration
-    home-manager.users.${config.omarchy.user or "user"} = {
+    home-manager.users.${config.omnixy.user or "user"} = {
       # Alacritty theme
       programs.alacritty.settings.colors = {
         primary = {
diff --git a/modules/users.nix b/modules/users.nix
index 8378574..f6dddce 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -3,13 +3,13 @@
 with lib;
 
 let
-  cfg = config.omarchy;
+  cfg = config.omnixy;
 in
 {
   # User account configuration
   users.users.${cfg.user} = {
     isNormalUser = true;
-    description = "Omarchy User";
+    description = "OmniXY User";
     extraGroups = [
       "wheel"
       "networkmanager"
@@ -23,7 +23,7 @@ in
     shell = pkgs.bash;
 
     # Set initial password (should be changed on first login)
-    initialPassword = "omarchy";
+    initialPassword = "omnixy";
 
     # SSH keys (add your SSH public keys here)
     openssh.authorizedKeys.keys = [
diff --git a/packages/scripts.nix b/packages/scripts.nix
index fd92acd..f691d07 100644
--- a/packages/scripts.nix
+++ b/packages/scripts.nix
@@ -1,8 +1,8 @@
 { pkgs, lib, ... }:
 
-# Omarchy utility scripts as a Nix package
+# OmniXY utility scripts as a Nix package
 pkgs.stdenv.mkDerivation rec {
-  pname = "omarchy-scripts";
+  pname = "omnixy-scripts";
   version = "1.0.0";
 
   # No source needed for script-only package
@@ -26,7 +26,7 @@ pkgs.stdenv.mkDerivation rec {
     mkdir -p $out/bin
 
     # Theme management
-    cat > $out/bin/omarchy-theme-set << 'EOF'
+    cat > $out/bin/omnixy-theme-set << 'EOF'
     #!/usr/bin/env bash
     set -e
 
@@ -34,7 +34,7 @@ pkgs.stdenv.mkDerivation rec {
     AVAILABLE_THEMES="tokyo-night catppuccin gruvbox nord everforest rose-pine kanagawa"
 
     if [ -z "$THEME" ]; then
-      echo "Usage: omarchy-theme-set <theme>"
+      echo "Usage: omnixy-theme-set <theme>"
       echo "Available themes: $AVAILABLE_THEMES"
       exit 1
     fi
@@ -51,15 +51,15 @@ pkgs.stdenv.mkDerivation rec {
     sudo sed -i "s/currentTheme = \".*\"/currentTheme = \"$THEME\"/" /etc/nixos/configuration.nix
 
     # Rebuild system
-    sudo nixos-rebuild switch --flake /etc/nixos#omarchy
+    sudo nixos-rebuild switch --flake /etc/nixos#omnixy
 
     echo "Theme switched to $THEME successfully!"
     EOF
-    chmod +x $out/bin/omarchy-theme-set
+    chmod +x $out/bin/omnixy-theme-set
 
-    cat > $out/bin/omarchy-theme-list << 'EOF'
+    cat > $out/bin/omnixy-theme-list << 'EOF'
     #!/usr/bin/env bash
-    echo "Available Omarchy themes:"
+    echo "Available OmniXY themes:"
     echo "========================"
     echo "  • tokyo-night (default)"
     echo "  • catppuccin"
@@ -71,16 +71,16 @@ pkgs.stdenv.mkDerivation rec {
     echo ""
     echo "Current theme: $(grep currentTheme /etc/nixos/configuration.nix | cut -d'"' -f2)"
     echo ""
-    echo "To change theme, run: omarchy-theme-set <theme-name>"
+    echo "To change theme, run: omnixy-theme-set <theme-name>"
     EOF
-    chmod +x $out/bin/omarchy-theme-list
+    chmod +x $out/bin/omnixy-theme-list
 
     # System management
-    cat > $out/bin/omarchy-update << 'EOF'
+    cat > $out/bin/omnixy-update << 'EOF'
     #!/usr/bin/env bash
     set -e
 
-    echo "🔄 Updating Omarchy system..."
+    echo "🔄 Updating OmniXY system..."
     echo ""
 
     # Update flake inputs
@@ -96,18 +96,18 @@ pkgs.stdenv.mkDerivation rec {
     # Rebuild system
     echo ""
     echo "🏗️  Rebuilding system..."
-    sudo nixos-rebuild switch --flake .#omarchy
+    sudo nixos-rebuild switch --flake .#omnixy
 
     echo ""
     echo "✅ System updated successfully!"
     EOF
-    chmod +x $out/bin/omarchy-update
+    chmod +x $out/bin/omnixy-update
 
-    cat > $out/bin/omarchy-clean << 'EOF'
+    cat > $out/bin/omnixy-clean << 'EOF'
     #!/usr/bin/env bash
     set -e
 
-    echo "🧹 Cleaning Omarchy system..."
+    echo "🧹 Cleaning OmniXY system..."
     echo ""
 
     # Show current store size
@@ -131,32 +131,32 @@ pkgs.stdenv.mkDerivation rec {
     echo ""
     echo "✅ Cleanup complete!"
     EOF
-    chmod +x $out/bin/omarchy-clean
+    chmod +x $out/bin/omnixy-clean
 
     # Package management
-    cat > $out/bin/omarchy-search << 'EOF'
+    cat > $out/bin/omnixy-search << 'EOF'
     #!/usr/bin/env bash
 
     QUERY="$1"
 
     if [ -z "$QUERY" ]; then
-      echo "Usage: omarchy-search <package-name>"
+      echo "Usage: omnixy-search <package-name>"
       exit 1
     fi
 
     echo "Searching for '$QUERY'..."
     nix search nixpkgs "$QUERY" 2>/dev/null | head -50
     EOF
-    chmod +x $out/bin/omarchy-search
+    chmod +x $out/bin/omnixy-search
 
-    cat > $out/bin/omarchy-install << 'EOF'
+    cat > $out/bin/omnixy-install << 'EOF'
     #!/usr/bin/env bash
     set -e
 
     PACKAGES="$*"
 
     if [ -z "$PACKAGES" ]; then
-      echo "Usage: omarchy-install <package-name> [package-name...]"
+      echo "Usage: omnixy-install <package-name> [package-name...]"
       exit 1
     fi
 
@@ -174,12 +174,12 @@ pkgs.stdenv.mkDerivation rec {
 
     echo ""
     echo "Please edit $CONFIG and add the packages to environment.systemPackages"
-    echo "Then run: omarchy-rebuild"
+    echo "Then run: omnixy-rebuild"
     EOF
-    chmod +x $out/bin/omarchy-install
+    chmod +x $out/bin/omnixy-install
 
     # Development helpers
-    cat > $out/bin/omarchy-dev-shell << 'EOF'
+    cat > $out/bin/omnixy-dev-shell << 'EOF'
     #!/usr/bin/env bash
 
     LANG="$1"
@@ -206,16 +206,16 @@ pkgs.stdenv.mkDerivation rec {
         nix-shell -p gcc cmake gnumake gdb clang-tools
         ;;
       *)
-        echo "Usage: omarchy-dev-shell <language>"
+        echo "Usage: omnixy-dev-shell <language>"
         echo "Supported languages: rust, go, python, node/js, c/cpp"
         exit 1
         ;;
     esac
     EOF
-    chmod +x $out/bin/omarchy-dev-shell
+    chmod +x $out/bin/omnixy-dev-shell
 
     # Screenshot utility
-    cat > $out/bin/omarchy-screenshot << 'EOF'
+    cat > $out/bin/omnixy-screenshot << 'EOF'
     #!/usr/bin/env bash
 
     MODE="''${1:-region}"
@@ -234,7 +234,7 @@ pkgs.stdenv.mkDerivation rec {
         grim -g "$(hyprctl activewindow -j | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"')" "$FILENAME"
         ;;
       *)
-        echo "Usage: omarchy-screenshot [region|full|window]"
+        echo "Usage: omnixy-screenshot [region|full|window]"
         exit 1
         ;;
     esac
@@ -245,14 +245,14 @@ pkgs.stdenv.mkDerivation rec {
       echo "$FILENAME"
     fi
     EOF
-    chmod +x $out/bin/omarchy-screenshot
+    chmod +x $out/bin/omnixy-screenshot
 
     # System info
-    cat > $out/bin/omarchy-info << 'EOF'
+    cat > $out/bin/omnixy-info << 'EOF'
     #!/usr/bin/env bash
 
     echo "╭──────────────────────────────╮"
-    echo "│       OMARCHY NIXOS          │"
+    echo "│       OMNIXY NIXOS           │"
     echo "╰──────────────────────────────╯"
     echo ""
     echo "System Information:"
@@ -272,41 +272,41 @@ pkgs.stdenv.mkDerivation rec {
     echo ""
     echo "Quick Commands:"
     echo "=============="
-    echo "  omarchy-help     - Show help"
-    echo "  omarchy-update   - Update system"
-    echo "  omarchy-clean    - Clean system"
-    echo "  omarchy-theme    - Change theme"
+    echo "  omnixy-help     - Show help"
+    echo "  omnixy-update   - Update system"
+    echo "  omnixy-clean    - Clean system"
+    echo "  omnixy-theme    - Change theme"
     EOF
-    chmod +x $out/bin/omarchy-info
+    chmod +x $out/bin/omnixy-info
 
     # Help command
-    cat > $out/bin/omarchy-help << 'EOF'
+    cat > $out/bin/omnixy-help << 'EOF'
     #!/usr/bin/env bash
 
     cat << HELP
-    Omarchy NixOS - Command Reference
-    ==================================
+    OmniXY NixOS - Command Reference
+    ================================
 
     System Management:
     ------------------
-    omarchy-update        Update system and flake inputs
-    omarchy-clean         Clean and optimize Nix store
-    omarchy-rebuild       Rebuild system configuration
-    omarchy-info          Show system information
+    omnixy-update        Update system and flake inputs
+    omnixy-clean         Clean and optimize Nix store
+    omnixy-rebuild       Rebuild system configuration
+    omnixy-info          Show system information
 
     Package Management:
     -------------------
-    omarchy-search        Search for packages
-    omarchy-install       Install packages (guide)
+    omnixy-search        Search for packages
+    omnixy-install       Install packages (guide)
 
     Theme Management:
     -----------------
-    omarchy-theme-list    List available themes
-    omarchy-theme-set     Set system theme
+    omnixy-theme-list    List available themes
+    omnixy-theme-set     Set system theme
 
     Development:
     ------------
-    omarchy-dev-shell     Start language-specific shell
+    omnixy-dev-shell     Start language-specific shell
     dev-postgres          Start PostgreSQL container
     dev-redis             Start Redis container
     dev-mysql             Start MySQL container
@@ -314,7 +314,7 @@ pkgs.stdenv.mkDerivation rec {
 
     Utilities:
     ----------
-    omarchy-screenshot    Take screenshots
+    omnixy-screenshot    Take screenshots
 
     Hyprland Keybindings:
     ---------------------
@@ -330,13 +330,13 @@ pkgs.stdenv.mkDerivation rec {
     Print                 Screenshot region
     Shift + Print         Screenshot full
 
-    For more information: https://omarchy.org
+    For more information: https://github.com/TheArctesian/omnixy
     HELP
     EOF
-    chmod +x $out/bin/omarchy-help
+    chmod +x $out/bin/omnixy-help
 
-    # Main omarchy command
-    cat > $out/bin/omarchy << 'EOF'
+    # Main omnixy command
+    cat > $out/bin/omnixy << 'EOF'
     #!/usr/bin/env bash
 
     CMD="''${1:-help}"
@@ -344,49 +344,49 @@ pkgs.stdenv.mkDerivation rec {
 
     case "$CMD" in
       update|upgrade)
-        omarchy-update "$@"
+        omnixy-update "$@"
         ;;
       clean|gc)
-        omarchy-clean "$@"
+        omnixy-clean "$@"
         ;;
       theme)
         if [ -n "$1" ]; then
-          omarchy-theme-set "$@"
+          omnixy-theme-set "$@"
         else
-          omarchy-theme-list
+          omnixy-theme-list
         fi
         ;;
       search)
-        omarchy-search "$@"
+        omnixy-search "$@"
         ;;
       install)
-        omarchy-install "$@"
+        omnixy-install "$@"
         ;;
       info|status)
-        omarchy-info "$@"
+        omnixy-info "$@"
         ;;
       help|--help|-h)
-        omarchy-help "$@"
+        omnixy-help "$@"
         ;;
       *)
         echo "Unknown command: $CMD"
-        echo "Run 'omarchy help' for available commands"
+        echo "Run 'omnixy help' for available commands"
         exit 1
         ;;
     esac
     EOF
-    chmod +x $out/bin/omarchy
+    chmod +x $out/bin/omnixy
 
     # Create rebuild alias
-    cat > $out/bin/omarchy-rebuild << 'EOF'
+    cat > $out/bin/omnixy-rebuild << 'EOF'
     #!/usr/bin/env bash
-    sudo nixos-rebuild switch --flake /etc/nixos#omarchy "$@"
+    sudo nixos-rebuild switch --flake /etc/nixos#omnixy "$@"
     EOF
-    chmod +x $out/bin/omarchy-rebuild
+    chmod +x $out/bin/omnixy-rebuild
   '';
 
   meta = with lib; {
-    description = "Omarchy utility scripts for NixOS";
+    description = "OmniXY utility scripts for NixOS";
     license = licenses.mit;
     platforms = platforms.linux;
   };