diff --git a/Main-Install-Script.sh b/Main-Install-Script.sh
index 9ce8a5a..3dc655a 100644
--- a/Main-Install-Script.sh
+++ b/Main-Install-Script.sh
@@ -51,25 +51,16 @@ do
         "Apache")
             webserver=apache
             certbot_server=apache
-            vesta_apache=yes
-            vesta_nginx=no
-            vesta_fpm=no
             break
             ;;
         "Apache, Nginx reverse proxy")
             webserver=apache_nginx
             certbot_server=nginx
-            vesta_apache=yes
-            vesta_nginx=yes
-            vesta_fpm=no
             break
             ;;
         "Nginx, PHP-FPM")
             webserver=nginx
             certbot_server=nginx
-            vesta_apache=no
-            vesta_nginx=yes
-            vesta_fpm=yes
             break
             ;;
         "Quit")
@@ -79,7 +70,7 @@ do
     esac
 done
 
-while (( $vestacp != 1 )); do
+while true; do
     read -p "Installeer PHPmyAdmin -> yes/no?" yn
     case $yn in
         [Yy]* ) phpmyadmin=1
@@ -90,7 +81,7 @@ while (( $vestacp != 1 )); do
     esac
 done
 
-while (( $vestacp != 1 )); do
+while true; do
     read -p "Installeer Postfix -> yes/no?" yn
     case $yn in
         [Yy]* ) postfix=1
@@ -145,7 +136,7 @@ while true; do
     esac
 done
 
-while (( $vestacp != 1 )); do
+while true; do
     read -p "Installeer Wordpress -> yes/no?" yn
     case $yn in
         [Yy]* ) wordpress=1
@@ -174,7 +165,7 @@ apt install sshpass -y
 #    Apache Install    #
 #----------------------#
 
-if [ $webserver = apache && $vestacp = 0 ]
+if [ $webserver = apache ]
     then
         echo "install apache"
         ufw allow OpenSSH
@@ -226,7 +217,7 @@ fi
 # Apache_Nginx Install #
 #----------------------#
 
-if [ $webserver = apache_nginx ] && [ $vestacp = 0 ]
+if [ $webserver = apache_nginx ]
     then
         echo "install apache_nginx"
         ufw allow OpenSSH
@@ -240,7 +231,7 @@ if [ $webserver = apache_nginx ] && [ $vestacp = 0 ]
 #   Nginx Install   #
 #-------------------#
 
-if [ $webserver = nginx ] && [ $vestacp = 0 ]
+if [ $webserver = nginx ]
     then
        echo "install NGINX"
         ufw allow OpenSSH
@@ -508,7 +499,7 @@ fi
 # PHPmyAdmin Install #
 #--------------------#
 
-if [ $phpmyadmin = 1 ] && [ $vestacp = 0 ]
+if [ $phpmyadmin = 1 ]
 then
     echo "install php myadmin"
     apt-get install phpmyadmin -y
@@ -524,7 +515,7 @@ fi
 # Postfix Install #
 #-----------------#
 
-if [ $postfix = 1 ] && [ $vestacp = 0 ]
+if [ $postfix = 1 ]
 then
     echo "install postfix"
     apt install mailutils -y