diff --git a/advanced/Scripts/speedtestmod/mod.sh b/advanced/Scripts/speedtestmod/mod.sh
new file mode 100644
index 0000000000..63159cd4f1
--- /dev/null
+++ b/advanced/Scripts/speedtestmod/mod.sh
@@ -0,0 +1,311 @@
+#!/bin/bash
+LOG_FILE="/var/log/pimod.log"
+
+admin_dir=/var/www/html
+curr_wp=/opt/pihole/webpage.sh
+last_wp=$curr_wp.old
+org_wp=$curr_wp.org
+
+curr_db=/etc/pihole/speedtest.db
+last_db=$curr_db.old
+db_table="speedtest"
+create_table="create table if not exists $db_table (
+id integer primary key autoincrement,
+start_time integer,
+stop_time text,
+from_server text,
+from_ip text,
+server text,
+server_dist real,
+server_ping real,
+download real,
+upload real,
+share_url text
+);"
+
+help() {
+    echo "(Re)install Latest Speedtest Mod."
+    echo "Usage: sudo $0 [up] [un] [db]"
+    echo "up - update Pi-hole (along with the Mod)"
+    echo "un - remove the mod (including all backups)"
+    echo "db - flush database (restore for a short while after)"
+    echo "If no option is specified, the Mod will be (re)installed."
+}
+
+setTags() {
+    local path=${1-}
+    local name=${2-}
+    if [ ! -z "$path" ]; then
+        cd "$path"
+        git fetch origin -q
+        git fetch --tags -f -q
+        latestTag=$(git describe --tags $(git rev-list --tags --max-count=1))
+    fi
+    if [ ! -z "$name" ]; then
+        localTag=$(pihole -v | grep "$name" | cut -d ' ' -f 6)
+        [ "$localTag" == "HEAD" ] && localTag=$(pihole -v | grep "$name" | cut -d ' ' -f 7)
+    fi
+}
+
+download() {
+    local path=$1
+    local name=$2
+    local url=$3
+    local src=${4-}
+    local branch=${5-master}
+    local dest=$path/$name
+    if [ ! -d $dest ]; then # replicate
+        cd "$path"
+        rm -rf "$name"
+        git clone --depth=1 -b "$branch" "$url" "$name"
+        setTags "$name" "$src"
+        if [ ! -z "$src" ]; then
+            if [[ "$localTag" == *.* ]] && [[ "$localTag" < "$latestTag" ]]; then
+                latestTag=$localTag
+                git fetch --unshallow
+            fi
+        fi
+    else # replace
+        setTags $dest
+        if [ ! -z "$src" ]; then
+            if [ "$url" != "old" ]; then
+                git config --global --add safe.directory "$dest"
+                git remote -v | grep -q "old" || git remote rename origin old
+                git remote -v | grep -q "origin" && git remote remove origin
+                git remote add origin $url
+            else
+                git remote remove origin
+                git remote rename old origin
+            fi
+            git fetch origin -q
+        fi
+        git reset --hard origin/$branch
+    fi
+
+    git -c advice.detachedHead=false checkout $latestTag
+    cd ..
+}
+
+isEmpty() {
+    db=$1
+    if [ -f $db ]; then
+        if ! sqlite3 "$db" "select * from $db_table limit 1;" >/dev/null 2>&1 || [ -z "$(sqlite3 "$db" "select * from $db_table limit 1;")" ]; then
+            return 0
+        fi
+    fi
+    return 1
+}
+
+manageHistory() {
+    if [ "${1-}" == "db" ]; then
+        if [ -f $curr_db ] && ! isEmpty $curr_db; then
+            if [ -z "${2-}" ]; then
+                echo "Flushing Database..."
+                mv -f $curr_db $last_db
+            fi
+        elif [ -f $last_db ]; then
+            echo "Restoring Database..."
+            mv -f $last_db $curr_db
+        fi
+        echo "Configuring Database..."
+        sqlite3 "$curr_db" "$create_table"
+    fi
+}
+
+notInstalled() {
+    apt-cache policy "$1" | grep 'Installed: (none)' >/dev/null
+}
+
+install() {
+    echo "Installing Mod..."
+
+    if [ ! -f /usr/local/bin/pihole ]; then
+        echo "Installing Pi-hole..."
+        curl -sSL https://install.pi-hole.net | sudo bash
+    fi
+
+    if [ ! -f /etc/apt/sources.list.d/ookla_speedtest-cli.list ]; then
+        echo "Adding speedtest source..."
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            local base="ubuntu debian"
+            local os=${ID}
+            local dist=${VERSION_CODENAME}
+            if [ ! -z "${ID_LIKE-}" ] && [[ "${base//\"/}" =~ "${ID_LIKE//\"/}" ]] && [ "${os}" != "ubuntu" ]; then
+                os=${ID_LIKE%% *}
+                [ -z "${UBUNTU_CODENAME-}" ] && UBUNTU_CODENAME=$(/usr/bin/lsb_release -cs)
+                dist=${UBUNTU_CODENAME}
+                [ -z "$dist" ] && dist=${VERSION_CODENAME}
+            fi
+            wget -O /tmp/script.deb.sh https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh >/dev/null 2>&1
+            chmod +x /tmp/script.deb.sh
+            os=$os dist=$dist /tmp/script.deb.sh
+            rm -f /tmp/script.deb.sh
+        else
+            curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
+        fi
+    fi
+
+    local PHP_VERSION=$(php -v | head -n 1 | awk '{print $2}' | cut -d "." -f 1,2)
+    local packages="bc sqlite3 php${PHP_VERSION}-sqlite3 jq"
+
+    local missing_packages=""
+    for package in $packages; do
+        if notInstalled "$package"; then
+            missing_packages="$missing_packages $package"
+        fi
+    done
+    if notInstalled speedtest && notInstalled speedtest-cli; then
+        missing_packages="$missing_packages speedtest"
+    fi
+    missing_packages=$(echo "$missing_packages" | xargs)
+    if [ ! -z "${missing_packages}" ]; then
+        apt-get install -y $missing_packages
+    fi
+    if [ -f /usr/local/bin/speedtest ]; then
+        rm -f /usr/local/bin/speedtest
+        ln -s /usr/bin/speedtest /usr/local/bin/speedtest
+    fi
+
+    download /opt mod_pihole https://github.com/arevindh/pi-hole
+    download /var/www/html admin https://github.com/arevindh/AdminLTE web
+    if [ -f $curr_wp ]; then
+        if ! cat $curr_wp | grep -q SpeedTest; then
+            cp -a $curr_wp $org_wp
+        fi
+        if [ ! -f $last_wp ]; then
+            cp -a $curr_wp $last_wp
+        fi
+    fi
+    cp -a /opt/mod_pihole/advanced/Scripts/webpage.sh $curr_wp
+    cp -a /opt/mod_pihole/advanced/Scripts/speedtestmod /opt/pihole/speedtestmod
+    chmod +x $curr_wp
+    manageHistory db .
+    pihole -a -s
+    pihole updatechecker local
+}
+
+uninstall() {
+    if [ -f $curr_wp ] && cat $curr_wp | grep -q SpeedTest; then
+        echo "Restoring Pi-hole..."
+
+        if [ ! -f $org_wp ]; then
+            if [ ! -d /opt/org_pihole ]; then
+                download /opt org_pihole https://github.com/pi-hole/pi-hole Pi-hole
+            fi
+            cd /opt
+            cp -a org_pihole/advanced/Scripts/webpage.sh $org_wp
+            rm -rf org_pihole
+        fi
+
+        pihole -a -su
+        download /var/www/html admin https://github.com/pi-hole/AdminLTE web
+        if [ ! -f $last_wp ]; then
+            cp -a $curr_wp $last_wp
+        fi
+        cp -a $org_wp $curr_wp
+        chmod +x $curr_wp
+    fi
+
+    manageHistory ${1-}
+}
+
+purge() {
+    rm -rf "$admin_dir"*_admin
+    rm -rf /opt/mod_pihole
+    if [ -f /etc/systemd/system/pihole-speedtest.timer ]; then
+        rm -f /etc/systemd/system/pihole-speedtest.service
+        rm -f /etc/systemd/system/pihole-speedtest.timer
+        systemctl daemon-reload
+    fi
+
+    rm -f "$curr_wp".*
+    rm -f "$curr_db".*
+    rm -f "$curr_db"_*
+    if isEmpty $curr_db; then
+        rm -f $curr_db
+    fi
+}
+
+update() {
+    echo "Updating Pi-hole..."
+    PIHOLE_SKIP_OS_CHECK=true sudo -E pihole -up
+    if [ "${1-}" == "un" ]; then
+        purge
+        exit 0
+    fi
+}
+
+abort() {
+    echo "Process Aborting..."
+
+    if [ -f $last_wp ]; then
+        cp -a $last_wp $curr_wp
+        chmod +x $curr_wp
+        rm -f $last_wp
+    fi
+    if [ -f $last_db ] && [ ! -f $curr_db ]; then
+        mv $last_db $curr_db
+    fi
+    if [ ! -f $curr_wp ] || ! cat $curr_wp | grep -q SpeedTest; then
+        purge
+    fi
+    if [ -d $admin_dir/admin/.git/refs/remotes/old ]; then
+        download $admin_dir admin old web
+    fi
+
+    if (($aborted == 0)); then
+        pihole restartdns
+        printf "Please try again or try manually.\n\n$(date)\n"
+    fi
+    aborted=1
+    exit 1
+}
+
+commit() {
+    cd $admin_dir/admin
+    git remote -v | grep -q "old" && git remote remove old
+    rm -f $last_wp
+    pihole restartdns
+    printf "Done!\n\n$(date)\n"
+    exit 0
+}
+
+main() {
+    printf "Thanks for using Speedtest Mod!\nScript by @ipitio\n\n$(date)\n\n"
+    local op=${1-}
+    if [ "$op" == "-h" ] || [ "$op" == "--help" ]; then
+        help
+        exit 0
+    fi
+    if [ $EUID != 0 ]; then
+        sudo "$0" "$@"
+        exit $?
+    fi
+    aborted=0
+    set -Eeuo pipefail
+    trap '[ "$?" -eq "0" ] && commit || abort' EXIT
+    trap 'abort' INT TERM
+
+    local db=$([ "$op" == "up" ] && echo "${3-}" || [ "$op" == "un" ] && echo "${2-}" || echo "$op")
+    case $op in
+    db)
+        manageHistory $db
+        ;;
+    un)
+        uninstall $db
+        purge
+        ;;
+    up)
+        uninstall $db
+        update ${2-}
+        install
+        ;;
+    *)
+        install
+        ;;
+    esac
+    exit 0
+}
+
+main "$@" 2>&1 | sudo tee -- "$LOG_FILE"
diff --git a/advanced/Scripts/speedtestmod/speedtest.sh b/advanced/Scripts/speedtestmod/speedtest.sh
new file mode 100755
index 0000000000..fddea98b64
--- /dev/null
+++ b/advanced/Scripts/speedtestmod/speedtest.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+FILE=/tmp/speedtest.log
+readonly setupVars="/etc/pihole/setupVars.conf"
+serverid=$(grep 'SPEEDTEST_SERVER' ${setupVars} | cut -d '=' -f2)
+start=$(date +"%Y-%m-%d %H:%M:%S %Z")
+
+speedtest() {
+    if grep -q official <<< "$(/usr/bin/speedtest --version)"; then
+        if [[ -z "${serverid}" ]]; then
+            /usr/bin/speedtest --accept-gdpr --accept-license -f json-pretty
+        else
+            /usr/bin/speedtest -s $serverid --accept-gdpr --accept-license -f json-pretty
+        fi
+    else
+        if [[ -z "${serverid}" ]]; then
+            /usr/bin/speedtest --json --share --secure
+        else
+            /usr/bin/speedtest -s $serverid --json --share --secure
+        fi
+    fi
+}
+
+internet() {
+    stop=$(date +"%Y-%m-%d %H:%M:%S %Z")
+    res="$(<$FILE)"
+    server_name=$(jq -r '.server.name' <<< "$res")
+    server_dist=0
+
+    if grep -q official <<< "$(/usr/bin/speedtest --version)"; then
+        download=$(jq -r '.download.bandwidth' <<< "$res" | awk '{$1=$1*8/1000/1000; print $1;}' | sed 's/,/./g')
+        upload=$(jq -r '.upload.bandwidth' <<< "$res" | awk '{$1=$1*8/1000/1000; print $1;}' | sed 's/,/./g')
+        isp=$(jq -r '.isp' <<< "$res")
+        server_ip=$(jq -r '.server.ip' <<< "$res")
+        from_ip=$(jq -r '.interface.externalIp' <<< "$res")
+        server_ping=$(jq -r '.ping.latency' <<< "$res")
+        share_url=$(jq -r '.result.url' <<< "$res")
+    else
+        download=$(jq -r '.download' <<< "$res" | awk '{$1=$1/1000/1000; print $1;}' | sed 's/,/./g')
+        upload=$(jq -r '.upload' <<< "$res" | awk '{$1=$1/1000/1000; print $1;}' | sed 's/,/./g')
+        isp=$(jq -r '.client.isp' <<< "$res")
+        server_ip=$(jq -r '.server.host' <<< "$res")
+        from_ip=$(jq -r '.client.ip' <<< "$res")
+        server_ping=$(jq -r '.ping' <<< "$res")
+        share_url=$(jq -r '.share' <<< "$res")
+    fi
+
+    sep="\t"
+    quote=""
+    opts=
+    sep="$quote$sep$quote"
+    printf "$quote$start$sep$stop$sep$isp$sep$from_ip$sep$server_name$sep$server_dist$sep$server_ping$sep$download$sep$upload$sep$share_url$quote\n"
+    sqlite3 /etc/pihole/speedtest.db "insert into speedtest values (NULL, '${start}', '${stop}', '${isp}', '${from_ip}', '${server_name}', ${server_dist}, ${server_ping}, ${download}, ${upload}, '${share_url}');"
+    exit 0
+}
+
+nointernet(){
+    stop=$(date +"%Y-%m-%d %H:%M:%S %Z")
+    echo "No Internet"
+    sqlite3 /etc/pihole/speedtest.db "insert into speedtest values (NULL, '${start}', '${stop}', 'No Internet', '-', '-', 0, 0, 0, 0, '#');"
+    exit 1
+}
+
+tryagain(){
+    if apt-cache policy speedtest-cli | grep -q 'Installed: (none)'; then
+        apt-get install -y speedtest-cli speedtest-
+    else
+        apt-get install -y speedtest speedtest-cli-
+    fi
+    speedtest > "$FILE" && internet || nointernet
+}
+
+main() {
+    if [ $EUID != 0 ]; then
+        sudo "$0" "$@"
+        exit $?
+    fi
+    echo "Test has been initiated, please wait."
+    speedtest > "$FILE" && internet || tryagain
+}
+
+main
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 240a0578bd..35eff76b39 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -19,11 +19,12 @@ readonly FTLconf="/etc/pihole/pihole-FTL.conf"
 readonly dhcpstaticconfig="/etc/dnsmasq.d/04-pihole-static-dhcp.conf"
 readonly dnscustomfile="/etc/pihole/custom.list"
 readonly dnscustomcnamefile="/etc/dnsmasq.d/05-pihole-custom-cname.conf"
