diff --git a/user/.chezmoi.yaml.tmpl b/user/.chezmoi.yaml.tmpl
index 115d535..0847e76 100644
--- a/user/.chezmoi.yaml.tmpl
+++ b/user/.chezmoi.yaml.tmpl
@@ -25,20 +25,21 @@ edit:
   command: nvim
 
 merge:
+  pager: ""
   command: meld
   args:
-    - {{ printf "%q" "{{ .Source }}" }}
-    - {{ printf "%q" "{{ .Destination }}" }}
+    - "{{`{{ .Source }}`}}"
+    - "{{`{{ .Destination }}`}}"
 
 diff:
-  command: meld
+  command: sh
   args:
-    - --diff
-    - {{ printf "%q" "{{ .Destination }}" }}
-    - {{ printf "%q" "{{ .Target }}" }}
+    - -c
+    - 'echo "Using meld"; meld --diff "{{`{{ .Destination }}`}}" "{{`{{ .Target }}`}}"'
 
 encryption: gpg
 gpg:
   recipient: {{ $gpg_recipient | quote }}
 
 # vim: ft=template syntax=yaml
+
diff --git a/user/dot_config/hypr/scripts/executable_autostart.sh b/user/dot_config/hypr/scripts/executable_autostart.sh.tmpl
similarity index 93%
rename from user/dot_config/hypr/scripts/executable_autostart.sh
rename to user/dot_config/hypr/scripts/executable_autostart.sh.tmpl
index 0abcbdd..2725de7 100644
--- a/user/dot_config/hypr/scripts/executable_autostart.sh
+++ b/user/dot_config/hypr/scripts/executable_autostart.sh.tmpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-(sleep 5 ; hyprctl eval 'request_apply_monitor_profile()') &
+(sleep 2 ; hyprctl eval 'request_apply_monitor_profile()') &
 
 hyprctl dispatch 'hl.dsp.exec_cmd("uwsm app -- thunderbird", {workspace = 10})'
 {{ if eq .work_env true -}}