diff --git a/airootfs/usr/local/bin/calamares-offline b/airootfs/usr/local/bin/calamares-offline
index 8a3410a..f38b221 100755
--- a/airootfs/usr/local/bin/calamares-offline
+++ b/airootfs/usr/local/bin/calamares-offline
@@ -16,17 +16,16 @@ EOF
 
     sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
 
-    platform=$XDG_SESSION_TYPE
+    platform="$XDG_SESSION_TYPE"
 
     if [ -z $platform ]; then
         platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
+    fi
 
-        if [ -z $platform ]; then
-            sudo -E dbus-launch calamares -D6 >> $log
-        else
-            sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
-        fi
-
+    if [ -n "$platform" ] && [ "$platform" == "wayland" ]; then
+        sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
+    else
+        sudo -E dbus-launch calamares -D6 >> $log
     fi
 
 }
diff --git a/airootfs/usr/local/bin/calamares-online b/airootfs/usr/local/bin/calamares-online
index c8c1750..f5dd478 100755
--- a/airootfs/usr/local/bin/calamares-online
+++ b/airootfs/usr/local/bin/calamares-online
@@ -91,17 +91,16 @@ EOF
 
     sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
 
-    platform=$XDG_SESSION_TYPE
+    platform="$XDG_SESSION_TYPE"
 
     if [ -z $platform ]; then
         platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
+    fi
 
-        if [ -z $platform ]; then
-            sudo -E dbus-launch calamares -D6 >> $log
-        else
-            sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
-        fi
-
+    if [ -n "$platform" ] && [ "$platform" == "wayland" ]; then
+        sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
+    else
+        sudo -E dbus-launch calamares -D6 >> $log
     fi
 
 #     &
diff --git a/packages.x86_64 b/packages.x86_64
index 15bc036..850e252 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -507,7 +507,6 @@ partimage
 
 ## Display manager
 sddm
-plasma-framework
 plasma-integration
 plasma-workspace
 plasma-browser-integration