diff --git a/install-yay b/install-yay
index 6396a81..6d03548 100755
--- a/install-yay
+++ b/install-yay
@@ -9,7 +9,7 @@
 # system.
 #-----------------------------------
 
-if ! command -v yay &> /dev/null; then
+if command -v yay &> /dev/null; then
     echo "yay is already installed on the system."
     exit 0
 fi
diff --git a/setup b/setup
index 2e0658b..f6ef95d 100755
--- a/setup
+++ b/setup
@@ -21,14 +21,18 @@ working_dir=$(pwd)
 function install_yay {
     cd $working_dir
     ./install-yay
+    if [ $? -eq 1 ]; then
+        exit 1
+    fi
 }
 
 # install my dmenu
 function install_dmenu {
     cd $working_dir
-    git submodule init
-    git submodule update
     ./install-dmenu-inkletblot
+    if [ $? -eq 1 ]; then
+        exit 1
+    fi
 }
 
 # update the system
@@ -54,55 +58,55 @@ function update_system {
 
 # install all required dependencies/programs
 function install_dependencies {
+    cd $working_dir
+    ./install-dependencies
     if [ $? -eq 1 ]; then
         exit 1
     fi
-    cd $working_dir
-    ./install-dependencies
 }
 
 # install all default programs
 function install_defaults {
+    cd $working_dir
+    ./install-defaults
     if [ $? -eq 1 ]; then
         exit 1
     fi
-    cd $working_dir
-    ./install-defaults
 }
 
 # install all misc programs
 function install_misc {
+    cd $working_dir
+    ./istall-misc
     if [ $? -eq 1 ]; then
         exit 1
     fi
-    cd $working_dir
-    ./istall-misc
 }
 
 # install my scripts
 function install_scripts {
+    cd $working_dir
+    ./install-scripts
     if [ $? -eq 1 ]; then
         exit 1
     fi
-    cd $working_dir
-    ./install-scripts
 }
 
 function install_dmenu {
+    cd $working_dir
+    ./install-dmenu-inkletblot
     if [ $? -eq 1 ]; then
         exit 1
     fi
-    cd $working_dir
-    ./install-dmenu-inkletblot
 }
 
 # install my config
 function install_config {
+    cd $working_dir
+    ./install-config
     if [ $? -eq 1 ]; then
         exit 1
     fi
-    cd $working_dir
-    ./install-config
 }
 
 function help {
@@ -111,12 +115,11 @@ echo "  setup <option> -- to start system setup from option"
 echo "  setup <option> only -- to only setup the specified option"
 echo "Options (in order of execution):"
 echo "  yay : Install yay AUR helper"
-echo "  dmenu : Install my customised version of dmenu"
 echo "  deps : Install the dependencies for my scripts and window manager"
 echo "  defaults : Install my chosen default programs"
 echo "  misc : Install my collection of misc - nice to have - programs"
 echo "  scripts : Install my scirpts"
-echo "  dmenu : Install my customisation of dmenu"
+echo "  dmenu : Install my customised version of dmenu"
 echo "  config : Install my dotfiles to the system"
 echo ""
 echo "Note: it is expected that the initial run of this script lets each stage complete sucessfully."
@@ -126,7 +129,6 @@ echo "Note: it is expected that the initial run of this script lets each stage c
 case $1 in
     "")
         install_yay
-        install_dmenu
         update_system
         install_dependencies
         install_defaults
@@ -140,21 +142,6 @@ case $1 in
             install_yay
         else
             install_yay
-            install_dmenu
-            update_system
-            install_dependencies
-            install_defaults
-            install_misc
-            install_scripts
-            install_dmenu
-            install_config
-        fi
-    ;;
-    dmenu)
-        if [ "$2" = "only" ]; then
-            install_dmenu
-        else
-            install_dmenu
             update_system
             install_dependencies
             install_defaults