diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 3d52c285..2c0d18a1 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -43,8 +43,8 @@ bspc config pointer_action2		resize_corner #RMB
 
 ## Looks
 # Padding
-bspc config border_width		2
-bspc config window_gap			8
+bspc config border_width		${BSPWM_BORDER_WIDTH:-2}
+bspc config window_gap			${BSPWM_WINDOW_GAP:-8}
 bspc config single_monocle		false
 bspc config borderless_monocle		false
 bspc config gapless_monocle		true
diff --git a/.config/dtfscripts/dtfscript b/.config/dtfscripts/dtfscript
index a4f21449..ff7075b8 100755
--- a/.config/dtfscripts/dtfscript
+++ b/.config/dtfscripts/dtfscript
@@ -39,6 +39,7 @@ unset PB_MODULE_WLAN_INTERFACE
 # bspwm monitorset.sh
 unset BSPWM_DESKTOPS_TOTAL
 unset BSPWM_DESKTOPS_PRIMARY
+unset BSPWM_COSMETIC_GAPS
 
 function dtf_log() {
 	name="$(basename $0 .sh)"