diff --git a/private_dot_config/X11/xresources.tmpl b/private_dot_config/X11/xresources.tmpl
index 4589a16..8aecade 100644
--- a/private_dot_config/X11/xresources.tmpl
+++ b/private_dot_config/X11/xresources.tmpl
@@ -2,7 +2,7 @@
 ! Xft settings
 !-------------------------------------------------------------------------------
 
-{{ if ne .type "desktop" }}Xft.dpi:                    160{{ end }}
+{{ if ne .type "desktop" }}Xft.dpi:                    160{{- end }}
 Xft.antialias:              false
 Xft.rgba:                   rgb
 Xft.hinting:                true
diff --git a/private_dot_config/alacritty/alacritty.yml.tmpl b/private_dot_config/alacritty/alacritty.yml.tmpl
index d1e3f9d..3779aaf 100644
--- a/private_dot_config/alacritty/alacritty.yml.tmpl
+++ b/private_dot_config/alacritty/alacritty.yml.tmpl
@@ -23,7 +23,7 @@ font:
 
     style: Bold Italic
 
-  size: {{ if eq .type "desktop" }}6.5{{ else }}8.5{{ end }}
+  size: {{ if eq .type "desktop" }}6.5{{ else }}8.5{{- end }}
 
 colors:
   primary:
diff --git a/private_dot_config/bspwm/executable_bspwmrc.tmpl b/private_dot_config/bspwm/executable_bspwmrc.tmpl
index e9a9868..89d49e5 100644
--- a/private_dot_config/bspwm/executable_bspwmrc.tmpl
+++ b/private_dot_config/bspwm/executable_bspwmrc.tmpl
@@ -35,13 +35,13 @@ sxhkd &
 setxkbmap -option caps:escape
 
 ###---Monitors---###
-{{ if eq .type "desktop" }}
+{{- if eq .type "desktop" }}
 bspc monitor DP-3 -d 2 3 4 5 6 7 8 9 0
 bspc monitor DP-2 -d 1
 xrandr --output DP-3 --primary --mode 3840x2160 --rotate normal --output DP-2 --mode 2560x1440 --pos 0x0 --rotate left
 {{ else }}
 bspc monitor -d 1 2 3 4 5 6 7 8 9 0
-{{ end }}
+{{- end }}
 
 ###---Polybar---###
 # Terminate already running bar instances
@@ -51,21 +51,20 @@ killall -q polybar
 while pgrep -u (id -u) -x polybar >/dev/null
     sleep 1
 end
-{{ if eq .type "desktop" }}
+{{- if eq .type "desktop" }}
 polybar-monitor1 &
 polybar-monitor2 &
 {{ else }}
 polybar framework-top &
 polybar framework-bottom &
-{{ end }}
-
+{{- end }}
 
 ###---Wallpaper & opacity---###
-{{ if eq .type "desktop" }}
+{{- if eq .type "desktop" }}
 xwallpaper --output DP-2 --zoom ~/.cache/wall2.png --output DP-3 --zoom ~/.cache/wall1.png &
 {{ else }}
 xwallpaper --output eDP-1 --zoom ~/.cache/wall1.png &
-{{ end }}
+{{- end }}
 wal -n -R
 picom -b
 
@@ -123,7 +122,7 @@ start_if_not_running emacs
 start_if_not_running element-desktop
 start_if_not_running element-desktop-nightly
 start_if_not_running gpodder
-{{ if eq .type "desktop" }}start_if_not_running slack{{ end }}
+{{- if eq .type "desktop" }}start_if_not_running slack{{ end }}
 
 pkill -f cleanfullscreen
 ~/.local/bin/cleanfullscreen &
diff --git a/private_dot_config/dunst/dunstrc.tmpl b/private_dot_config/dunst/dunstrc.tmpl
index 649113c..cb4a312 100644
--- a/private_dot_config/dunst/dunstrc.tmpl
+++ b/private_dot_config/dunst/dunstrc.tmpl
@@ -25,11 +25,11 @@
 
     idle_threshold = 120
 
-    {{ if eq .type "desktop" }}
+    {{- if eq .type "desktop" }}
     font = JoyPixels 10, Hack Nerd Font Mono 10
     {{ else }}
     font = JoyPixels 12, Hack Nerd Font Mono 12
-    {{ end }}
+    {{- end }}
 
     line_height = 0
     markup = full
diff --git a/private_dot_config/sxhkd/sxhkdrc.tmpl b/private_dot_config/sxhkd/sxhkdrc.tmpl
index 4e53036..fa69b6c 100644
--- a/private_dot_config/sxhkd/sxhkdrc.tmpl
+++ b/private_dot_config/sxhkd/sxhkdrc.tmpl
@@ -80,11 +80,11 @@ Print
 
 #-----------------------------------------------------------App shortcuts--------------------------------------------------------------
 # terminal emulator
-super + {{ if eq .type "desktop" }}Backspace{{ else }}Return{{ end }}
+super + {{ if eq .type "desktop" }}Backspace{{ else }}Return{{- end }}
     $TERMINAL
 
 # program launcher
-super + {{ if eq .type "desktop" }}Delete{{ else }}@space{{ end }}
+super + {{ if eq .type "desktop" }}Delete{{ else }}@space{{- end }}
     dmenu-frecency
 
 # make sxhkd reload its configuration files: