diff --git a/.xsessionrc b/.xsessionrc
index 92cbf2a..3971642 100755
--- a/.xsessionrc
+++ b/.xsessionrc
@@ -1,13 +1,30 @@
 #!/usr/bin/env sh
 
-export _JAVA_AWT_WM_NONREPARENTING=1
-export AWT_TOOLKIT=MToolkit
-wmname LG3D
+if [[ "$DESKTOP_SESSION" = "dwm" ]]; then
+    export _JAVA_AWT_WM_NONREPARENTING=1
+    export AWT_TOOLKIT=MToolkit
+    wmname LG3D
 
-/usr/bin/nextcloud &
-/home/pgrondek/bin/jetbrains-toolbox --minimize &
-/home/pgrondek/bin/dwmstatus &
-/usr/bin/feh --bg-scale /usr/share/backgrounds/gnome/Road.jpg &
+    compton &
+    dwmstatus &
+    if test -f "$HOME/.screenlayout/main.sh"; then
+      "$HOME/.screenlayout/main.sh"
+    fi
+    
+    compton &
+    redshift &
 
-/usr/bin/redshift &
-/usr/bin/compton &
+    feh --bg-scale /usr/share/backgrounds/gnome/Road.jpg &
+fi
+
+if command -v nextcloud &> /dev/null ; then
+    nextcloud &
+fi
+
+if command -v jetbrains-toolbox &> /dev/null ; then
+    jetbrains-toolbox --minimize &
+fi
+
+if command -v slack &> /dev/null ; then
+    slack &
+fi