diff --git a/f8x b/f8x
index 3e6982f7..86c1fbd1 100644
--- a/f8x
+++ b/f8x
@@ -32,10 +32,10 @@ Proxy_OK=
 Docker_OK=
 error=0
 Linux_architecture_Name=
-F8x_Version="1.6.2 Dev(Beta16)"
+F8x_Version="1.6.2 Dev(Beta17)"
 
 # ===================== Software version variable setting =====================
-hashcat_Version="hashcat-6.2.5"
+hashcat_Version="hashcat-6.2.6"
 # https://www.oracle.com/java/technologies/downloads/
 jdk8_Version="jdk1.8.0_321"
 orclejdk_tmp_ver="1.0.5"
@@ -48,7 +48,7 @@ CS_File="CobaltStrike4.3.zip"
 CS_Version="CobaltStrike4.3"
 CS45_File="CobaltStrike4.5.zip"
 CS45_Version="CobaltStrike4.5"
-AdGuardHome_Version="v0.107.10"
+AdGuardHome_Version="v0.107.11"
 AdGuardHome_File_amd64="AdGuardHome_linux_amd64.tar.gz"
 AdGuardHome_File_arm64="AdGuardHome_linux_arm64.tar.gz"
 frp_Ver="v0.44.0"
@@ -83,9 +83,9 @@ fscan_Install_arm64="fscan_arm64"
 ffuf_Ver="v1.5.0"
 ffuf_Install_amd64="ffuf_1.5.0_linux_amd64.tar.gz"
 ffuf_Install_arm64="ffuf_1.5.0_linux_arm64.tar.gz"
-Nuclei_Ver="v2.7.6"
-Nuclei_Install_amd64="nuclei_2.7.6_linux_amd64.zip"
-Nuclei_Install_arm64="nuclei_2.7.6_linux_arm64.zip"
+Nuclei_Ver="v2.7.7"
+Nuclei_Install_amd64="nuclei_2.7.7_linux_amd64.zip"
+Nuclei_Install_arm64="nuclei_2.7.7_linux_arm64.zip"
 merlin_Ver="v1.4.1"
 merlin_Install_amd64="merlinServer-Linux-x64.7z"
 merlin_agent_windows="merlinAgent-Windows-x64.7z"
@@ -97,9 +97,9 @@ rad_File_arm64="rad_linux_arm64.zip"
 crawlergo_Ver="v0.4.3"
 crawlergo_File_amd64="crawlergo_linux_amd64"
 crawlergo_File_arm64="crawlergo_linux_arm64"
-Terraform_Ver="1.2.7"
-Terraform_bin_amd64="terraform_1.2.7_linux_amd64.zip"
-Terraform_bin_arm64="terraform_1.2.7_linux_arm64.zip"
+Terraform_Ver="1.2.8"
+Terraform_bin_amd64="terraform_1.2.8_linux_amd64.zip"
+Terraform_bin_arm64="terraform_1.2.8_linux_arm64.zip"
 CrossC2_Ver="v3.1.0"
 # https://nodejs.org/dist/
 node_Ver="v17.4.0"
@@ -122,9 +122,9 @@ proxify_bin_amd64="proxify_0.0.6_linux_amd64.zip"
 proxify_bin_arm64="proxify_0.0.6_linux_arm64.zip"
 clash_Ver="v1.7.0"
 clash_bin="clash-linux-amd64-v1.7.0.gz"
-fzf_Ver="0.32.1"
-fzf_bin_amd64="fzf-0.32.1-linux_amd64.tar.gz"
-fzf_bin_arm64="fzf-0.32.1-linux_arm64.tar.gz"
+fzf_Ver="0.33.0"
+fzf_bin_amd64="fzf-0.33.0-linux_amd64.tar.gz"
+fzf_bin_arm64="fzf-0.33.0-linux_arm64.tar.gz"
 subfinder_Ver="v2.5.3"
 subfinder_bin_amd64="subfinder_2.5.3_linux_amd64.zip"
 subfinder_bin_arm64="subfinder_2.5.3_linux_arm64.zip"
@@ -149,8 +149,8 @@ lux_bin_amd64="lux_0.14.0_Linux_64-bit.tar.gz"
 lux_bin_arm64="lux_0.14.0_Linux_ARM64.tar.gz"
 nginx_Ver="1.18.0"
 nginx_bin="nginx-1.18.0.tar.gz"