-readonly speedtestfile="/var/www/html/admin/scripts/pi-hole/speedtest/speedtest.sh"
-readonly speedtestdb="/etc/pihole/speedtest.db"
-
 readonly gravityDBfile="/etc/pihole/gravity.db"
 
+# speedtest mod
+readonly speedtestmod="/opt/pihole/speedtestmod/mod.sh"
+readonly speedtestfile="/opt/pihole/speedtestmod/speedtest.sh"
+readonly speedtestdb="/etc/pihole/speedtest.db"
 
 readonly setupVars="/etc/pihole/setupVars.conf"
 readonly PI_HOLE_BIN_DIR="/usr/local/bin"
@@ -610,7 +611,7 @@ After=network.target
 [Service]
 User=root
 Type=oneshot
-ExecStart=/var/www/html/admin/scripts/pi-hole/speedtest/speedtest.sh
+ExecStart=/opt/pihole/speedtestmod/speedtest.sh
 
 [Install]
 WantedBy=multi-user.target
@@ -684,40 +685,35 @@ RunSpeedtestNow() {
     if ! command -v tmux &> /dev/null; then
         apt-get install tmux -y
     fi
-    testscript="/var/www/html/admin/scripts/pi-hole/speedtest/speedtest.sh"
-    tmux new-session -d -s pimod "cat $testscript | sudo bash"
+    tmux new-session -d -s pimod "cat $speedtestfile | sudo bash"
 }
 
 ReinstallSpeedTest() {
     if ! command -v tmux &> /dev/null; then
         apt-get install tmux -y
     fi
-    modscript="/var/www/html/admin/scripts/pi-hole/speedtest/mod.sh"
-    tmux new-session -d -s pimod "cat $modscript | sudo bash"
+    tmux new-session -d -s pimod "cat $speedtestmod | sudo bash"
 }
 
 UpdateSpeedTest() {
     if ! command -v tmux &> /dev/null; then
         apt-get install tmux -y
     fi
-    modscript="/var/www/html/admin/scripts/pi-hole/speedtest/mod.sh"
-    tmux new-session -d -s pimod "cat $modscript | sudo bash -s -- up ${args[2]} ${args[3]}"
+    tmux new-session -d -s pimod "cat $speedtestmod | sudo bash -s -- up ${args[2]} ${args[3]}"
 }
 
 UninstallSpeedTest() {
     if ! command -v tmux &> /dev/null; then
         apt-get install tmux -y
     fi
-    modscript="/var/www/html/admin/scripts/pi-hole/speedtest/mod.sh"
-    tmux new-session -d -s pimod "cat $modscript | sudo bash -s -- un ${args[2]}"
+    tmux new-session -d -s pimod "cat $speedtestmod | sudo bash -s -- un ${args[2]}"
 }
 
 ClearSpeedtestData() {
     if ! command -v tmux &> /dev/null; then
         apt-get install tmux -y
     fi
-    modscript="/var/www/html/admin/scripts/pi-hole/speedtest/mod.sh"
-    tmux new-session -d -s pimod "cat $modscript | sudo bash -s -- db"
+    tmux new-session -d -s pimod "cat $speedtestmod | sudo bash -s -- db"
 }
 
 SetWebUITheme() {