diff --git a/dietpi/dietpi-cleaner b/dietpi/dietpi-cleaner
index 114ac4bb3e..3b9a0b0b4e 100644
--- a/dietpi/dietpi-cleaner
+++ b/dietpi/dietpi-cleaner
@@ -87,7 +87,7 @@
 
 					G_WHIP_MSG "$G_PROGRAM_NAME is a program that allows you to remove unwanted junk from your DietPi system, freeing up filesystem space in the process.\n
 Simply enable the cleaners you require, then select \"Test\" to see what will happen, without modifying your system.\nOnce your satisfied with the Test results, select \"Run\" to clean your system.\n
-Further information:\n - https://dietpi.com/phpbb/viewtopic.php?p=623#p623"
+Further information:\n - https://dietpi.com/docs/dietpi_tools/#dietpi-cleaner"
 
 				;;
 
diff --git a/dietpi/dietpi-drive_manager b/dietpi/dietpi-drive_manager
index 971f5af5fb..39ca513f5c 100644
--- a/dietpi/dietpi-drive_manager
+++ b/dietpi/dietpi-drive_manager
@@ -982,7 +982,7 @@ Do you wish to ignore this warning, and, mount the drive regardless?" || return
 
 		if (( $1 == 0 )); then
 
-			G_WHIP_MSG "[FAILED]\n\nYour DietPi userdata is currently located on this drive:\n - $FP_USERDATA_CURRENT\n\nThe requested option for this drive is not currently possible.\n\nPlease move your userdata elsewhere, before trying again:\nhttps://dietpi.com/phpbb/viewtopic.php?t=478"
+			G_WHIP_MSG "[FAILED]\n\nYour DietPi userdata is currently located on this drive:\n - $FP_USERDATA_CURRENT\n\nThe requested option for this drive is not currently possible.\n\nPlease move your userdata elsewhere, before trying again:\nhttps://dietpi.com/docs/dietpi_tools/#quick-selections"
 
 		elif (( $1 == 1 )); then
 
@@ -1626,7 +1626,7 @@ NB: If you are planning to dedicate the drive to this system, it is recommended
 
 				G_WHIP_DEFAULT_ITEM=$FORMAT_FILESYSTEM_TYPE
 				if G_WHIP_MENU 'Please select a filesystem type for this format:\n\nEXT4:\nHighly recommended if you plan to use this drive solely on this system (dedicated drive).\n
-NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU usage during transfers.\n\nFull list of different filesystem types:\nhttps://dietpi.com/phpbb/viewtopic.php?p=2898#p2898'; then
+NTFS:\nRecommended if you plan to use this drive on a Windows system. High CPU usage during transfers.\n\nFull list of different filesystem types:\nhttps://dietpi.com/docs/dietpi_tools/#dietpi-drive-manager'; then
 
 					# Install FS pre-reqs
 					# - NTFS
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 518d7a714c..f4655ab30a 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -17236,7 +17236,7 @@ We allow it to take up to 30 minutes, it's process can be followed, please be pa
 
 					G_WHIP_DEFAULT_ITEM=$index_webserver_text
 					G_WHIP_BUTTON_CANCEL_TEXT='Back'
-					if G_WHIP_MENU 'Please select a Webserver preference, more info https://dietpi.com/docs/dietpi_tools/#quick-selections:
+					if G_WHIP_MENU 'Please select a Webserver preference, more info https://dietpi.com/docs/software/webserver_stack/#stacks-for-web-development:
 \n- Apache2: Feature-rich and popular. Recommended for beginners and users who are looking to follow Apache2 based guides.
 \n- Nginx: Lightweight alternative to Apache2. Nginx claims faster webserver performance compared to Apache2.
 \n- Lighttpd: Extremely lightweight and is generally considered to offer the \"best\" webserver performance for SBCs. Recommended for users who expect low webserver traffic.'; then
@@ -17328,7 +17328,7 @@ Welcome to DietPi:
 Use PageUp/Down or Arrow Up/Down to scroll this help screen.
 Press ESC, or TAB then ENTER to exit this help screen.\n
 Easy to follow, step by step guides for installing DietPi:
-https://dietpi.com/docs/user-guide_installation/\n
+https://dietpi.com/docs/getting_started/\n
 For a list of all installation options and their details:
 https://dietpi.com/docs/dietpi_optimised_software/\n
 ───────────────────────────────────────────────────────────────
diff --git a/dietpi/dietpi-survey b/dietpi/dietpi-survey
index db29e30408..af3dd16b14 100644
--- a/dietpi/dietpi-survey
+++ b/dietpi/dietpi-survey
@@ -15,7 +15,7 @@
 	# - Runs after every dietpi-update and dietpi-software install, if user opted in
 	# - Summary can be visited at: https://dietpi.com/survey/
 	# - Allows the DietPi project to focus development based on popularity
-	# - Further info: https://dietpi.com/docs/dietpi_tools/#miscellaneous (see tab 'DietPi Survey')
+	# - Further info: https://dietpi.com/docs/dietpi_tools/#dietpi-survey
 	#
 	# Usage:
 	# - /boot/dietpi/dietpi-survey		Interactive menu to opt in or out
diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index 0d0922b596..071a96ff2e 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -1701,7 +1701,7 @@ $log_content" || break # Exit error handler menu loop on cancel
 
 		[[ $G_PROMPT_BACKUP_DISABLED == 1 ]] && return 0
 
-		G_WHIP_YESNO 'Would you like to create (or update) a "DietPi-Backup" of the system, before proceeding?\n\n"DietPi-Backup" creates a system restore point, which can be recovered if unexpected issues occur.\n\nFor more information on "DietPi-Backup", please use the link below:\n - https://dietpi.com/phpbb/viewtopic.php?p=255#p255' || return 0
+		G_WHIP_YESNO 'Would you like to create (or update) a "DietPi-Backup" of the system, before proceeding?\n\n"DietPi-Backup" creates a system restore point, which can be recovered if unexpected issues occur.\n\nFor more information on "DietPi-Backup", please use the link below:\n - https://dietpi.com/docs/dietpi_tools/#dietpi-backup-backuprestore' || return 0
 
 		/boot/dietpi/dietpi-backup 1
 		local exit_code=$?