-jadx_Ver="v1.4.3"
-jadx_bin="jadx-1.4.3.zip"
+jadx_Ver="v1.4.4"
+jadx_bin="jadx-1.4.4.zip"
 rmg_Ver="v4.3.0"
 rmg_bin="rmg-4.3.0-jar-with-dependencies.jar"
 anew_Ver="v1.0.3"
@@ -198,11 +198,11 @@ assetfinder_bin="assetfinder-linux-amd64-0.1.1.tgz"
 ttyd_Ver="1.7.1"
 ttyd_bin_amd64="ttyd.x86_64"
 ttyd_bin_arm64="ttyd.arm"
-code_server_Ver="v4.5.2"
-code_server_bin1_amd64="code-server-4.5.2-amd64.rpm"
-code_server_bin2_amd64="code-server_4.5.2_amd64.deb"
-code_server_bin1_arm64="code-server-4.5.2-arm64.rpm"
-code_server_bin2_arm64="code-server_4.5.2_arm64.deb"
+code_server_Ver="v4.6.1"
+code_server_bin1_amd64="code-server-4.6.1-amd64.rpm"
+code_server_bin2_amd64="code-server_4.6.1_amd64.deb"
+code_server_bin1_arm64="code-server-4.6.1-arm64.rpm"
+code_server_bin2_arm64="code-server_4.6.1_arm64.deb"
 dismap_Ver="v0.4"
 dismap_bin_amd64="dismap-0.4-linux-amd64"
 dismap_bin_arm64="dismap-0.4-linux-arm64"
@@ -260,9 +260,12 @@ interactsh_client_bin_amd64="interactsh-client_1.0.6_Linux_x86_64.zip"
 interactsh_server_bin_amd64="interactsh-server_1.0.6_Linux_x86_64.zip"
 interactsh_client_bin_arm64="interactsh-client_1.0.6_Linux_arm.zip"
 interactsh_server_bin_arm64="interactsh-server_1.0.6_Linux_arm.zip"
-sliver_Ver="v1.5.22"
+sliver_Ver="v1.5.24"
 sliver_bin_Server="sliver-server_linux"
 sliver_bin_Client="sliver-client_linux"
