diff --git a/home.nix b/home.nix
index 0f14819..a11be83 100644
--- a/home.nix
+++ b/home.nix
@@ -275,7 +275,7 @@
   programs.vscode = {
     enable = true;
 
-    extensions = with pkgs.vscode-extensions; [
+    profiles.default.extensions = with pkgs.vscode-extensions; [
       # Themes
       pkief.material-icon-theme
       zhuangtongfa.material-theme
@@ -300,7 +300,7 @@
       jnoortheen.nix-ide
     ];
 
-    userSettings = {
+    profiles.default.userSettings = {
       "workbench.colorTheme" = lib.mkDefault "One Dark Pro";
       "workbench.iconTheme" = "material-icon-theme";
       "editor.fontFamily" = "'JetBrainsMono Nerd Font', monospace";
@@ -364,7 +364,7 @@
   programs.gpg.enable = true;
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-gtk2;
+    pinentry.package = pkgs.pinentry-gtk2;
   };
 
   # XDG directories
diff --git a/iso.nix b/iso.nix
index 0c45d04..f655985 100644
--- a/iso.nix
+++ b/iso.nix
@@ -29,7 +29,7 @@
   # ISO-specific configuration
   isoImage = {
     # ISO image settings
-    isoName = "omnixy-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
+    image.fileName = "omnixy-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
     volumeID = "OMNIXY_${lib.toUpper config.system.nixos.label}";
     
     # Boot configuration
@@ -144,8 +144,14 @@
 
   # Live user configuration is handled by modules/users.nix
   # The nixos user will be created automatically since omnixy.user = "nixos"
-  # We just need to set an empty password for the live session
-  users.users.nixos.initialPassword = lib.mkForce ""; # Empty password for live session
+  # Remove any conflicting password settings
+  users.users.nixos = {
+    initialPassword = lib.mkForce ""; # Empty password for live session
+    password = lib.mkForce null;
+    hashedPassword = lib.mkForce null;
+    hashedPasswordFile = lib.mkForce null;
+    initialHashedPassword = lib.mkForce null;
+  };
 
   # Configure the user's environment to auto-start Hyprland
   environment.etc."profile.d/auto-hyprland.sh".text = ''
@@ -341,10 +347,10 @@
       enable = true;
       powerOnBoot = true;
     };
-    
-    # Pulseaudio (disabled in favor of PipeWire)
-    pulseaudio.enable = false;
   };
+  
+  # Pulseaudio (disabled in favor of PipeWire)
+  services.pulseaudio.enable = false;
 
   # Boot configuration for ISO
   boot = {
diff --git a/modules/core.nix b/modules/core.nix
index a1749c8..a896b2e 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -224,8 +224,8 @@ in
         powerOnBoot = true;
       };
 
-      # OpenGL support
-      opengl = {
+      # Graphics support
+      graphics = {
         enable = true;
         extraPackages = with pkgs; [
           intel-media-driver
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index c94f722..066b2bb 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -21,11 +21,11 @@ with lib;
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
     cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-    # OpenGL/Graphics
-    opengl = {
+    # Graphics support
+    graphics = {
       enable = true;
 
-      # Common OpenGL packages
+      # Common graphics packages
       extraPackages = with pkgs; [
         intel-media-driver # Intel VAAPI
         vaapiIntel
diff --git a/modules/themes/tokyo-night.nix b/modules/themes/tokyo-night.nix
index f83dc1a..c70ef78 100644
--- a/modules/themes/tokyo-night.nix
+++ b/modules/themes/tokyo-night.nix
@@ -139,7 +139,7 @@ in
       };
 
       # VS Code theme
-      programs.vscode.userSettings = {
+      programs.vscode.profiles.default.userSettings = {
         "workbench.colorTheme" = "Tokyo Night";
         "editor.tokenColorCustomizations" = {
           "[Tokyo Night]" = {
diff --git a/omarchy b/omarchy
new file mode 160000
index 0000000..f634bfe
--- /dev/null
+++ b/omarchy
@@ -0,0 +1 @@
+Subproject commit f634bfeeb6225cf6cd2df9bb336831f81b1c99c6