diff --git a/data_from_portwine/scripts/clear_db.sh b/data_from_portwine/scripts/clear_db.sh
index 74e7ab4..8e20437 100755
--- a/data_from_portwine/scripts/clear_db.sh
+++ b/data_from_portwine/scripts/clear_db.sh
@@ -17,7 +17,7 @@ if [[ -n "$DUPLICATE" ]] ; then
     exit 1
 fi
 
-for ppdb in $SELF_PATH/portwine_db/* ; do
+for ppdb in "$SELF_PATH/portwine_db/"* ; do
     echo "$ppdb"
 
     sed -i '/##export/d' "$ppdb"
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index ffb9cad..bcd4cf5 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -3046,6 +3046,9 @@ start_portwine () {
             then
                 export LIBGL_KOPPER_DRI2="1"
             fi
+            if [[ -d /sys/bus/pci/drivers/nouveau ]] ; then
+                export NOUVEAU_USE_ZINK="1"
+            fi
             ;;
         5)
             # LEGACY DXVK
diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh
index 28c8e9a..63627fd 100755
--- a/data_from_portwine/scripts/setup.sh
+++ b/data_from_portwine/scripts/setup.sh
@@ -2,7 +2,7 @@
 # Author: linux-gaming.ru
 # shellcheck disable=SC2317
 export INSTALLING_PORT=1
-# shellcheck source=./start.sh
+# shellcheck source=/dev/null
 source "$(dirname "$(readlink -f "$0")")/start.sh"
 
 if check_flatpak
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index ba1877f..962d068 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -244,14 +244,11 @@ if [[ "${INSTALLING_PORT}" == 1 ]] ; then
 fi
 
 # choose gui start
-case "$PW_GUI_START" in
-    PANED|NOTEBOOK) : ;;
-    *)
-              sed -i '/export PW_GUI_START=/d' "$USER_CONF"
-              echo 'export PW_GUI_START="NOTEBOOK"' >> "$USER_CONF"
-              export PW_GUI_START="NOTEBOOK"
-              ;;
-esac
+if [[ ! $PW_GUI_START =~ (PANED|NOTEBOOK) ]] ; then
+    sed -i '/export PW_GUI_START=/d' "$USER_CONF"
+    echo 'export PW_GUI_START="NOTEBOOK"' >> "$USER_CONF"
+    export PW_GUI_START="NOTEBOOK"
+fi
 
 if check_flatpak ; then
     if check_gamescope_session