diff --git a/CHANGELOG.md b/CHANGELOG.md
index 327a0c8..2b832e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,11 @@
 * v6.1 - Fixed timeout setting in cutycapt
 * v6.1 - Fixed script errors with CVE-2018-15473 sshUsernameEnumExploit.py
 * v6.1 - Improved SSLyze scan options
+* v6.1 - Updated domain list used by Aquatone
 * v6.1 - Removed http-vuln-cve2017-5638.nse script due to outdated NMap libs
 * v6.1 - Removed serializekiller plugin from install.sh
 * v6.1 - Removed cansina plugin from install.sh
+* v6.1 - Removed testssll.sh plugin from install.sh
 * v6.1 - Fixed issue with Amass not running due to invalid command line options in latest release
 * v6.0 - Improved scan options for discover mode scans
 * v6.0 - Fixed issue with pip3 dependency package missing
diff --git a/install.sh b/install.sh
index 33c803d..5440856 100755
--- a/install.sh
+++ b/install.sh
@@ -77,7 +77,6 @@ git clone https://github.com/Dionach/CMSmap.git
 git clone https://github.com/0xsauby/yasuo.git 
 git clone https://github.com/aboul3la/Sublist3r.git 
 git clone https://github.com/nccgroup/shocker.git 
-git clone --depth 1 https://github.com/drwetter/testssl.sh.git 
 git clone https://github.com/BishopFox/spoofcheck.git
 git clone https://github.com/arthepsy/ssh-audit 
 git clone https://github.com/1N3/jexboss.git
@@ -96,7 +95,6 @@ cd ~/go/bin/;go get -u github.com/Ice3man543/SubOver; mv SubOver /usr/local/bin/
 cd ~/go/bin;go get -u github.com/OWASP/Amass/cmd/amass; mv amass /usr/local/bin/
 cd ~/go/bin;go get -u github.com/subfinder/subfinder; mv subfinder /usr/local/bin/subfinder
 cd $PLUGINS_DIR
-wget https://github.com/michenriksen/aquatone/blob/master/subdomains.lst -O /usr/share/sniper/plugins/Sublist3r/subdomains.lst
 wget https://raw.githubusercontent.com/xorrbit/nmap/865142904566e416944ebd6870d496c730934965/scripts/http-vuln-INTEL-SA-00075.nse -O /usr/share/nmap/scripts/http-vuln-INTEL-SA-00075.nse
 wget https://raw.githubusercontent.com/f3d0x0/GPON/master/gpon_rce.py -O /usr/share/sniper/bin/gpon_rce.py
 cp $INSTALL_DIR/bin/iis-buffer-overflow.nse /usr/share/nmap/scripts/iis-buffer-overflow.nse 2> /dev/null
@@ -131,7 +129,7 @@ rm -f /usr/bin/findsploit
 rm -f /usr/bin/copysploit
 rm -f /usr/bin/compilesploit
 rm -f /usr/bin/massbleed
-rm -f /usr/bin/testssl
+rm -f /usr/bin/dirsearch
 ln -s $INSTALL_DIR/sniper /usr/bin/sniper
 ln -s $PLUGINS_DIR/Goohak/goohak /usr/bin/goohak
 ln -s $PLUGINS_DIR/XSSTracer/xsstracer.py /usr/bin/xsstracer
diff --git a/modes/normal_webporthttp.sh b/modes/normal_webporthttp.sh
index b9353f8..a8744e9 100644
--- a/modes/normal_webporthttp.sh
+++ b/modes/normal_webporthttp.sh
@@ -32,9 +32,9 @@ if [ "$MODE" = "web" ];
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING WORDPRESS VULNERABILITY SCAN $RESET"
     echo -e "${OKGREEN}====================================================================================${RESET}"
-    wpscan --url http://$TARGET --batch --disable-tls-checks
+    wpscan --url http://$TARGET --disable-tls-checks
     echo ""
