diff --git a/.zshenv b/.zshenv
index e69de29..168509b 100644
--- a/.zshenv
+++ b/.zshenv
@@ -0,0 +1,12 @@
+# Set custom zsh directory
+ZSH_CUSTOM="$HOME/.zsh"
+
+# Set theme
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Enable plugins
+plugins=(
+  git gh sudo ssh ruby rust python node rsync nvm rbenv pyenv
+  docker docker-compose zsh-autosuggestions zsh-syntax-highlighting
+  zsh-interactive-cd zsh-navigation-tools
+)
diff --git a/.zshrc b/.zshrc
index bcadd46..d02351d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -70,24 +70,6 @@ for path_dir in "${path_extensions[@]}"; do
 done
 
 
-# =============================================================================
-# CONFIGURATION FILES TO SOURCE
-# =============================================================================
-
-# Define files to source in an array for easy management
-source_files=(
-  "$HOME/.env"
-  "$HOME/.nvm/nvm.sh"
-  "$HOME/.cargo/env"
-  "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-)
-
-# Source zsh-compatible files (skip if missing, no warnings)
-for config_file in "${source_files[@]}"; do
-  source_file "$config_file"
-done
-
-
 # =============================================================================
 # EVAL EXPRESSIONS
 # =============================================================================
@@ -103,30 +85,22 @@ done
 
 
 # =============================================================================
-# SHELL INITIALIZATION
+# CONFIGURATION FILES TO SOURCE
 # =============================================================================
 
-# Oh My Zsh installation
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set theme
-ZSH_THEME="powerlevel10k/powerlevel10k"
-
-# Enable plugins
-plugins=(
-  git gh sudo ssh ruby rust python node rsync nvm rbenv pyenv
-  docker docker-compose zsh-autosuggestions zsh-syntax-highlighting
-  zsh-interactive-cd zsh-navigation-tools
+# Define files to source in an array for easy management
+source_files=(
+  "$HOME/.env"
+  "$HOME/.nvm/nvm.sh"
+  "$HOME/.cargo/env"
+  "$HOME/.oh-my-zsh/oh-my-zsh.sh"
+  "$HOME/.p10k.zsh"
 )
 
-# Add fpath custom completions
-[[ -d "$HOME/.zsh/completions" ]] && fpath=("$HOME/.zsh/completions" $fpath)
-
-# Load Oh My Zsh framework
-[[ -f "$ZSH/oh-my-zsh.sh" ]] && source "$ZSH/oh-my-zsh.sh"
-
-# Powerlevel10k configuration (must come after theme is set)
-[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
+# Source zsh-compatible files (skip if missing, no warnings)
+for config_file in "${source_files[@]}"; do
+  source_file "$config_file"
+done
 
 
 # =============================================================================
diff --git a/arty.yml b/arty.yml
index 60d3e82..8cd985c 100644
--- a/arty.yml
+++ b/arty.yml
@@ -46,13 +46,13 @@ references:
   - url: https://github.com/ohmyzsh/ohmyzsh.git
     into: .oh-my-zsh
   - url: https://github.com/romkatv/powerlevel10k.git
-    into: .oh-my-zsh/custom/themes/powerlevel10k
+    into: .zsh/themes/powerlevel10k
   - url: https://github.com/marlonrichert/zsh-autocomplete.git
-    into: .oh-my-zsh/custom/plugins/zsh-autocomplete
+    into: .zsh/plugins/zsh-autocomplete
   - url: https://github.com/zsh-users/zsh-autosuggestions.git
-    into: .oh-my-zsh/custom/plugins/zsh-autosuggestions
+    into: .zsh/plugins/zsh-autosuggestions
   - url: https://github.com/zsh-users/zsh-syntax-highlighting.git
-    into: .oh-my-zsh/custom/plugins/zsh-syntax-highlighting
+    into: .zsh/plugins/zsh-syntax-highlighting
 scripts:
   debian/update: sudo sed -i 's/main non-free-firmware/main contrib non-free non-free-firmware/g' /etc/apt/sources.list && sudo apt update
   debian/install: sudo apt install curl wget zsh fzf davfs2 make imagemagick rsvg-convert ffmpeg yt-dlp pkg-config zstd libffi-dev zlib1g-dev libyaml-dev libssl-dev liblzma-dev libbz2-dev libncurses-dev libreadline-dev libsqlite3-dev python3-tk tk-dev unzip zip