diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 794b7cc..eb4109c 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -62,5 +62,10 @@ bspc rule -a Zathura                   state=tiled
 
 # Program startup
 "$HOME"/.scripts/wm/wallpaper.sh &
-"$HOME"/.scripts/wm/programs.sh &
 "$HOME"/.scripts/panel/polybar.sh &
+[ "$1" = 0 ] && {
+	# Only execute once
+	firefox &
+	urxvt &
+	thunar &
+}
diff --git a/.config/i3/config b/.config/i3/config
index 5a483d9..f2ebd3b 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -13,7 +13,11 @@ set $mod2 Mod1
 floating_modifier $mod
 
 # Application startup
-exec_always --no-startup-id $HOME/.scripts/wm/pidctl.sh -p &
+exec_always --no-startup-id $HOME/.scripts/wallpaper.sh &
+exec_always --no-startup-id $HOME/.scripts/polybar &
+exec --no-startup-id firefox &
+exec --no-startup-id urxvt &
+exec --no-startup-id thunar &
 
 # Colors
 set_from_resource $bgcolor          WmColor.bgcolor           #000000
@@ -76,13 +80,21 @@ workspace "$ws5" output eDP-1
 bindsym $mod+$mod2+0 workspace 0
 
 # Open program on specific workspace
-assign [class="Firefox"] $ws1
-assign [class="URxvt"] $ws3
-assign [class="Thunar"] $ws4
+assign [class="firefox"] $ws1
+assign [class="URxvt"] $ws2
+assign [class="Thunar"] $ws3
+assign [class="kdenlive"] $ws5
 assign [class="krita"] $ws5
 
 # Set program properties
-for_window [class="krita"] focus
+for_window [class="Arandr"] floating enable
 for_window [class="feh"] floating enable
-for_window [class="QtBank"] floating enable
+for_window [class="firefox" instance="Places"] floating enable
+for_window [class="Inferno"] floating enable
+for_window [class="kdenlive"] focus
+for_window [class="krita"] focus
+for_window [class="Lxappearance"] floating enable
+for_window [class="mpv"] floating enable
+for_window [class="Pavucontrol"] floating enable
 for_window [class="Qemu-system-i386"] floating enable
+for_window [class="Qemu-system-x86_64"] floating enable
diff --git a/.scripts/wm/programs.sh b/.scripts/wm/programs.sh
deleted file mode 100755
index 3aa03ef..0000000
--- a/.scripts/wm/programs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-start() {
-	[ -z "$1" ] && return 1
-
-	[ -z "$(pidof -x "$(echo "$@" | cut -d ' ' -f 1)")" ] && $@ &
-}
-
-start firefox
-start urxvt
-
-# Thunar client doesnt get a new pid when running in daemon mode
-[ "$(xdo id -a Thunar | wc -l)" -lt 3 ] && thunar &