diff --git a/kali-config/common/hooks/accessibility-menu.binary b/kali-config/common/hooks/accessibility-menu.binary
index 3da867f..75cebb7 100755
--- a/kali-config/common/hooks/accessibility-menu.binary
+++ b/kali-config/common/hooks/accessibility-menu.binary
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cat >>binary/isolinux/install.cfg <<END
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/install.cfg <<END
 
 label installspk
 	menu label Install with ^speech synthesis
diff --git a/kali-config/common/hooks/forensic-menu.binary b/kali-config/common/hooks/forensic-menu.binary
index 8e07131..d0c764b 100755
--- a/kali-config/common/hooks/forensic-menu.binary
+++ b/kali-config/common/hooks/forensic-menu.binary
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cat >>binary/isolinux/live.cfg <<END
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/live.cfg <<END
 
 label live-forensic
 	menu label Live (^forensic mode)
diff --git a/kali-config/common/hooks/live/accessibility-menu.binary b/kali-config/common/hooks/live/accessibility-menu.binary
new file mode 120000
index 0000000..1ac7dd0
--- /dev/null
+++ b/kali-config/common/hooks/live/accessibility-menu.binary
@@ -0,0 +1 @@
+../accessibility-menu.binary
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/forensic-menu.binary b/kali-config/common/hooks/live/forensic-menu.binary
new file mode 120000
index 0000000..641c336
--- /dev/null
+++ b/kali-config/common/hooks/live/forensic-menu.binary
@@ -0,0 +1 @@
+../forensic-menu.binary
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/persistence-menu.binary b/kali-config/common/hooks/live/persistence-menu.binary
new file mode 120000
index 0000000..a7bc183
--- /dev/null
+++ b/kali-config/common/hooks/live/persistence-menu.binary
@@ -0,0 +1 @@
+../persistence-menu.binary
\ No newline at end of file
diff --git a/kali-config/common/hooks/live/sleep.chroot b/kali-config/common/hooks/live/sleep.chroot
new file mode 120000
index 0000000..5f6a1a8
--- /dev/null
+++ b/kali-config/common/hooks/live/sleep.chroot
@@ -0,0 +1 @@
+../sleep.chroot
\ No newline at end of file
diff --git a/kali-config/common/hooks/persistence-menu.binary b/kali-config/common/hooks/persistence-menu.binary
index a88f305..30a398b 100755
--- a/kali-config/common/hooks/persistence-menu.binary
+++ b/kali-config/common/hooks/persistence-menu.binary
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cat >>binary/isolinux/live.cfg <<END
+if [ ! -d isolinux ]; then
+    cd binary
+fi
+
+cat >>isolinux/live.cfg <<END
 
 label live-persistence
     menu label ^Live USB Persistence              (check kali.org/prst)
diff --git a/kali-config/common/hooks/sleep.chroot b/kali-config/common/hooks/sleep.chroot
index f4c7b74..8e0dc89 100755
--- a/kali-config/common/hooks/sleep.chroot
+++ b/kali-config/common/hooks/sleep.chroot
@@ -1,3 +1,7 @@
 #!/bin/bash
-# sleep for 30 between chroot and binary stages. Helps in WM's such as XFCE and LXDE.
-sleep 30
+
+# Sleep until update-kali-menu disappeared
+while pgrep -f update-kali-menu >/dev/null; do
+    echo "Sleeping 10 seconds as update-kali-menu is still running..."
+    sleep 10
+done