+MoreFind_Ver="v1.2.6"
+MoreFind_bin_amd64="MoreFind_1.2.6_Linux_x86_64.tar.gz"
+MoreFind_bin_arm64="MoreFind_1.2.6_Linux_arm64.tar.gz"
 
 # ===================== Base Folder =====================
 Base_Dir(){
@@ -454,6 +457,21 @@ GO_Check(){
 
 }
 
+Ruby_Check(){
+
+    Echo_INFOR "Checking Ruby environment availability"
+    which gem > /dev/null 2>&1
+
+    if [ $? == 0 ]
+    then
+        Echo_INFOR "Ruby passed~"
+    else
+        Echo_ALERT "Dependencies not passed, start automatic installation of Ruby"
+        Ruby_Install
+    fi
+
+}
+
 Docker_Check(){
 
     Echo_INFOR "Checking Docker environment availability"
@@ -624,7 +642,7 @@ Sys_Version(){
             ;;
     esac
 
-    case $(cat /etc/*-release | head -n 1) in
+    case $(cat /etc/*-release | head -n 3) in
         *"Kali"*|*"kali"*)
             Linux_Version="Kali"
             case $(cat /etc/*-release | head -n 4) in
@@ -1038,10 +1056,10 @@ Update_APT_Mirror(){
 Update_kali_Mirror(){
 rm -f /etc/apt/sources.list.bak > /dev/null 2>&1 && cp /etc/apt/sources.list /etc/apt/sources.list.bak > /dev/null 2>&1
 tee /etc/apt/sources.list <<-'EOF'
-deb https://mirrors.aliyun.com/kali kali-rolling main non-free contrib
+# deb https://mirrors.aliyun.com/kali kali-rolling main non-free contrib
 # deb-src https://mirrors.aliyun.com/kali kali-rolling main non-free contrib
 deb http://mirrors.tuna.tsinghua.edu.cn/kali kali-rolling main contrib non-free
-# deb-src https://mirrors.tuna.tsinghua.edu.cn/kali kali-rolling main contrib non-free
+deb-src https://mirrors.tuna.tsinghua.edu.cn/kali kali-rolling main contrib non-free
 # deb http://http.kali.org/kali kali-rolling main non-free contrib
 # deb-src http://http.kali.org/kali kali-rolling main non-free contrib
 EOF
@@ -1522,6 +1540,7 @@ Proxychains_Install(){
             ;;
         *"Kali"*|*"Ubuntu"*|*"Debian"*)
             Install_Switch "g++"
+            Install_Switch "ca-certificates"
             ;;
         *) ;;
     esac
@@ -1616,20 +1635,20 @@ Base_Tools(){
     case $Linux_Version in
         *"CentOS"*|*"RedHat"*|*"Fedora"*|*"AlmaLinux"*|*"VzLinux"*|*"Rocky"*)
             Install_Switch "yum-utils"
+            Install_Switch "dnf"
             Install_Switch "gcc-c++"
             Install_Switch "glibc-headers"
             Install_Switch "openssl-devel"
             Install_Switch "kernel-devel"
-            Install_Switch "dnf"
             yum upgrade -y wget > /dev/null 2>&1
             ;;
         *"Kali"*|*"Ubuntu"*|*"Debian"*)
             apt-get update > /dev/null 2>&1
             Install_Switch "zip"
-            Install_Switch "g++"
-            Install_Switch "p7zip-full"
             Install_Switch "apt-transport-https"
             Install_Switch "ca-certificates"
+            Install_Switch "g++"
+            Install_Switch "p7zip-full"
             Install_Switch "libssl-dev"
             Install_Switch "libssh2-1-dev"
             Install_Switch "aptitude"
@@ -3079,8 +3098,9 @@ Pentest_netspy_Install(){
     else
         mkdir /tmp/netspy && cd /tmp/netspy && $Proxy_OK wget ${GitProxy}https://github.com/shmilylty/netspy/releases/download/$netspy_Ver/$netspy_bin > /dev/null 2>&1 || Echo_ERROR2
         unzip $netspy_bin > /dev/null 2>&1
-        mv --force $netspy_bin /usr/local/bin/netspy && chmod +x /usr/local/bin/netspy && rm -rf /tmp/netspy
+        mv --force $netspy_bin /usr/local/bin/netspy && chmod +x /usr/local/bin/netspy
         which netspy > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name $netspy_Ver in the /usr/local/bin/" || Echo_ERROR3
+        rm -rf /tmp/netspy
     fi
 
 }
@@ -3356,7 +3376,7 @@ Pentest_ysoserial_Install(){
     then
         Echo_ALERT "$name is already installed in $dir"
     else
-        mkdir -p $dir && cd $_ && rm -f ysoserial.jar > /dev/null 2>&1 && $Proxy_OK wget -O ysoserial.jar ${GitProxy2}https://jitpack.io/com/github/frohoff/ysoserial/master-SNAPSHOT/ysoserial-master-SNAPSHOT.jar > /dev/null 2>&1 || Echo_ERROR2
+        mkdir -p $dir && cd $_ && rm -f ysoserial.jar > /dev/null 2>&1 && $Proxy_OK wget -O ysoserial.jar ${GitProxy}https://github.com/frohoff/ysoserial/releases/download/v0.0.6/ysoserial-all.jar > /dev/null 2>&1 || Echo_ERROR2
         if test -e $dir/ysoserial.jar
         then
             Echo_INFOR "Successfully installed $name in the $dir"
@@ -4100,6 +4120,34 @@ Pentest_Platypus_Install(){
 
 }
 
+# ===================== Install MoreFind =====================
+Pentest_MoreFind_Install(){
+
+    case $Linux_architecture_Name in
+        *"linux-x86_64"*)
+            MoreFind_bin=$MoreFind_bin_amd64
+            ;;
+        *"linux-arm64"*)
+            MoreFind_bin=$MoreFind_bin_arm64
+            ;;
+    esac
+
+    name="MoreFind"
+    which MoreFind > /dev/null 2>&1
+
+    if [ $? == 0 ]
+    then
+        Echo_ALERT "$name installed"
+    else
+        mkdir -p /tmp/MoreFind && cd /tmp/MoreFind && $Proxy_OK wget ${GitProxy}https://github.com/mstxq17/MoreFind/releases/download/$MoreFind_Ver/$MoreFind_bin > /dev/null 2>&1 || Echo_ERROR2
+        tar -zxvf $MoreFind_bin > /dev/null 2>&1
+        mv --force MoreFind /usr/local/bin/MoreFind && chmod +x /usr/local/bin/MoreFind
+        which MoreFind > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name $MoreFind_Ver in the /usr/local/bin/" || Echo_ERROR3
+        rm -rf /tmp/MoreFind > /dev/null 2>&1
+    fi
+
+}
+
 # ===================== Install mapcidr =====================
 Pentest_mapcidr_Install(){
 
@@ -4175,8 +4223,9 @@ Pentest_dnsx_Install(){
     else
         mkdir -p /tmp/dnsx && cd /tmp/dnsx && rm -f $dnsx_bin > /dev/null 2>&1 && $Proxy_OK wget ${GitProxy}https://github.com/projectdiscovery/dnsx/releases/download/$dnsx_Ver/$dnsx_bin > /dev/null 2>&1 || Echo_ERROR2
         unzip $dnsx_bin > /dev/null 2>&1
-        mv --force dnsx /usr/local/bin/dnsx && chmod +x /usr/local/bin/dnsx && rm -rf /tmp/dnsx > /dev/null 2>&1
+        mv --force dnsx /usr/local/bin/dnsx && chmod +x /usr/local/bin/dnsx
         which dnsx > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name $dnsx_Ver in the /usr/local/bin/" || Echo_ERROR3
+        rm -rf /tmp/dnsx > /dev/null 2>&1
     fi
 
 }
@@ -4230,8 +4279,8 @@ Pentest_anew_Install(){
         mkdir -p /tmp/anew && cd /tmp/anew && rm -f ${anew_bin} > /dev/null 2>&1 && $Proxy_OK wget ${GitProxy}https://github.com/No-Github/anew/releases/download/$anew_Ver/$anew_bin > /dev/null 2>&1 || Echo_ERROR2
         tar -xzvf ${anew_bin} > /dev/null
         mv anew /usr/local/bin/anew && chmod +x /usr/local/bin/anew
-        rm -rf /tmp/anew
         which anew > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name $anew_Ver in the /usr/local/bin/" || Echo_ERROR3
+        rm -rf /tmp/anew
     fi
 
 }
@@ -4258,8 +4307,8 @@ Pentest_gron_Install(){
         mkdir -p /tmp/gron && cd /tmp/gron && rm -f ${gron_bin} > /dev/null 2>&1 && $Proxy_OK wget ${GitProxy}https://github.com/tomnomnom/gron/releases/download/${gron_Ver}/${gron_bin} > /dev/null 2>&1 || Echo_ERROR2
         tar -xzvf ${gron_bin} > /dev/null 2>&1
         mv /tmp/gron/gron /usr/local/bin/gron && chmod +x /usr/local/bin/gron
-        rm -rf /tmp/gron
         which gron > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name ${gron_Ver} in the /usr/local/bin/" || Echo_ERROR3
+        rm -rf /tmp/gron
     fi
 
 }
@@ -4279,8 +4328,8 @@ Pentest_unfurl_Install(){
                 mkdir -p /tmp/unfurl && cd /tmp/unfurl && rm -f ${unfurl_Bin} > /dev/null 2>&1 && $Proxy_OK wget ${GitProxy}https://github.com/tomnomnom/unfurl/releases/download/${unfurl_Ver}/${unfurl_Bin} > /dev/null 2>&1 || Echo_ERROR2
                 tar -xzvf ${unfurl_Bin} > /dev/null 2>&1
                 mv /tmp/unfurl/unfurl /usr/local/bin/unfurl && chmod +x /usr/local/bin/unfurl
-                rm -rf /tmp/unfurl
                 which unfurl > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name ${unfurl_Ver} in the /usr/local/bin/" || Echo_ERROR3
+                rm -rf /tmp/unfurl
                 ;;
             *"linux-arm64"*)
                 export GO111MODULE=on && export GOPROXY=https://goproxy.io && export GOPATH=$HOME/go
@@ -4774,7 +4823,7 @@ Pentest_jmet_Install(){
     then
         Echo_ALERT "$name is already installed in $dir"
     else
-        mkdir -p $dir && cd $_ && rm -f ysoserial.jar > /dev/null 2>&1 && $Proxy_OK wget -O jmet.jar ${GitProxy2}https://github.com/matthiaskaiser/jmet/releases/download/0.1.0/jmet-0.1.0-all.jar > /dev/null 2>&1 || Echo_ERROR2
+        mkdir -p $dir && cd $_ && rm -f jmet.jar > /dev/null 2>&1 && $Proxy_OK wget -O jmet.jar ${GitProxy2}https://github.com/matthiaskaiser/jmet/releases/download/0.1.0/jmet-0.1.0-all.jar > /dev/null 2>&1 || Echo_ERROR2
         if test -e $dir/jmet.jar
         then
             Echo_INFOR "Successfully installed $name in the $dir"
@@ -5765,7 +5814,19 @@ Ruby_Install(){
 
     echo -e "\033[1;33m\n>> Installing Ruby\n\033[0m"
     Rm_Lock
-    Install_Switch "ruby"
+    case $Linux_Version in
+        *"CentOS"*|*"RedHat"*|*"Fedora"*|*"AlmaLinux"*|*"VzLinux"*|*"Rocky"*)
+            Install_Switch "ruby"
+            Install_Switch "rubygems"
+            Install_Switch "ruby-devel"
+            ;;
+        *"Kali"*|*"Ubuntu"*|*"Debian"*)
+            Install_Switch "ruby"
+            Install_Switch "rubygems"
+            Install_Switch "ruby-dev"
+            ;;
+        *) ;;
+    esac
 
 }
 
@@ -7055,6 +7116,7 @@ sliver-client_Install(){
 yakit_Install(){
 
     name="yakit"
+    echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
     which yak > /dev/null 2>&1
 
     if [ $? == 0 ]
@@ -7068,6 +7130,23 @@ yakit_Install(){
 
 }
 
+# -wpscan
+wpscan_Install(){
+
+    name="wpscan"
+    echo -e "\033[1;33m\n>> Installing $name\n\033[0m"
+    which wpscan > /dev/null 2>&1
+
+    if [ $? == 0 ]
+    then
+        Echo_ALERT "$name installed"
+    else
+        gem update --system
+        gem install wpscan
+    fi
+
+}
+
 # -suricata
 suricata_Install(){
 
@@ -7619,6 +7698,7 @@ clash_Install(){
     if [ $? == 0 ]
     then
         Echo_ALERT "$name installed"
+        Echo_INFOR "如果提示找不到 clash 命令,请尝试输入 source /etc/profile &> /dev/null && clash"
     else
         # https://github.com/juewuy/ShellClash
         export tmp_url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $tmp_url/install.sh)" && source /etc/profile &> /dev/null
@@ -7628,19 +7708,6 @@ clash_Install(){
         # clash -v > /dev/null 2>&1 && Echo_INFOR "Successfully installed $name" || Echo_ERROR3
     fi
 
-    # echo -e "\033[1;33m\n>> Do you need to configure the Clash link [Y/n,Default Y] \033[0m" && read -r input
-    # case $input in
-    #     [nN][oO]|[nN])
-    #         Echo_INFOR "Pass~"
-    #         ;;
-    #     *)
-    #         mv --force ~/.config/clash/config.yaml ~/.config/clash/config.yaml.bak
-    #         echo -e "\033[5;33mPlease paste the Clash link address\033[0m" && read -r input
-    #         wget -O ~/.config/clash/config.yaml $input > /dev/null 2>&1
-    #         Echo_INFOR "Over! Run clash and access http://clash.razord.top make policy group settings，for the specific port and password, please enter the external-controller as shown in the yml file"
-    #         ;;
-    # esac
-
 }
 
 # Compile and install jq does not run by default
@@ -8044,6 +8111,8 @@ kali_Tools_TypeD(){
     Pentest_qsreplace_Install
     echo -e "\033[1;33m\n>> Installing Platypus\n\033[0m"
     Pentest_Platypus_Install
+    echo -e "\033[1;33m\n>> Installing MoreFind\n\033[0m"
+    Pentest_MoreFind_Install
 
     # Pentest_jwtcat_Install
     # Pentest_gojwtcrack_Install
@@ -8195,6 +8264,7 @@ Help(){
     echo -e "  \033[1;34m-aircrack\033[0m \033[0;34m        : install aircrack-ng\033[0m"
     echo -e "  \033[1;34m-bypass\033[0m \033[0;34m          : install Bypass\033[0m"
     echo -e "  \033[1;34m-goby\033[0m \033[0;34m            : install Goby\033[0m                       \033[1;33m(Requires GUI environment)\033[0m"
+    echo -e "  \033[1;34m-wpscan\033[0m \033[0;34m          : install wpscan\033[0m"
     echo -e "  \033[1;34m-yakit\033[0m \033[0;34m           : install yakit\033[0m"
     echo -e ""
     echo -e "\033[1;34mRed Team Infrastructure \033[0m"
@@ -8691,6 +8761,14 @@ do
             Base_Check
             sliver-client_Install
             ;;
+        -wpscan)
+            mac_Check || exit 1
+            linux_arm64_Check || exit 1
+            Proxy_Switch
+            Base_Check
+            Ruby_Check
+            wpscan_Install
+            ;;
         -yakit)
             mac_Check || exit 1
             linux_arm64_Check || exit 1