diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index bf0d87a..7813681 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-4
\ No newline at end of file
+5
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 894f60a..796da31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pika-installer-gtk4 (2.0.0-101pika3) pika; urgency=low
+pika-installer-gtk4 (2.0.0-101pika5) pika; urgency=low
 
   * First Release of new installer
 
diff --git a/src/installation_progress_page/mod.rs b/src/installation_progress_page/mod.rs
index 3fd9fbb..5a3bec6 100644
--- a/src/installation_progress_page/mod.rs
+++ b/src/installation_progress_page/mod.rs
@@ -125,7 +125,7 @@ pub fn installation_progress_page(
         installation_progress_log_scroll,
         move |_|
             {
-                if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.35 ) {
+                if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.48 ) {
                     installation_progress_log_scroll.vadjustment().set_value(installation_progress_log_scroll.vadjustment().upper())
                 }
             }
diff --git a/src/installation_summary_page/script_gen/auto_basic.rs b/src/installation_summary_page/script_gen/auto_basic.rs
index ebbe55c..6a40267 100644
--- a/src/installation_summary_page/script_gen/auto_basic.rs
+++ b/src/installation_summary_page/script_gen/auto_basic.rs
@@ -33,7 +33,7 @@ blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart s
 
 pub const AUTOMATIC_OPEN_PART_PIKAINSTALL_PROG: &str = r###"
 
-if [ -z $PIKA_INSTALL_XKB_VARIANT ]
+if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
 then
 pikainstall -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
 else
@@ -43,10 +43,10 @@ fi
 
 pub const AUTOMATIC_LOCKED_PART_PIKAINSTALL_PROG: &str = r###"
 
-if [ -z $PIKA_INSTALL_XKB_VARIANT ]
+if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
 then
-pikainstall -c $PIKA_INSTALL_AUTO_LUKS_PASSWORD -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
+pikainstall -c "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE"
 else
-pikainstall -c $PIKA_INSTALL_AUTO_LUKS_PASSWORD -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE -kv $PIKA_INSTALL_XKB_VARIANT
+pikainstall -c "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE" -kv "$PIKA_INSTALL_XKB_VARIANT"
 fi
 "###;
\ No newline at end of file
diff --git a/src/installation_summary_page/script_gen/manual_basic.rs b/src/installation_summary_page/script_gen/manual_basic.rs
index ae1f2f8..ccc27b6 100644
--- a/src/installation_summary_page/script_gen/manual_basic.rs
+++ b/src/installation_summary_page/script_gen/manual_basic.rs
@@ -30,20 +30,20 @@ echo '{LUKS_PASSWD}' | cryptsetup luksAddKey UUID='{UUID}' /tmp/PIKA_CRYPT/key-{
 
 pub const MANUAL_OPEN_PART_PIKAINSTALL_PROG: &str = r###"
 
-if [ -z $PIKA_INSTALL_XKB_VARIANT ]
+if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
 then
-pikainstall --manual 1 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
+pikainstall --manual 1 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE"
 else
-pikainstall --manual 1 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE -kv $PIKA_INSTALL_XKB_VARIANT
+pikainstall --manual 1 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE" -kv "$PIKA_INSTALL_XKB_VARIANT"
 fi
 "###;
 
 pub const MANUAL_LOCKED_PART_PIKAINSTALL_PROG: &str = r###"
 
-if [ -z $PIKA_INSTALL_XKB_VARIANT ]
+if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
 then
-pikainstall --manual 2 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
+pikainstall --manual 2 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE"
 else
-pikainstall --manual 2 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE -kv $PIKA_INSTALL_XKB_VARIANT
+pikainstall --manual 2 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE" -kv "$PIKA_INSTALL_XKB_VARIANT"
 fi
 "###;
\ No newline at end of file