diff --git a/bootstrap.org b/bootstrap.org
index 0b407e5..f4314ab 100644
--- a/bootstrap.org
+++ b/bootstrap.org
@@ -93,7 +93,7 @@ Since =brew link gpg= doesn’t always work, this helper function may find the e
   (defun executable (path)
     "Return PATH if executable, see `file-executable-p'."
     (let ((epath (first (file-expand-wildcards path))))
-      (when (file-executable-p epath) epath)))
+      (when (and epath (file-executable-p epath)) epath)))
 
   (use-package epa-file
     :straight (:type built-in)
diff --git a/ha-config.org b/ha-config.org
index 9e7c3fb..1c50fd1 100644
--- a/ha-config.org
+++ b/ha-config.org
@@ -2220,6 +2220,7 @@ Dirvish does require the following supporting programs, but I’ve already got t
 I’m beginning with dirvish to use the [[https://github.com/alexluigit/dirvish/blob/main/docs/CUSTOMIZING.org][sample configuration]] and change it:
 #+begin_src emacs-lisp
   (use-package dirvish
+    :straight (:host github :repo "alexluigit/dirvish")
     :init
     (dirvish-override-dired-mode)
 
diff --git a/initialize b/initialize
index 40f95b0..b17b506 100755
--- a/initialize
+++ b/initialize
@@ -73,14 +73,13 @@ cat > $HAMACS_DEST/init.el <<EOF
 ;; Configure straight https://github.com/raxod502/straight.el#getting-started
 
 (defvar bootstrap-version)
-
 (let ((bootstrap-file
        (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-      (bootstrap-version 5))
+      (bootstrap-version 6))
   (unless (file-exists-p bootstrap-file)
     (with-current-buffer
         (url-retrieve-synchronously
-         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+         "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
          'silent 'inhibit-cookies)
       (goto-char (point-max))
       (eval-print-last-sexp)))