diff --git a/README.md b/README.md
index aa9fd77..79c267b 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,7 @@
 ![release-date](https://img.shields.io/github/release-date/01rabbit/KaliPAKU)
 ![sns](https://img.shields.io/twitter/follow/PAKURI9?label=PAKURI&style=social)
 
-## Overview
-
-KaliPAKU is a command-line tool for Kali Linux that provides an easy-to-use menu-driven interface to run various security tools. The tool is designed to simplify the process of running popular security tools and includes the top 10 tools from the Kali Linux distribution.
-One of the unique features of KaliPAKU is its intuitive menu system, which is based on the Ten-Key Numbering System. This allows users to quickly select the tool they want to run by typing the corresponding number on the keypad. This menu system is designed to be easy to use and can be quickly mastered even by those who are new to Kali Linux.
-Overall, KaliPAKU is a powerful and easy-to-use tool for anyone looking to simplify the process of running popular security tools on Kali Linux.
-
-### What's KaliPAKU
+## What's KaliPAKU
 
 I call it "KaliPAKU" with a hint of irony, since it looks like a tool I made myself, using tools included in Kali Linux and adding a little PAKURI control.
 Incidentally, "karipaku" in Japanese slang indicates embezzling something borrowed.
@@ -22,6 +16,22 @@ Incidentally, "karipaku" in Japanese slang indicates embezzling something borrow
 
 ---
 
+## Overview
+
+![overview](https://user-images.githubusercontent.com/16553787/229039110-d749063f-e245-48a4-b5c2-e94d8d2db760.png)
+KaliPAKU is a command-line tool for Kali Linux that provides an easy-to-use menu-driven interface to run various security tools. The tool is designed to simplify the process of running popular security tools and includes the top 10 tools from the Kali Linux distribution.
+One of the unique features of KaliPAKU is its intuitive menu system, which is based on the Ten-Key Numbering System. This allows users to quickly select the tool they want to run by typing the corresponding number on the keypad. This menu system is designed to be easy to use and can be quickly mastered even by those who are new to Kali Linux.
+Overall, KaliPAKU is a powerful and easy-to-use tool for anyone looking to simplify the process of running popular security tools on Kali Linux.
+
+### What's Ten-key Numbering System
+
+The Ten-key Numbering System enables even beginners to execute Kali Linux commands without typing them out. It is also useful for simplifying commands, even for experienced users. Key features include:
+
+1. Commands can be executed by inputting 3 to 5 digit numbers.
+2. It reduces input errors when typing out commands.
+3. By using numbers to execute commands, instructions within a team become more concise.
+4. It enables people with physical disabilities to participate in penetration testing if they can operate the ten-key pad.
+
 ## Description
 
 KaliPAKU is a Bash shell script that allows users to easily access the Kali Linux tools included in the kali-tools-top10 package. One of its unique features is the Ten-Key Numbering System, which allows users to execute commands by simply typing numbers on the numeric keypad. This system is similar to the finger numbers used when learning to play a musical instrument, and is designed to make it easier for beginners to use Kali Linux.  
@@ -69,7 +79,7 @@ The benefits of using our KaliPAKU include
     ![KaliPAKU Terminal](https://user-images.githubusercontent.com/16553787/200162688-e8f11bce-890b-4af2-b58b-a284145ac24b.png)  
 3. KaliPAKU Terminal
 Enter "kp" or "kalipaku" at the KaliPAKU terminal or enter the magic number "4649" to activate the KaliPAKU menu.  
-    ![KaliPAKU menu](https://user-images.githubusercontent.com/16553787/223942455-f3cb9060-34b3-4b0a-b1c7-9e270925da6f.png)  
+    ![KaliPAKU menu](https://user-images.githubusercontent.com/16553787/229037118-80dd7e8e-0a5d-4040-99c5-fd9c54a93048.png)  
 4. KaliPAKU Cheatsheet  
 Here is a partial cheat sheet of commands that can be called up in the KaliPAKU menu. To check the cheat sheet, use "cs", "cheat", or "cheatsheet". You can also use the magic number "4936".  
     ![cheatsheet](https://user-images.githubusercontent.com/16553787/200162706-4f6231c5-d96e-4788-8d64-786f949c2ff1.png)
@@ -112,7 +122,7 @@ Here is a partial cheat sheet of commands that can be called up in the KaliPAKU
 ## How to use
 
 1. To scan with Nmap, start KaliPAKU and activate the KaliPAKU menu. The magic number to type is "4649". The magic number is "4649", which means "greetings" in Japanese.  
-    ![KaliPAKU Menu](https://user-images.githubusercontent.com/16553787/223942455-f3cb9060-34b3-4b0a-b1c7-9e270925da6f.png)  
+    ![KaliPAKU Menu](https://user-images.githubusercontent.com/16553787/229037118-80dd7e8e-0a5d-4040-99c5-fd9c54a93048.png)  
 2. Then enter the magic number "1022" if you want to perform an Intense Scan of Nmap(It takes only about 0.5 seconds to transition to this screen)  
    ![nmap](https://user-images.githubusercontent.com/16553787/200163893-d712c21e-da9c-460c-91d3-1f39a363e5f0.png)  
 
@@ -149,8 +159,8 @@ Use Faraday to effectively use the reconnaissance information collected in Demo1
 
 ## Operation check environment
 
-- OS: Kali Linux 2022.4
-- Memory: 8.0GB
+- OS: Kali Linux 2023.1
+- Memory: 2048MB
 
 ## Contributors
 
diff --git a/kalipaku.sh b/kalipaku.sh
index d497c54..286d627 100755
--- a/kalipaku.sh
+++ b/kalipaku.sh
@@ -46,7 +46,6 @@ function mainmenu(){
         *)
             ;;
         esac
-        unset NUM
     done
     clear
 }
diff --git a/modules/attack/31_kp_setoolkit.sh b/modules/attack/31_kp_setoolkit.sh
index 6b13a27..5c28eb2 100644
--- a/modules/attack/31_kp_setoolkit.sh
+++ b/modules/attack/31_kp_setoolkit.sh
@@ -7,9 +7,9 @@ function menu_setoolkit(){
     clear
     figlet setoolkit
     num3 0 "Attack"
-    num2 5 "Social-Engineering" "(setoolkit)"
-    num1 10 "Website_Attack_Vectors" "(Credential_Harvester_Attack)"
-    num9 10 "Back"
+    num2 3 "Social-Engineering" "(setoolkit)"
+    num1 6 "Website_Attack_Vectors" "(Credential_Harvester_Attack)"
+    num9 6 "Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/attack/32_kp_msfpc.sh b/modules/attack/32_kp_msfpc.sh
index e9cbfaf..0e3e075 100644
--- a/modules/attack/32_kp_msfpc.sh
+++ b/modules/attack/32_kp_msfpc.sh
@@ -7,9 +7,9 @@ function menu_msfpc(){
     clear
     figlet MSFPC
     num3 0 " Attack"
-    num4 5 " MSFvenom_Payload_Creator" " (msfpc)"
-    num1 10 " Create_Payload"
-    num9 10 " Back"
+    num4 3 " MSFvenom_Payload_Creator" " (msfpc)"
+    num1 6 " Create_Payload"
+    num9 6 " Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/attack/33_kp_searchsploit.sh b/modules/attack/33_kp_searchsploit.sh
index 3fe3600..a2103d2 100644
--- a/modules/attack/33_kp_searchsploit.sh
+++ b/modules/attack/33_kp_searchsploit.sh
@@ -7,10 +7,10 @@ function menu_searchsploit(){
     clear
     figlet SearchSploit
     num3 0 " Attack"
-    num5 5 " Search_Exploit" " (searchsploit)"
-    num1 10 " Search"
-    num2 10 " Automatic_Search" " (Miscellaneous_Automation)"
-    num9 10 " Back"
+    num5 3 " Search_Exploit" " (searchsploit)"
+    num1 6 " Search"
+    num2 6 " Automatic_Search" " (Miscellaneous_Automation)"
+    num9 6 " Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/attack/attackmenu.sh b/modules/attack/attackmenu.sh
index 3371411..c52ea80 100644
--- a/modules/attack/attackmenu.sh
+++ b/modules/attack/attackmenu.sh
@@ -12,12 +12,12 @@ function menu_attack(){
     clear
     figlet Attack
     num3 0 " Attack"
-    num1 5 " Exploit" " (Metasploit)"
-    num2 5 " Social-Engineering" " (setoolkit)"
-    num3 5 " Brute-force" " (crackmapexec)"
-    num4 5 " Payload_Creator" " (msfpc)"
-    num5 5 " Search Exploit" " (searchsploit)"
-    num9 5 " Main"
+    num1 3 " Exploit" " (Metasploit)"
+    num2 3 " Social-Engineering" " (setoolkit)"
+    num3 3 " Brute-force" " (crackmapexec)"
+    num4 3 " Payload_Creator" " (msfpc)"
+    num5 3 " Search Exploit" " (searchsploit)"
+    num9 3 " Main"
     read -n 1 -s n
     case $n in
     1)
diff --git a/modules/auxiliary/51_kp_undercover.sh b/modules/auxiliary/51_kp_undercover.sh
index ee3f565..789157b 100644
--- a/modules/auxiliary/51_kp_undercover.sh
+++ b/modules/auxiliary/51_kp_undercover.sh
@@ -7,9 +7,9 @@ function menu_undercover(){
     clear
 	figlet Undercover
 	num5 0 "Auxiliary"
-	num1 5 "kali-undercover"
-	num1 10 "Execute"
-	num9 10 "Back"
+	num1 3 "kali-undercover"
+	num1 6 "Execute"
+	num9 6 "Back"
     read -n 1 -s NUM
 	case $NUM in
     1)
diff --git a/modules/auxiliary/52_kp_netcat.sh b/modules/auxiliary/52_kp_netcat.sh
index e387fac..db1d8de 100644
--- a/modules/auxiliary/52_kp_netcat.sh
+++ b/modules/auxiliary/52_kp_netcat.sh
@@ -6,13 +6,13 @@ function menu_netcat(){
 	clear
 	figlet Netcat
 	num5 0 "Auxiliary"
-	num2 5 "Netcat"
-	num1 10 "Connect"
-	num2 10 "Reverse Connect"
-    num3 10 "Send File"
-    num4 10 "Receiving File"
-    num5 10 "Manual"
-	num9 10 "Back"
+	num2 3 "Netcat"
+	num1 6 "Connect"
+	num2 6 "Reverse Connect"
+    num3 6 "Send File"
+    num4 6 "Receiving File"
+    num5 6 "Manual"
+	num9 6 "Back"
     read -n 1 -s NUM
 	case $NUM in
     1)
diff --git a/modules/auxiliary/53_kp_httpserver.sh b/modules/auxiliary/53_kp_httpserver.sh
index cff44ee..ac3fed1 100644
--- a/modules/auxiliary/53_kp_httpserver.sh
+++ b/modules/auxiliary/53_kp_httpserver.sh
@@ -7,9 +7,9 @@ function menu_httpserver(){
     clear
 	figlet Python HTTP Server
 	num5 0 "Auxiliary"
-	num3 5 "Python HTTP Server"
-	num1 10 "Execute"
-	num9 10 "Back"
+	num3 3 "Python HTTP Server"
+	num1 6 "Execute"
+	num9 6 "Back"
     read -n 1 -s NUM
 	case $NUM in
     1)
diff --git a/modules/auxiliary/auxiliarymenu.sh b/modules/auxiliary/auxiliarymenu.sh
index d57cef5..e2de06e 100644
--- a/modules/auxiliary/auxiliarymenu.sh
+++ b/modules/auxiliary/auxiliarymenu.sh
@@ -10,10 +10,10 @@ function menu_auxiliary(){
     clear
     figlet Auxiliary
     num5 0 "Auxiliary"
-    num1 5 "kali-undercover"
-    num2 5 "Netcat"
-    num3 5 "Python HTTP Server"
-    num9 5 "Main"
+    num1 3 "kali-undercover"
+    num2 3 "Netcat"
+    num3 3 "Python HTTP Server"
+    num9 3 "Main"
     read -n 1 -s NUM
 	case $NUM in
 	1)
diff --git a/modules/kali-tools-top10/10_kp_wireshark.sh b/modules/kali-tools-top10/10_kp_wireshark.sh
index 3004583..028d78f 100644
--- a/modules/kali-tools-top10/10_kp_wireshark.sh
+++ b/modules/kali-tools-top10/10_kp_wireshark.sh
@@ -7,10 +7,10 @@ function menu_wireshark(){
 	clear
 	figlet wireshark
 	num1 0 "Kali-tools-top10"
-	num5 5 "wireshark(tshark)"
-	num1 10 "wireshark"
-    num2 10 "tshark"
-	num9 10 "Back"
+	num5 3 "wireshark(tshark)"
+	num1 6 "wireshark"
+    num2 6 "tshark"
+	num9 6 "Back"
     read -n 1 -s NUM
 	case $NUM in
     1)
diff --git a/modules/kali-tools-top10/1_kp_wifite.sh b/modules/kali-tools-top10/1_kp_wifite.sh
index 1e8b587..0da5d5a 100644
--- a/modules/kali-tools-top10/1_kp_wifite.sh
+++ b/modules/kali-tools-top10/1_kp_wifite.sh
@@ -7,10 +7,10 @@ function menu_wifite(){
 	clear
 	figlet wifite
 	num1 0 "Kali-tools-top10"
-	num1 5 "wifite"
-	num1 10 "Execute"
-	num2 10 "Manual"
-	num9 10 "Back"
+	num1 3 "wifite"
+	num1 6 "Execute"
+	num2 6 "Manual"
+	num9 6 "Back"
     read -n 1 -s NUM
 	case $NUM in
     1)
diff --git a/modules/kali-tools-top10/2_kp_burpsuite.sh b/modules/kali-tools-top10/2_kp_burpsuite.sh
index 597960d..ba8057b 100644
--- a/modules/kali-tools-top10/2_kp_burpsuite.sh
+++ b/modules/kali-tools-top10/2_kp_burpsuite.sh
@@ -7,9 +7,9 @@ function menu_burpsuite(){
 	clear
 	figlet Burpsuite
 	num1 0 "Kali-tools-top10"
-	num2 5 "burpsuite"
-	num1 10 "Execute"
-	num9 10 "Back"
+	num2 3 "burpsuite"
+	num1 6 "Execute"
+	num9 6 "Back"
     read -n 1 -s NUM
 	case $NUM in
     1)
diff --git a/modules/kali-tools-top10/3_kp_crackmapexec.sh b/modules/kali-tools-top10/3_kp_crackmapexec.sh
index 76d754c..43eb4e0 100644
--- a/modules/kali-tools-top10/3_kp_crackmapexec.sh
+++ b/modules/kali-tools-top10/3_kp_crackmapexec.sh
@@ -7,14 +7,14 @@ function menu_crackmapexec(){
 	clear
 	figlet crackmapexec
     num1 0 "Kali-tools-top10"
-    num3 5 "crackmapexec(SMB)"
-    num1 10 "Target_format(Basic)"
-    num2 10 "Null_session"
-    num3 10 "Connect_to_target_using_local_account"
-    num4 10 "Path_the_hash_against_a_subnet"
-    num5 10 "Brutefocing_&_Password_Spraying"
-    num6 10 "Manual"
-	num9 10 "Back"
+    num3 3 "crackmapexec(SMB)"
+    num1 6 "Target_format(Basic)"
+    num2 6 "Null_session"
+    num3 6 "Connect_to_target_using_local_account"
+    num4 6 "Path_the_hash_against_a_subnet"
+    num5 6 "Brutefocing_&_Password_Spraying"
+    num6 6 "Manual"
+	num9 6 "Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/kali-tools-top10/4_kp_hydra.sh b/modules/kali-tools-top10/4_kp_hydra.sh
index a2be92d..668e5a2 100644
--- a/modules/kali-tools-top10/4_kp_hydra.sh
+++ b/modules/kali-tools-top10/4_kp_hydra.sh
@@ -7,11 +7,11 @@ function menu_hydra(){
 	clear
 	figlet hydra
     num1 0 "Kali-tools-top10"
-    num4 5 "hydra"
-    num1 10 "Dictionary_Attack"
-    num2 10 "Password_Spray_Attack"
-    num3 10 "Manual"
-	num9 10 "Back"
+    num4 3 "hydra"
+    num1 6 "Dictionary_Attack"
+    num2 6 "Password_Spray_Attack"
+    num3 6 "Manual"
+	num9 6 "Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/kali-tools-top10/5_kp_john.sh b/modules/kali-tools-top10/5_kp_john.sh
index d2af8c7..facf9cf 100644
--- a/modules/kali-tools-top10/5_kp_john.sh
+++ b/modules/kali-tools-top10/5_kp_john.sh
@@ -7,13 +7,13 @@ function menu_john(){
 	clear
 	figlet john
     num1 0 "Kali-tools-top10"
-    num5 5 "john"
-    num1 10 "Cracking_with_a_wordlist"
-    num2 10 "Attempt_to_crack_hash_file" " using_previously_cracked_passwords"
-    num3 10 "Show_cracked_passwords"
-    num4 10 "Attempt_to_crack_hash_using_incremental_mode" " (May_take_a_long_time)"
-    num5 10 "Manual"
-    num9 10 "Back"
+    num5 3 "john"
+    num1 6 "Cracking_with_a_wordlist"
+    num2 6 "Attempt_to_crack_hash_file" " using_previously_cracked_passwords"
+    num3 6 "Show_cracked_passwords"
+    num4 6 "Attempt_to_crack_hash_using_incremental_mode" " (May_take_a_long_time)"
+    num5 6 "Manual"
+    num9 6 "Back"
 	read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/kali-tools-top10/6_kp_metasploit.sh b/modules/kali-tools-top10/6_kp_metasploit.sh
index 43e7ecf..c6bbe35 100644
--- a/modules/kali-tools-top10/6_kp_metasploit.sh
+++ b/modules/kali-tools-top10/6_kp_metasploit.sh
@@ -2,17 +2,17 @@
 
 source kp.conf
 source $MODULES_PATH/misc_module.sh
-source $TOOL_PATH/32_kp_msfpc.sh
+source $ATTACK_PATH/32_kp_msfpc.sh
 
 function menu_metasploit(){
 	clear
 	figlet Metasploit
     num1 0 " Kali-tools-top10"
-    num1 5 " metasploit-framework"
-    num1 10 " Normal_Boot"
-    num2 10 " Create_Multi_handler" " (windows/meterpreter/reverse_tcp)"
-    num3 10 " Create_Payload" " (msfpc)"
-    num9 10 " Back"
+    num1 3 " metasploit-framework"
+    num1 6 " Normal_Boot"
+    num2 6 " Create_Multi_handler" " (windows/meterpreter/reverse_tcp)"
+    num3 6 " Create_Payload" " (msfpc)"
+    num9 6 " Back"
 	read -n 1 -s NUM
     echo ""
     case $NUM in
diff --git a/modules/kali-tools-top10/7_kp_nmap.sh b/modules/kali-tools-top10/7_kp_nmap.sh
index 1a8027b..622aaeb 100644
--- a/modules/kali-tools-top10/7_kp_nmap.sh
+++ b/modules/kali-tools-top10/7_kp_nmap.sh
@@ -7,14 +7,14 @@ function menu_nmap(){
 	clear
 	figlet Nmap
     num1 0 "Kali-tools-top10"
-    num2 5 "nmap"
-    num1 10 "Ping_Scan"
-    num2 10 "Intense_Scan"
-    num3 10 "Intense_Scan_UDP"
-    num4 10 "Intense_Scan_all_TCP"
-    num5 10 "Vuln_Scan"
-    num6 10 "Manual"
-    num9 10 "Back"
+    num2 3 "nmap"
+    num1 6 "Ping_Scan"
+    num2 6 "Intense_Scan"
+    num3 6 "Intense_Scan_UDP"
+    num4 6 "Intense_Scan_all_TCP"
+    num5 6 "Vuln_Scan"
+    num6 6 "Manual"
+    num9 6 "Back"
 	read -n 1 -s NUM
     case $NUM in
     1) cmd_nmap1 ;;
diff --git a/modules/kali-tools-top10/8_kp_responder.sh b/modules/kali-tools-top10/8_kp_responder.sh
index ca02466..c090bb4 100644
--- a/modules/kali-tools-top10/8_kp_responder.sh
+++ b/modules/kali-tools-top10/8_kp_responder.sh
@@ -7,13 +7,13 @@ function menu_responder(){
 	clear
 	figlet Responder
     num1 0 "Kali-tools-top10"
-    num3 5 "responder"
-    num1 10 "Basic_Usage"
-    num2 10 "Analyze_mode"
-    num3 10 "Poisoning_with_Responder"
-    num4 10 "Basic_Authentication_&_WPAD"
-    num5 10 "Manual"
-    num9 10 "Back"
+    num3 3 "responder"
+    num1 6 "Basic_Usage"
+    num2 6 "Analyze_mode"
+    num3 6 "Poisoning_with_Responder"
+    num4 6 "Basic_Authentication_&_WPAD"
+    num5 6 "Manual"
+    num9 6 "Back"
 	read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/kali-tools-top10/9_kp_sqlmap.sh b/modules/kali-tools-top10/9_kp_sqlmap.sh
index 3648193..84f5e03 100644
--- a/modules/kali-tools-top10/9_kp_sqlmap.sh
+++ b/modules/kali-tools-top10/9_kp_sqlmap.sh
@@ -7,13 +7,13 @@ function menu_sqlmap(){
 	clear
 	figlet sqlmap
     num1 0 "Kali-tools-top10"
-    num4 5 "sqlmap"
-    num1 10 "Enume_all_dbs"
-    num2 10 "Enume_all_tables"
-    num3 10 "Enume_table_columns"
-    num4 10 "Table_columns_dump"
-    num6 10 "Manual"
-    num9 10 "Back"
+    num4 3 "sqlmap"
+    num1 6 "Enume_all_dbs"
+    num2 6 "Enume_all_tables"
+    num3 6 "Enume_table_columns"
+    num4 6 "Table_columns_dump"
+    num6 6 "Manual"
+    num9 6 "Back"
 	read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/kali-tools-top10/top10menu.sh b/modules/kali-tools-top10/top10menu.sh
index 5b25ecc..68930cf 100644
--- a/modules/kali-tools-top10/top10menu.sh
+++ b/modules/kali-tools-top10/top10menu.sh
@@ -19,13 +19,13 @@ function kalitoolstop10_menu1(){
 	clear
 	figlet kali-tools-top10
     num1 0 "Kali-tools-top10"
-    num1 5 "wifite(aircrack-ng)"
-    num2 5 "burpsuite"
-    num3 5 "crackmapexec(SMB)"
-    num4 5 "hydra"
-    num5 5 "john"
-    num0 5 "Next"
-	num9 5 "Main"
+    num1 3 "wifite(aircrack-ng)"
+    num2 3 "burpsuite"
+    num3 3 "crackmapexec(SMB)"
+    num4 3 "hydra"
+    num5 3 "john"
+    num0 3 "Next"
+	num9 3 "Main"
 	printf "${NC}"
 	read -n 1 -s NUM
 	case $NUM in
@@ -60,13 +60,13 @@ function kalitoolstop10_menu2(){
 	clear
 	figlet kali-tools-top10
     num1 0 "Kali-tools-top10"
-    num1 5 "metasploit-framework"
-    num2 5 "nmap"
-    num3 5 "responder"
-    num4 5 "sqlmap"
-    num5 5 "wireshark(tshark)"
-    num0 5 "Back"
-	num9 5 "Main"
+    num1 3 "metasploit-framework"
+    num2 3 "nmap"
+    num3 3 "responder"
+    num4 3 "sqlmap"
+    num5 3 "wireshark(tshark)"
+    num0 3 "Back"
+	num9 3 "Main"
     read -n 1 -s NUM
 	case $NUM in
 	1)
diff --git a/modules/misc_module.sh b/modules/misc_module.sh
index 4352ba5..f16a717 100644
--- a/modules/misc_module.sh
+++ b/modules/misc_module.sh
@@ -30,50 +30,42 @@ function banner(){
 
 
 function num0(){
-    printf "${WHITE}%$1s  |  ${WHITE}+---+\n"
-    printf "${WHITE}%$1s  +--${WHITE}| 0 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${WHITE}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${WHITE}[0]%s\n" "" " $2 $3"
 }
 function num1(){
-    printf "${WHITE}%$1s  |  ${RED}+---+\n"
-    printf "${WHITE}%$1s  +--${RED}| 1 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${RED}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${RED}[1]%s${NC}\n" "" " $2 $3"
 }
 
 function num2(){
-    printf "${WHITE}%$1s  |  ${GREEN}+---+\n"
-    printf "${WHITE}%$1s  +--${GREEN}| 2 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${GREEN}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${GREEN}[2]%s${NC}\n" "" " $2 $3"
 }
 
 function num3(){
-    printf "${WHITE}%$1s  |  ${YELLOW}+---+\n"
-    printf "${WHITE}%$1s  +--${YELLOW}| 3 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${YELLOW}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${YELLOW}[3]%s${NC}\n" "" " $2 $3"
 }
 
 function num4(){
-    printf "${WHITE}%$1s  |  ${BLUE}+---+\n"
-    printf "${WHITE}%$1s  +--${BLUE}| 4 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${BLUE}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${BLUE}[4]%s${NC}\n" "" " $2 $3"
 }
 
 function num5(){
-    printf "${WHITE}%$1s  |  ${PURPLE}+---+\n"
-    printf "${WHITE}%$1s  +--${PURPLE}| 5 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${PURPLE}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${PURPLE}[5]%s${NC}\n" "" " $2 $3"
 }
 
 function num6(){
-    printf "${WHITE}%$1s  |  ${LIGHTBLUE}+---+\n"
-    printf "${WHITE}%$1s  +--${LIGHTBLUE}| 6 |%s\n" "" " $2"
-    printf "${WHITE}%$1s  |  ${LIGHTBLUE}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${LIGHTBLUE}[6]%s${NC}\n" "" " $2 $3"
 }
 
 function num9(){
-    printf "${WHITE}%$1s  |  ${BLACK}+---+\n"
-    printf "${WHITE}%$1s  +--${BLACK}| 9 |%s\n" "" " $2"
-    printf "${WHITE}%$1s     ${BLACK}+---+%s${NC}\n" "" " $3"
+    printf "${WHITE}%$1s  |  \n"
+    printf "${WHITE}%$1s  +-${BLACK}[9]%s${NC}\n" "" " $2 $3"
 }
 
 function show_number()
@@ -87,4 +79,8 @@ function show_number()
     figlet $2
     sleep 1.5
     clear
+}
+
+function main_banner() {
+    figlet KaliPAKU
 }
\ No newline at end of file
diff --git a/modules/reports/41_kp_results.sh b/modules/reports/41_kp_results.sh
index d4136d0..78f3caa 100644
--- a/modules/reports/41_kp_results.sh
+++ b/modules/reports/41_kp_results.sh
@@ -7,9 +7,9 @@ function menu_results(){
     clear
     figlet Reports
     num4 0 "Reports"
-    num1 5 "results"
-    num1 10 "Show Result"
-    num9 10 "Back"
+    num1 3 "results"
+    num1 6 "Show Result"
+    num9 6 "Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/reports/42_kp_faraday.sh b/modules/reports/42_kp_faraday.sh
index a8ed4db..6a4295d 100644
--- a/modules/reports/42_kp_faraday.sh
+++ b/modules/reports/42_kp_faraday.sh
@@ -7,12 +7,12 @@ function menu_faraday(){
     clear
     figlet Faraday
     num4 0 "Reports"
-    num2 5 "Faraday"
-    num1 10 "Start Faraday"
-    num2 10 "Stop Faraday"
-    num3 10 "Open Faraday(Web)"
-    num4 10 "faraday-cli"
-    num9 10 "Back"
+    num2 3 "Faraday"
+    num1 6 "Start Faraday"
+    num2 6 "Stop Faraday"
+    num3 6 "Open Faraday(Web)"
+    num4 6 "faraday-cli"
+    num9 6 "Back"
     read -n 1 -s NUM
     case $NUM in
     1)
@@ -126,14 +126,14 @@ function menu_faraday-cli(){
     clear
     figlet Faraday
     num4 0 "Reports"
-    num2 5 "Faraday"
-    num4 10 "faraday-cli"
-    num1 15 "auth"
-    num2 15 "workspace"
-    num3 15 "List"
-    num4 15 "Import"
-    num6 15 "Stats"
-    num9 15 "Back"
+    num2 3 "Faraday"
+    num4 6 "faraday-cli"
+    num1 9 "auth"
+    num2 9 "workspace"
+    num3 9 "List"
+    num4 9 "Import"
+    num6 9 "Stats"
+    num9 9 "Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/reports/reportmenu.sh b/modules/reports/reportmenu.sh
index a216856..ee05ffd 100644
--- a/modules/reports/reportmenu.sh
+++ b/modules/reports/reportmenu.sh
@@ -10,9 +10,9 @@ function menu_reports(){
     clear
     figlet Reports
     num4 0 "Reports"
-    num1 5 "results"
-    num2 5 "Faraday"
-    num9 5 "Main"
+    num1 3 "results"
+    num2 3 "Faraday"
+    num9 3 "Main"
     read -n 1 -s NUM
 	case $NUM in
 	1) 
diff --git a/modules/tools/21_kp_autoscan.sh b/modules/tools/21_kp_autoscan.sh
deleted file mode 100644
index c760e6a..0000000
--- a/modules/tools/21_kp_autoscan.sh
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/bin/bash
-
-source kp.conf
-source $MODULES_PATH/misc_module.sh
-
-function menu_autoscan(){
-    clear
-    figlet AutoScan
-    num2 0 " Tools"
-    num1 5 " AutoScan"
-    num1 10 " Install"
-    num2 10 " Scan"
-    num9 10 " Back"
-    read -n 1 -s NUM
-    case $NUM in
-    1)
-        install_autoscan
-        ;;
-    2)
-        cmd_autoscan1
-        ;;
-    9)
-        menu_tools
-        ;;
-    *)
-        ;;
-    esac
-}
-
-function install_autoscan(){
-    clear
-    figlet AutoScan
-    cd $TOOL_PATH
-    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${RED}[1]AutoScan${NC} > ${RED}[1]Install${NC}\n"
-    echo "> You ready?"
-    num1 0 "No"
-    num2 0 "Yes"
-    read -n 1 -s ANS
-    if [ ! -z "$ANS" ];then
-        if [ $ANS = "2" ];then
-            show_number 211 "AutoScan Install"
-            if ! which git ;then
-                printf "|${RED}  ####  Caution!  ####${NC}\n"
-                printf "|${WHITE}  git is not installed. Stop work.${NC}\n"
-                echo "└─Command > Back"
-                read
-            else
-                printf "+${BLUE}Install${NC}\n"
-                echo "|  Clone nmapAutomator..."
-                git clone https://github.com/21y4d/nmapAutomator.git nmapAutomator
-                sleep 1
-                if ! which ffuf ;then
-                    sudo apt update
-                    sudo apt install ffuf -y
-                    sleep 1
-                fi
-                if ! which gobuster ;then
-                    sudo apt update-alternatives
-                    sudo apt install gobuster -y
-                    sleep 1
-                fi
-                echo "└─Command > Complete"
-            fi
-            # finaly
-            cd ../../
-        else
-            :
-        fi
-    else
-        :
-    fi
-
-}
-
-function cmd_autoscan1(){
-    local TOOL="" OPTION="" SET_NUMBER=""
-    TOOL="AutoScan"
-    clear
-    figlet AutoScan
-    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${RED}[1]AutoScan${NC} > ${GREEN}[2]Scan${NC}\n"
-    if [ ! -e $AUTOSCAN_PATH/nmapAutomator.sh ];then
-        printf "|${RED}  ####  Caution!  ####${NC}\n"
-        printf "|${WHITE}  nmapAutomator.sh is not installed. Stop work.${NC}\n"
-        echo "└─Command > Back"
-        read
-    else
-        printf "+${RED}Command${NC}:\n"
-        printf "|  ${WHITE}nmapAutomator.sh${NC}  Auther:${WHITE}21y4d${NC}  https://github.com/21y4d/nmapAutomator\n"
-        echo "|"
-        printf "+${BLUE}Optional${NC}: [-r/--remote <REMOTE MODE>] [-d/--dns <DNS SERVER>] [-o/--output <OUTPUT DIRECTORY>]\n"
-        printf "|          [-s/--static-nmap <STATIC NMAP PATH>]\n"
-        echo "|"
-        printf "+${BLUE}Scan Types${NC}:\n"
-        printf "|   ${YELLOW}[1]Network${NC} : Shows all live hosts in the host's network (~15 seconds)\n"
-        printf "|   ${YELLOW}[2]Port${NC}    : Shows all open ports (~15 seconds)\n"
-        printf "|   ${YELLOW}[3]Script${NC}  : Runs a script scan on found ports (~5 minutes)\n"
-        printf "|   ${YELLOW}[4]Full${NC}    : Runs a full range port scan, then runs a script scan on new ports (~5-10 minutes)\n"
-        num1 0 "Network"
-        num2 0 "Port"
-        num3 0 "Script"
-        num4 0 "Full"
-        num0 0 "Next"
-        num9 0 "Back"
-        read -n 1 -s NUM
-        case $NUM in
-        1)
-            OPTION="Network"
-            SET_NUMBER=2121
-            ;;
-        2)
-            OPTION="Port"
-            SET_NUMBER=2122
-            ;;
-        3)
-            OPTION="Script"
-            SET_NUMBER=2123
-            ;;
-        4)
-            OPTION="Full"
-            SET_NUMBER=2124
-            ;;
-        0)
-            cmd_autoscan2
-            ;;
-        9)
-            menu_autoscan
-            ;;
-        *)
-            ;;
-        esac
-        cmd="$AUTOSCAN_PATH/nmapAutomator.sh -t $OPTION"
-        read -e -p "> Input Target: " TARGET
-        echo "|"
-        cmd="$cmd -H $TARGET -o result/$TARGET"
-        echo "└─Command > $cmd"
-        echo ""
-        echo "> You ready?"
-        num1 0 "No"
-        num2 0 "Yes"
-        read -n 1 -s ANS
-        if [ ! -z "$ANS" ];then
-            if [ $ANS = "2" ];then
-                show_number ${SET_NUMBER} "${TOOL} ${OPTION}"
-                tmux split-window -v
-                tmux send-keys "${cmd};read;exit" C-m
-                tmux select-pane -t "${TITLE}".0
-                # eval $cmd
-            else
-                :
-            fi
-        else
-            :
-        fi
-    fi
-}
-
-function cmd_autoscan2(){
-    local TOOL="" OPTION="" SET_NUMBER=""
-    TOOL="AutoScan"
-    clear
-    figlet AutoScan
-    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${RED}[1]AutoScan${NC} > ${GREEN}[2]Scan${NC}\n"
-    if [ ! -e $AUTOSCAN_PATH/nmapAutomator.sh ];then
-        printf "|${RED}  ####  Caution!  ####${NC}\n"
-        printf "|${WHITE}  nmapAutomator.sh is not installed. Stop work.${NC}\n"
-        echo "└─Command > Back"
-        read
-    else
-        printf "+${RED}Command${NC}:\n"
-        printf "|  ${WHITE}nmapAutomator.sh${NC}  Auther:${WHITE}21y4d${NC}  https://github.com/21y4d/nmapAutomator\n"
-        echo "|"
-        printf "+${BLUE}Optional${NC}: [-r/--remote <REMOTE MODE>] [-d/--dns <DNS SERVER>] [-o/--output <OUTPUT DIRECTORY>]\n"
-        printf "|          [-s/--static-nmap <STATIC NMAP PATH>]\n"
-        echo "|"
-        printf "+${BLUE}Scan Types${NC}:\n"
-        printf "|   ${YELLOW}[1]UDP${NC}     : Runs a UDP scan \"requires sudo\" (~5 minutes)\n"
-        printf "|   ${YELLOW}[2]Vulns${NC}   : Runs CVE scan and nmap Vulns scan on all found ports (~5-15 minutes)\n"
-        printf "|   ${YELLOW}[3]Recon${NC}   : Suggests recon commands, then prompts to automatically run them\n"
-        printf "|   ${YELLOW}[4]All${NC}     : Runs all the scans (~20-30 minutes)\n"
-        num1 0 "UDP"
-        num2 0 "Vulns"
-        num3 0 "Recon"
-        num4 0 "All"
-        num0 0 "Next"
-        num9 0 "Back"
-        read -n 1 -s NUM
-        case $NUM in
-        1)
-            OPTION="UDP"
-            SET_NUMBER=21201
-            ;;
-        2)
-            OPTION="Vulns"
-            SET_NUMBER=21202
-            ;;
-        3)
-            OPTION="Recon"
-            SET_NUMBER=21203
-            ;;
-        4)
-            OPTION="All"
-            SET_NUMBER=21204
-            ;;
-        0)
-            cmd_autoscan1
-            ;;
-        9)
-            menu_autoscan
-            ;;
-        *)
-            ;;
-        esac
-        cmd="$AUTOSCAN_PATH/nmapAutomator.sh -t $OPTION"
-        read -e -p "> Input Target: " TARGET
-        echo "|"
-        cmd="$cmd -H $TARGET -o result/$TARGET"
-        echo "└─Command > $cmd"
-        echo ""
-        echo "> You ready?"
-        num1 0 "No"
-        num2 0 "Yes"
-        read -n 1 -s ANS
-        if [ ! -z "$ANS" ];then
-            if [ $ANS = "2" ];then
-                show_number ${SET_NUMBER} "${TOOL} ${OPTION}"
-                tmux split-window -v
-                tmux send-keys "${cmd};read;exit" C-m
-                tmux select-pane -t "${TITLE}".0
-                # eval $cmd
-            else
-                :
-            fi
-        else
-            :
-        fi
-    fi
-}
\ No newline at end of file
diff --git a/modules/tools/21_kp_nmapautomator.sh b/modules/tools/21_kp_nmapautomator.sh
new file mode 100644
index 0000000..ff2d463
--- /dev/null
+++ b/modules/tools/21_kp_nmapautomator.sh
@@ -0,0 +1,169 @@
+#!/bin/bash
+
+source kp.conf
+source $MODULES_PATH/misc_module.sh
+
+function menu_nmapautomator(){
+    clear
+    figlet nmap Automator
+    num2 0 "Tools"
+    num1 3 "nmapAutomator"
+    num1 6 "Install"
+    num2 6 "Scan"
+    num9 6 "Back"
+    read -n 1 -s NUM
+    case $NUM in
+    1)
+        install_nmapautomator
+        ;;
+    2)
+        cmd_nmapautomator
+        ;;
+    9)
+        menu_tools
+        ;;
+    *)
+        ;;
+    esac
+}
+
+function install_nmapautomator(){
+    clear
+    figlet nmap Automator
+    cd $TOOL_PATH
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${RED}[1]nmapAutomator${NC} > ${RED}[1]Install${NC}\n"
+    echo "> You ready?"
+    num1 0 "No"
+    num2 0 "Yes"
+    read -n 1 -s ANS
+    if [ ! -z "$ANS" ];then
+        if [ $ANS = "2" ];then
+            show_number 211 "nmap Automator Install"
+            if ! which git ;then
+                printf "|${RED}  ####  Caution!  ####${NC}\n"
+                printf "|${WHITE}  git is not installed. Stop work.${NC}\n"
+                echo "└─Command > Back"
+                read
+            else
+                printf "+${BLUE}Install${NC}\n"
+                echo "|  Clone nmapAutomator..."
+                git clone https://github.com/21y4d/nmapAutomator.git nmapAutomator
+                sleep 1
+                if ! which ffuf ;then
+                    sudo apt update
+                    sudo apt install ffuf -y
+                    sleep 1
+                fi
+                if ! which gobuster ;then
+                    sudo apt update-alternatives
+                    sudo apt install gobuster -y
+                    sleep 1
+                fi
+                echo "└─Command > Complete"
+            fi
+            # finaly
+            cd ../../
+        else
+            :
+        fi
+    else
+        :
+    fi
+
+}
+
+function cmd_nmapautomator(){
+    local TOOL="" OPTION="" SET_NUMBER=""
+    TOOL="nmap Autoscan"
+    clear
+    figlet nmap Automator
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${RED}[1]nmapAutomator${NC} > ${GREEN}[2]Scan${NC}\n"
+    if [ ! -e $AUTOSCAN_PATH/nmapAutomator.sh ];then
+        printf "|${RED}  ####  Caution!  ####${NC}\n"
+        printf "|${WHITE}  nmapAutomator.sh is not installed. Stop work.${NC}\n"
+        echo "└─Command > Back"
+        read
+    else
+        printf "+${RED}Command${NC}:\n"
+        printf "|  ${WHITE}nmapAutomator.sh${NC}  Auther:${WHITE}21y4d${NC}  https://github.com/21y4d/nmapAutomator\n"
+        echo "|"
+        printf "+${BLUE}Optional${NC}: [-r/--remote <REMOTE MODE>] [-d/--dns <DNS SERVER>] [-o/--output <OUTPUT DIRECTORY>]\n"
+        printf "|          [-s/--static-nmap <STATIC NMAP PATH>]\n"
+        echo "|"
+        printf "+${BLUE}Scan Types${NC}:\n"
+        printf "|   ${YELLOW}[1]Network${NC}  : Shows all live hosts in the host's network (~15 seconds)\n"
+        printf "|   ${YELLOW}[2]Port${NC}     : Shows all open ports (~15 seconds)\n"
+        printf "|   ${YELLOW}[3]Script${NC}   : Runs a script scan on found ports (~5 minutes)\n"
+        printf "|   ${YELLOW}[4]Full${NC}     : Runs a full range port scan, then runs a script scan on new ports (~5-10 minutes)\n"
+        printf "|   ${YELLOW}[5]UDP${NC}      : Runs a UDP scan \"requires sudo\" (~5 minutes)\n"
+        printf "|   ${YELLOW}[6]Vulns${NC}    : Runs CVE scan and nmap Vulns scan on all found ports (~5-15 minutes)\n"
+        printf "|   ${YELLOW}[7]Recon${NC}    : Suggests recon commands, then prompts to automatically run them\n"
+        printf "|   ${YELLOW}[8]All${NC}      : Runs all the scans (~20-30 minutes)\n"
+        printf "|   ${WHITE}[9]Back${NC}\n"
+        printf "> Select ${YELLOW}1${NC}-${WHITE}9${NC}: "
+        read -n 1  NUM
+        case $NUM in
+        1)
+            OPTION="Network"
+            SET_NUMBER=2121
+            ;;
+        2)
+            OPTION="Port"
+            SET_NUMBER=2122
+            ;;
+        3)
+            OPTION="Script"
+            SET_NUMBER=2123
+            ;;
+        4)
+            OPTION="Full"
+            SET_NUMBER=2124
+            ;;
+        5)
+            OPTION="UDP"
+            SET_NUMBER=2125
+            ;;
+        6)
+            OPTION="Vulns"
+            SET_NUMBER=2126
+            ;;
+        7)
+            OPTION="Recon"
+            SET_NUMBER=2127
+            ;;
+        8)
+            OPTION="All"
+            SET_NUMBER=2128
+            ;;
+        9)
+            menu_nmapautomator
+            ;;
+        *)
+            ;;
+        esac
+        printf "\n"
+        cmd="$AUTOSCAN_PATH/nmapAutomator.sh -t $OPTION"
+        read -e -p "> Input Target: " TARGET
+        echo "|"
+        cmd="$cmd -H $TARGET -o result/$TARGET"
+        echo "└─Command > $cmd"
+        echo ""
+        echo "> You ready?"
+        num1 0 "No"
+        num2 0 "Yes"
+        read -n 1 -s ANS
+        if [ ! -z "$ANS" ];then
+            if [ $ANS = "2" ];then
+                show_number ${SET_NUMBER} "${TOOL} ${OPTION}"
+                tmux split-window -v
+                tmux send-keys "${cmd};read;exit" C-m
+                tmux select-pane -t "${TITLE}".0
+                # eval $cmd
+            else
+                :
+            fi
+        else
+            :
+        fi
+    fi
+}
diff --git a/modules/tools/22_kp_vulncheck.sh b/modules/tools/22_kp_vulncheck.sh
index 20fe6d6..badfa99 100644
--- a/modules/tools/22_kp_vulncheck.sh
+++ b/modules/tools/22_kp_vulncheck.sh
@@ -7,9 +7,9 @@ function menu_vulncheck(){
     clear
     figlet VulnCheck
     num2 0 " Tools"
-    num2 5 " VulnCheck"
-    num1 10 " Check"
-    num9 10 " Back"
+    num2 3 " VulnCheck"
+    num1 6 " Check"
+    num9 6 " Back"
     read -n 1 -s NUM
     case $NUM in
     1)