-    wpscan --url http://$TARGET/wordpress/ --batch --disable-tls-checks
+    wpscan --url http://$TARGET/wordpress/ --disable-tls-checks
     echo ""
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING CMSMAP $RESET"
diff --git a/modes/normal_webporthttps.sh b/modes/normal_webporthttps.sh
index b965bcc..a973d98 100644
--- a/modes/normal_webporthttps.sh
+++ b/modes/normal_webporthttps.sh
@@ -32,9 +32,9 @@ if [ "$MODE" = "web" ];
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING WORDPRESS VULNERABILITY SCAN $RESET"
     echo -e "${OKGREEN}====================================================================================${RESET}"
-    wpscan --url https://$TARGET --batch --disable-tls-checks
+    wpscan --url https://$TARGET --disable-tls-checks
     echo ""
-    wpscan --url https://$TARGET/wordpress/ --batch --disable-tls-checks
+    wpscan --url https://$TARGET/wordpress/ --disable-tls-checks
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING CMSMAP $RESET"
     echo -e "${OKGREEN}====================================================================================${RESET}"
diff --git a/modes/recon.sh b/modes/recon.sh
index 7839aa8..f6a5a45 100644
--- a/modes/recon.sh
+++ b/modes/recon.sh
@@ -60,7 +60,7 @@ if [ "$RECON" = "1" ]; then
   echo -e "${OKGREEN}====================================================================================${RESET}"
   echo -e "$OKRED STARTING DOMAIN FLYOVER $RESET"
   echo -e "${OKGREEN}====================================================================================${RESET}"
-  aquatone-discover -d $TARGET -t 100 --wordlist $PLUGINS_DIR/Sublist3r/subdomains.lst | tee $LOOT_DIR/nmap/aquatone-$TARGET-discover 2>/dev/null
+  aquatone-discover -d $TARGET -t 100 --wordlist $INSTALL_DIR/wordlists/domains-all.txt | tee $LOOT_DIR/nmap/aquatone-$TARGET-discover 2>/dev/null
   sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g" $LOOT_DIR/nmap/aquatone-$TARGET-discover > $LOOT_DIR/nmap/aquatone-$TARGET-discover.txt 2> /dev/null
   rm -f $LOOT_DIR/nmap/aquatone-$TARGET-discover 2> /dev/null
   aquatone-takeover -d $TARGET -t 100 | tee $LOOT_DIR/nmap/aquatone-$TARGET-takeovers 2>/dev/null
diff --git a/modes/webporthttp.sh b/modes/webporthttp.sh
index 972dc2c..eb67aaa 100644
--- a/modes/webporthttp.sh
+++ b/modes/webporthttp.sh
@@ -134,9 +134,9 @@ if [ "$MODE" = "webporthttp" ]; then
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING WORDPRESS VULNERABILITY SCAN $RESET"
     echo -e "${OKGREEN}====================================================================================${RESET}"
-    wpscan --url http://$TARGET:$PORT --batch --disable-tls-checks
+    wpscan --url http://$TARGET:$PORT --disable-tls-checks
     echo ""
-    wpscan --url http://$TARGET:$PORT/wordpress/ --batch --disable-tls-checks
+    wpscan --url http://$TARGET:$PORT/wordpress/ --disable-tls-checks
     echo ""
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING CMSMAP $RESET"
diff --git a/modes/webporthttps.sh b/modes/webporthttps.sh
index 19995c0..6ea5a1a 100644
--- a/modes/webporthttps.sh
+++ b/modes/webporthttps.sh
@@ -144,9 +144,9 @@ if [ "$MODE" = "webporthttps" ]; then
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING WORDPRESS VULNERABILITY SCAN $RESET"
     echo -e "${OKGREEN}====================================================================================${RESET}"
-    wpscan --url https://$TARGET:$PORT --batch --disable-tls-checks
+    wpscan --url https://$TARGET:$PORT --disable-tls-checks
     echo ""
-    wpscan --url https://$TARGET:$PORT/wordpress/ --batch --disable-tls-checks
+    wpscan --url https://$TARGET:$PORT/wordpress/ --disable-tls-checks
     echo -e "${OKGREEN}====================================================================================${RESET}"
     echo -e "$OKRED RUNNING CMSMAP $RESET"
     echo -e "${OKGREEN}====================================================================================${RESET}"