diff --git a/home/.chezmoiscripts/universal/run_onchange_after_44-vmware-install.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_44-vmware-install.tmpl
index a146fa89..536b2284 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_44-vmware-install.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_44-vmware-install.tmpl
@@ -2,8 +2,8 @@
 #!/usr/bin/env bash
 
 {{- $secretKey := "" -}}
-{{- if (stat (joinPath (.chezmoi.sourceDir ".chezmoitemplates" "secrets" "key-vmware-workstation"))) -}}
-{{-   $secretKey = (default "4C21U-2KK9Q-M8130-4V2QH-CF810" (includeTemplate "secrets/key-vmware-workstation" | decrypt)) -}}
+{{- if (stat (joinPath (.chezmoi.sourceDir ".chezmoitemplates" "secrets" "key-VMWARE_WORKSTATION_LICENSE_KEY"))) -}}
+{{-   $secretKey = (default "4C21U-2KK9Q-M8130-4V2QH-CF810" (includeTemplate "secrets/key-VMWARE_WORKSTATION_LICENSE_KEY" | decrypt)) -}}
 {{- else -}}
 {{-   $secretKey = (default "4C21U-2KK9Q-M8130-4V2QH-CF810" (env "VMWARE_WORKSTATION_LICENSE_KEY")) -}}
 {{- end }}
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_57-netdata.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_57-netdata.tmpl
index 3c0e3b85..07a70903 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_57-netdata.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_57-netdata.tmpl
@@ -1,4 +1,4 @@
-{{- if and (ne .host.distro.family "windows") (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "key-netdata-token")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "key-netdata-room")) -}}
+{{- if and (ne .host.distro.family "windows") (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (or (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "key-NETDATA_TOKEN")) (env "NETDATA_TOKEN")) (or (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "key-NETDATA_ROOM")) (env "NETDATA_ROOM")) -}}
 #!/usr/bin/env bash
 
 {{ includeTemplate "universal/profile" }}
diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl
index e877d709..d8d17fb7 100644
--- a/home/dot_config/git/config.tmpl
+++ b/home/dot_config/git/config.tmpl
@@ -67,31 +67,45 @@
 [credential "https://gist.github.com"]
 	helper = !gh auth git-credential
 [delta]
-  decorations = true
-  features = side-by-side decorations hyperlinks interactive navigate unobtrusive-line-numbers woolly-mammoth zebra-dark
-  hyperlinks = true
-  interactive = true
-  map-styles = bold purple => syntax magenta, bold cyan => syntax blue
-  navigate = true
+  features = Betelgeuse
+[delta "Betelgeuse"]
+  dark = true
+  line-numbers = true
   side-by-side = true
-  unobtrusive-line-numbers = true
-  plus-style = syntax "#003800"
-  minus-style = syntax "#3f0001"
-[delta "interactive"]
   keep-plus-minus-markers = false
-[delta "decorations"]
-  commit-decoration-style = blue ol
-  commit-style = raw
-  file-style = omit
-  hunk-header-decoration-style = blue box
-  hunk-header-file-style = red
-  hunk-header-line-number-style = "#067a00"
-  hunk-header-style = file line-number syntax
-[delta "line-numbers"]
+  syntax-theme = Nord
+  file-style = "#434C5E" bold
+  file-decoration-style = "#434C5E" ul
+  file-added-label = [added]
+  file-copied-label = [copied]
+  file-modified-label = [modified]
+  file-removed-label = [removed]
+  file-renamed-label = [renamed]
+  hunk-header-style = omit
+  line-numbers-left-format = " {nm:>3} │"
   line-numbers-left-style = cyan
+  line-numbers-right-format = " {nm:>3} │"
   line-numbers-right-style = cyan
-  line-numbers-minus-style = 124
-  line-numbers-plus-style = 28
+  line-numbers-minus-style = red black
+  line-numbers-plus-style = green black
+  line-numbers-zero-style = "#434C5E" italic
+  minus-style = bold red
+  minus-emph-style = bold "#202020" "#FF5555"
+  minus-non-emph-style = bold
+  plus-style = bold green
+  plus-emph-style = bold "#202020" "#50FA7B"
+  plus-non-emph-style = bold
+  zero-style = syntax
+  blame-code-style = syntax
+  blame-format = "{author:<18} ({commit:>9}) {timestamp:^16}"
+  blame-palette = "#2E3440" "#3B4252" "#434C5E" "#4C566A"
+  merge-conflict-begin-symbol = ~
+  merge-conflict-end-symbol = ~
+  merge-conflict-ours-diff-header-style = "#F1FA8C" bold
+  merge-conflict-ours-diff-header-decoration-style = "#434C5E" box
+  merge-conflict-theirs-diff-header-style = "#F1FA8C" bold
+  merge-conflict-theirs-diff-header-decoration-style = "#434C5E" box
+  keep-plus-minus-markers = true
 [diff]
   colorMoved = default
   ignoresubmodules = dirty