diff --git a/modules/tools/23_kp_gobuster.sh b/modules/tools/23_kp_gobuster.sh
new file mode 100644
index 0000000..0556b44
--- /dev/null
+++ b/modules/tools/23_kp_gobuster.sh
@@ -0,0 +1,253 @@
+#!/bin/bash
+
+source kp.conf
+source $MODULES_PATH/misc_module.sh
+
+function menu_gobuster() {
+    clear
+    figlet gobuster
+    num2 0 "Tools"
+    num3 3 "gobuster"
+    num1 6 "Install"
+    num2 6 "Directory Search"
+    num3 6 "Extension Search"
+    num4 6 "Filtering Status Codes"
+    num5 6 "Manual"
+    num9 6 "Back"
+    read -n 1 -s NUM
+    case $NUM in
+    1)
+        install_gobuster
+        ;;
+    2)
+        cmd_gobuster1
+        ;;
+    3)
+        cmd_gobuster2
+        ;;
+    9)
+        menu_tools
+        ;;
+    *)
+        ;;
+    esac
+}
+
+function install_gobuster() {
+    clear
+    figlet gobuster
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${YELLOW}[3]gobuster${NC} > ${RED}[1]Install${NC}\n"
+    echo ">Install gobuster. Are you ready?"
+    num1 0 "No"
+    num2 0 "Yes"
+    read -n 1 -s ANS
+    if [ ! -z "$ANS" ];then
+        if [ $ANS = "2" ];then
+            show_number 231 "gobuster Install"
+            if ! which gobuster ;then
+                sudo apt update
+                sudo apt install gobuster -y
+                sleep 1
+            fi
+            echo "└─Command > Complete"
+        else
+            :
+        fi
+    else
+        :
+    fi
+}
+
+function cmd_gobuster1(){
+    clear
+    figlet gobuster
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${YELLOW}[3]gobuster${NC} > ${GREEN}[2]Directory Search${NC}\n"
+    printf "+${BLUE}Available Commands:${NC}:\n"
+    printf "|  ${YELLOW}dir${NC}:                               Uses directory/file enumeration mode\n"
+    printf "+${BLUE}Flags:${NC}:\n"
+    printf "|  ${YELLOW}-u, --url string${NC}:                  The target URL\n"
+    printf "|  ${YELLOW}-w, --wordlist string${NC}:             Path to the wordlist\n"
+    read -p "> Enter Target URL: " TARGET
+    echo "|"
+    echo "> Select Wordlist"
+    printf "|  ${YELLOW}[1]/usr/share/dirb/wordlists/common.txt${NC} \n"
+    printf "|  ${YELLOW}[2]/usr/share/dirb/wordlists/big.txt${NC} \n"
+    printf "|  ${YELLOW}[3]/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt${NC} \n"
+    printf "|  ${YELLOW}[4]/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt${NC} \n"
+    read -p "> Select ${YELLOW}1${NC}-${YELLOW}4${NC}: " NUM
+    case $NUM in
+    1)
+        WORDLIST="/usr/share/dirb/wordlists/common.txt"
+        ;;
+    2)
+        WORDLIST="/usr/share/dirb/wordlists/big.txt"
+        ;;
+    3)
+        WORDLIST="/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt"
+        ;;
+    4)
+        WORDLIST="/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt"
+        ;;
+    *)
+        WORDLIST="/usr/share/dirb/wordlists/common.txt"
+        ;;
+    esac
+    echo "|"
+    cmd="gobuster dir -u $TARGET -w $WORDLIST"
+    printf "+${BLUE}usage${NC}: gobuster dir ${WHITE}[flags] ${NC}\n"
+    echo "└─Command > $cmd"
+    echo ""
+    echo "> You ready?"
+    num1 0 "No"
+    num2 0 "Yes"
+    read -n 1 -s ANS
+    if [ ! -z "$ANS" ];then
+        show_number 232 "gobuster Directory Search"
+        tmux split-window -v
+        tmux send-keys "${cmd};read;exit" C-m
+        tmux select-pane -t "${TITLE}".0
+
+        # eval $cmd
+    else
+        :
+    fi
+
+}
+
+function cmd_gobuster2(){
+    clear
+    figlet gobuster
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${YELLOW}[3]gobuster${NC} > ${YELLOW}[3]Extension Search${NC}\n"
+    printf "+${BLUE}Available Commands:${NC}:\n"
+    printf "|  ${YELLOW}dir${NC}:                               Uses directory/file enumeration mode\n"
+    printf "+${BLUE}Flags:${NC}:\n"
+    printf "|  ${YELLOW}-u, --url string${NC}:                  The target URL\n"
+    printf "|  ${YELLOW}-w, --wordlist string${NC}:             Path to the wordlist\n"
+    printf "|  ${YELLOW}-x, --extensions string${NC}:           File extension(s) to search for\n"
+    read -p "> Enter Target URL: " TARGET
+    echo "|"
+    echo "> Select Wordlist"
+    printf "|  ${YELLOW}[1]/usr/share/dirb/wordlists/common.txt${NC} \n"
+    printf "|  ${YELLOW}[2]/usr/share/dirb/wordlists/big.txt${NC} \n"
+    printf "|  ${YELLOW}[3]/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt${NC} \n"
+    printf "|  ${YELLOW}[4]/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt${NC} \n"
+    read -p "> Select ${YELLOW}1${NC}-${YELLOW}4${NC}: " NUM
+    case $NUM in
+    1)
+        WORDLIST="/usr/share/dirb/wordlists/common.txt"
+        ;;
+    2)
+        WORDLIST="/usr/share/dirb/wordlists/big.txt"
+        ;;
+    3)
+        WORDLIST="/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt"
+        ;;
+    4)
+        WORDLIST="/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt"
+        ;;
+    *)
+        WORDLIST="/usr/share/dirb/wordlists/common.txt"
+        ;;
+    esac
+    echo "|"
+    read -p "> Enter the extension. If multiple extensions are specified, separate them with commas:" EXTENSION
+    cmd="gobuster dir -u $TARGET -w $WORDLIST -x $EXTENSION"
+    printf "+${BLUE}usage${NC}: gobuster dir ${WHITE}[flags] ${NC}\n"
+    echo "└─Command > $cmd"
+    echo ""
+    echo "> You ready?"
+    num1 0 "No"
+    num2 0 "Yes"
+    read -n 1 -s ANS
+    if [ ! -z "$ANS" ];then
+        show_number 233 "gobuster Extension Search"
+        tmux split-window -v
+        tmux send-keys "${cmd};read;exit" C-m
+        tmux select-pane -t "${TITLE}".0
+
+        # eval $cmd
+    else
+        :
+    fi
+
+}
+
+function cmd_gobuster3(){
+    clear
+    figlet gobuster
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${YELLOW}[3]gobuster${NC} > ${BLUE}[4]Filtering Status Codes${NC}\n"
+    printf "+${BLUE}Available Commands:${NC}:\n"
+    printf "|  ${YELLOW}dir${NC}:                               Uses directory/file enumeration mode\n"
+    printf "+${BLUE}Flags:${NC}:\n"
+    printf "|  ${YELLOW}-u, --url string${NC}:                  The target URL\n"
+    printf "|  ${YELLOW}-w, --wordlist string${NC}:             Path to the wordlist\n"
+    printf "|  ${YELLOW}-s, --status-codes string${NC}:         Positive status codes (will be overwritten with status-codes-blacklist if set). Can also handle ranges like 200,300-400,404.\n"
+    read -p "> Enter Target URL: " TARGET
+    echo "|"
+    echo "> Select Wordlist"
+    printf "|  ${YELLOW}[1]/usr/share/dirb/wordlists/common.txt${NC} \n"
+    printf "|  ${YELLOW}[2]/usr/share/dirb/wordlists/big.txt${NC} \n"
+    printf "|  ${YELLOW}[3]/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt${NC} \n"
+    printf "|  ${YELLOW}[4]/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt${NC} \n"
+    read -p "> Select ${YELLOW}1${NC}-${YELLOW}4${NC}: " NUM
+    case $NUM in
+    1)
+        WORDLIST="/usr/share/dirb/wordlists/common.txt"
+        ;;
+    2)
+        WORDLIST="/usr/share/dirb/wordlists/big.txt"
+        ;;
+    3)
+        WORDLIST="/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt"
+        ;;
+    4)
+        WORDLIST="/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt"
+        ;;
+    *)
+        WORDLIST="/usr/share/dirb/wordlists/common.txt"
+        ;;
+    esac
+    echo "|"
+    read -p "> Enter the status code. See above.:" STATUSCODE
+    cmd="gobuster dir -u $TARGET -w $WORDLIST -s $STATUSCODE"
+    printf "+${BLUE}usage${NC}: gobuster dir ${WHITE}[flags] ${NC}\n"
+    echo "└─Command > $cmd"
+    echo ""
+    echo "> You ready?"
+    num1 0 "No"
+    num2 0 "Yes"
+    read -n 1 -s ANS
+    if [ ! -z "$ANS" ];then
+        show_number 234 "gobuster Filtering Status Codes"
+        tmux split-window -v
+        tmux send-keys "${cmd};read;exit" C-m
+        tmux select-pane -t "${TITLE}".0
+
+        # eval $cmd
+    else
+        :
+    fi
+
+}
+
+function cmd_gobuster4(){
+    clear
+    cmd="gobuster"
+    show_number 235 "gobuster Manual"
+    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${GREEN}[2]Tools${NC} > ${YELLOW}[3]gobuster${NC} > ${PURPLE}[5]Manual${NC}\n"
+    printf "+${BLUE}Available Commands:${NC}:\n"
+    printf "|  ${YELLOW}dir${NC}:                               Uses directory/file enumeration mode\n"
+    printf "+${BLUE}Flags:${NC}:\n"
+    printf "|  ${YELLOW}-u, --url string${NC}:                  The target URL\n"
+    printf "|  ${YELLOW}-w, --wordlist string${NC}:             Path to the wordlist\n"
+    printf "|  ${YELLOW}-x, --extensions string${NC}:           File extension(s) to search for\n"
+    printf "|  ${YELLOW}-s, --status-codes string${NC}:         Positive status codes (will be overwritten with status-codes-blacklist if set). Can also handle ranges like 200,300-400,404.\n"
+    printf "+ ${BLUE}Wordlist:${NC}:\n"
+    printf "|  ${YELLOW}[1]/usr/share/dirb/wordlists/common.txt${NC} \n"
+    printf "|  ${YELLOW}[2]/usr/share/dirb/wordlists/big.txt${NC} \n"
+    printf "|  ${YELLOW}[3]/usr/share/dirbuster/wordlists/directory-list-2.3-small.txt${NC} \n"
+    printf "|  ${YELLOW}[4]/usr/share/dirbuster/wordlists/directory-list-2.3-medium.txt${NC} \n"
+    printf "+${BLUE}usage${NC}: gobuster dir ${WHITE}[flags] ${NC}\n"
+    read -e -p "└─Command > " cmd
+    eval $cmd
+}
\ No newline at end of file
diff --git a/modules/tools/23_kp_result.sh b/modules/tools/23_kp_result.sh
deleted file mode 100644
index 7e49ea2..0000000
--- a/modules/tools/23_kp_result.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-source kp.conf
-source $MODULES_PATH/misc_module.sh
-
-function menu_result(){
-    clear
-	figlet Result
-    num4 0 "Result"
-    num1 5 "Show Result"
-    num9 5 "Back"
-    read -n 1 -s NUM
-	case $NUM in
-    1) show_result ;;
-    9) mainmenu ;;
-    *) ;;
-    esac
-
-}
-function show_result(){
-    clear
-    figlet Result
-    BASE=`pwd`
-    cd result
-    printf "┌─(${PURPLE}$TITLE${NC})${RED}${USERNAME}@${HOSTNAME}${NC}:${BLUE}[4]Result${NC} > ${RED}Show Result${NC}\n"
-    echo "|"
-    while :;do
-        PS3="└─Please Select one > "
-        select FILE in * "Exit" ;do
-        echo ""
-        break
-        done
-        printf "└─You selected was : ${YELLOW}${FILE}${NC}\n"
-        echo "|"
-        if [ ${FILE} = "Exit" ];then
-            break
-        elif [ -d ${FILE} ];then
-            cd ${FILE}
-        elif [ -f ${FILE} ];then
-            more ${FILE}
-            cd $BASE
-            break
-        fi
-    done
-}
diff --git a/modules/tools/toolsmenu.sh b/modules/tools/toolsmenu.sh
index c548103..c34882c 100644
--- a/modules/tools/toolsmenu.sh
+++ b/modules/tools/toolsmenu.sh
@@ -2,20 +2,20 @@
 
 source kp.conf
 source $MODULES_PATH/misc_module.sh
-source $TOOL_PATH/21_kp_autoscan.sh
+source $TOOL_PATH/21_kp_nmapautomator.sh
 source $TOOL_PATH/22_kp_vulncheck.sh
 
 
 function menu_tools(){
     clear
     figlet Tools
-    num2 0 " Tools"
-    num1 5 " AutoScan"
-    num2 5 " VulnCheck"
-    num9 5 " Main"
+    num2 0 "Tools"
+    num1 3 "AutoScan(nmapAutomator)"
+    num2 3 "VulnCheck"
+    num9 3 "Main"
     read -n 1 -s NUM
 	case $NUM in
-	1) menu_autoscan ;;
+	1) menu_nmapautomator ;;
     2) menu_vulncheck ;;
     9) mainmenu ;;
     *) ;;