diff --git a/.zprofile_darwin b/.chezmoitemplates/zprofile_darwin.tmpl
similarity index 62%
rename from .zprofile_darwin
rename to .chezmoitemplates/zprofile_darwin.tmpl
index 89f7a78..2f88d66 100644
--- a/.zprofile_darwin
+++ b/.chezmoitemplates/zprofile_darwin.tmpl
@@ -3,7 +3,7 @@ export LC_ALL=en_US.UTF-8
 export PATH=/opt/homebrew/opt/ruby/bin:/opt/homebrew/lib/ruby/gems/3.0.0/bin:$PATH
 
 # Added by Toolbox App
-export PATH="$PATH:/Users/simono41/Library/Application Support/JetBrains/Toolbox/scripts"
+export PATH="$PATH:/Users/{{ .chezmoi.username }}/Library/Application Support/JetBrains/Toolbox/scripts"
 
 
 eval "$(/opt/homebrew/bin/brew shellenv)"
diff --git a/.zprofile_linux b/.chezmoitemplates/zprofile_linux.tmpl
similarity index 100%
rename from .zprofile_linux
rename to .chezmoitemplates/zprofile_linux.tmpl
diff --git a/.zshrc_darwin b/.chezmoitemplates/zshrc_darwin.tmpl
similarity index 100%
rename from .zshrc_darwin
rename to .chezmoitemplates/zshrc_darwin.tmpl
diff --git a/.zshrc_linux b/.chezmoitemplates/zshrc_linux.tmpl
similarity index 100%
rename from .zshrc_linux
rename to .chezmoitemplates/zshrc_linux.tmpl
diff --git a/dot_zprofile.tmpl b/dot_zprofile.tmpl
index 8176e72..2285939 100644
--- a/dot_zprofile.tmpl
+++ b/dot_zprofile.tmpl
@@ -1,6 +1,5 @@
 {{- if eq .chezmoi.os "darwin" -}}
-{{-   include ".zprofile_darwin" -}}
+{{-   template "zprofile_darwin.tmpl" . -}}
 {{- else if eq .chezmoi.os "linux" -}}
-{{-   include ".zprofile_linux" -}}
+{{-   template "zprofile_linux.tmpl" . -}}
 {{- end -}}
-
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 6e62fff..866c5f4 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -1,6 +1,5 @@
 {{- if eq .chezmoi.os "darwin" -}}
-{{-   include ".zshrc_darwin" -}}
+{{-   template "zshrc_darwin.tmpl" . -}}
 {{- else if eq .chezmoi.os "linux" -}}
-{{-   include ".zshrc_linux" -}}
+{{-   template "zshrc_linux.tmpl" . -}}
 {{- end -}}
-