diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
index 3974d6f4..cdd9dd94 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
@@ -95,7 +95,7 @@
 {{- $cloudflareUsername = promptStringOnce $data.user "cloudflareUsername" "CloudFlare E-Mail" $email -}}
 {{- $cloudflareToken = promptStringOnce $data.user "cloudflareToken" "CloudFlare API Token" $cloudflareToken -}}
 {{- $gitlabReadToken = promptStringOnce $data.user "gitlabReadToken" "GitLab read-only token (See: https://github.com/gabrie30/ghorg#scm-provider-setup)" $gitlabReadToken }}
-{{- $githubReadToken = promptStringOnce $data.user "githubReadToken" "GitHub read-only token (See: https://github.com/gabrie30/ghorg#scm-provider-setup)" "" }}
+{{- $githubReadToken = promptStringOnce $data.user "githubReadToken" "GitHub read-only token (See: https://github.com/gabrie30/ghorg#scm-provider-setup)" $githubReadToken }}
 {{- $gmailAddress = promptStringOnce $data.user "gmailAddress" "G-mail address" $gmailAddress -}}
 {{- $gmailAddressAppPassword = promptStringOnce $data.user "gmailAddressAppPassword" "G-mail app password" $gmailAddressAppPassword -}}
 {{- $ngrokAuthToken = promptStringOnce $data.user "ngrokAuthToken" "Ngrok authentication token" $ngrokAuthToken -}}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiignore b/dotfiles/.local/share/chezmoi/home/.chezmoiignore
index cd8f59f9..b5e816ea 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiignore
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiignore
@@ -1,28 +1,28 @@
-.chezmoiscripts
-!.chezmoiscripts/{{ .host.distro.id }}
+.chezmoiscripts/**/*
+!.chezmoiscripts/{{ .host.distro.id }}/**/*
 
-{{- if and (ne .host.distro.id "darwin") (ne .host.distro.id "linux") }}
-!.chezmoiscripts/universal
+{{- if ne .host.distro.id "windows" }}
+!.chezmoiscripts/universal/**/*
 {{- end }}
 
 {{- if ne .host.distro.family "linux" }}
-private_dot_config/Kvantum
-private_dot_config/bashtop
-private_dot_config/desktop
-private_dot_config/firejail
-private_dot_config/fontconfig
-private_dot_config/gtk-1.0
-private_dot_config/gtk-2.0
-private_dot_config/gtk-3.0
-private_dot_config/rofi
-private_dot_config/xfce4
-private_dot_config/xsettingsd
-private_dot_config/gtkrc
-private_dot_config/k*
-private_dot_config/mimeapps.list
-private_dot_config/plasma*
-dot_local/konsole
-dot_Xresources
+.config/Kvantum
+.config/bashtop
+.config/desktop
+.config/firejail
+.config/fontconfig
+.config/gtk-1.0
+.config/gtk-2.0
+.config/gtk-3.0
+.config/rofi
+.config/xfce4
+.config/xsettingsd
+.config/gtkrc
+.config/k*
+.config/mimeapps.list
+.config/plasma*
+.local/konsole
+.Xresources
 {{- end }}
 
 {{- if ne .host.distro.id "darwin" }}