diff --git a/.editorconfig b/.editorconfig
index e5626a07..ee415d1f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = tab
-tab_width = 2
+tab_width = 4
 charset = utf-8
 trim_trailing_whitespace = true
 
diff --git a/.gitignore b/.gitignore
index 73f14ae3..1e80dfb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,11 @@
 *.swp
 __pycache__
 .cache
+.pytest_cache
+.tox
+.eggs
+*.egg-info
+
 
 # Created by https://www.gitignore.io/api/jetbrains+iml
 
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7704aeaa..79a710fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,11 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="OTHER_INDENT_OPTIONS">
-      <value>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </value>
-    </option>
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
diff --git a/.travis.yml b/.travis.yml
index 2ca3b2d2..fa525e01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,6 @@ python:
 install:
   - pip install -r requirements.txt
 
-script: py.test -vv
+script:
+  # tox.ini handles setup, ordering of docker build first, and then run tests
+  - tox
diff --git a/README.md b/README.md
index 60c54f87..77f259e6 100644
--- a/README.md
+++ b/README.md
@@ -68,12 +68,11 @@ Sending a donation using our links below is **extremely helpful** in offsetting
 
 ### Alternative support
 If you'd rather not [donate](https://pi-hole.net/donate/) (_which is okay!_), there are other ways you can help support us:
-
+- [Patreon](https://patreon.com/pihole) _Become a patron for rewards_
 - [Digital Ocean](http://www.digitalocean.com/?refcode=344d234950e1) _affiliate link_
 - [UNIXstickers.com](http://unixstickers.refr.cc/jacobs) _save $5 when you spend $9 using our affiliate link_
 - [Pi-hole Swag Store](https://pi-hole.net/shop/) _affiliate link_
 - [Amazon](http://www.amazon.com/exec/obidos/redirect-home/pihole09-20) _affiliate link_
-- [Ho-ost](https://clients.ho-ost.com/aff.php?aff=19) _save 50% with our affiliate link_
 - [DNS Made Easy](https://cp.dnsmadeeasy.com/u/133706) _affiliate link_
 - [Vultr](http://www.vultr.com/?ref=7190426) _affiliate link_
 - Spreading the word about our software, and how you have benefited from it
@@ -99,9 +98,6 @@ While we are primarily reachable on our <a href="https://discourse.pi-hole.net/"
   <li><a href="https://discourse.pi-hole.net/c/faqs">Frequently Asked Questions</a></li>
   <li><a href="https://github.com/pi-hole/pi-hole/wiki">Pi-hole Wiki</a></li>
   <li><a href="https://discourse.pi-hole.net/c/feature-requests?order=votes">Feature Requests</a></li>
-</ul>
-<br/>
-<ul>
   <li><a href="https://discourse.pi-hole.net/">Discourse User Forum</a></li>
   <li><a href="https://www.reddit.com/r/pihole/">Reddit</a></li>
   <li><a href="https://gitter.im/pi-hole/pi-hole">Gitter</a> (Real-time chat)</li>
@@ -178,32 +174,13 @@ Pi-hole being a **advertising-aware DNS/Web server**, makes use of the following
 * [AdminLTE Dashboard](https://github.com/almasaeed2010/AdminLTE) - premium admin control panel based on Bootstrap 3.x
 
 While quite outdated at this point, [this original blog post about Pi-hole](https://jacobsalmela.com/2015/06/16/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0/) goes into **great detail** about how Pi-hole was originally setup and how it works. Syntactically, it's no longer accurate, but the same basic principles and logic still apply to Pi-hole's current state.
-
------
-
-## Pi-hole Projects
-- [The Big Blocklist Collection](https://wally3k.github.io)
-- [Docker Pi-hole container (x86 and ARM)](https://hub.docker.com/r/diginc/pi-hole/)
-- [Pi-Hole in the cloud](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
-- [Pie in the Sky-Hole [A Pi-Hole in the cloud for ad-blocking via DNS]](https://dlaa.me/blog/post/skyhole)
-- [Pi-hole Enable/Disable Button](http://thetimmy.silvernight.org/pages/endisbutton/)
-- [Minibian Pi-hole](https://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole)
-- [CHiP-hole: Network-wide Ad-blocker](https://www.hackster.io/jacobsalmela/chip-hole-network-wide-ad-blocker-98e037)
-- [Chrome Extension: Pi-Hole List Editor](https://chrome.google.com/webstore/detail/pi-hole-list-editor/hlnoeoejkllgkjbnnnhfolapllcnaglh) ([Source Code](https://github.com/packtloss/pihole-extension))
-- [Splunk: Pi-hole Visualiser](https://splunkbase.splunk.com/app/3023/)
-- [Adblocking with Pi-hole and Ubuntu 14.04 on VirtualBox](https://hbalagtas.blogspot.com.au/2016/02/adblocking-with-pi-hole-and-ubuntu-1404.html)
-- [Pi-hole stats in your Mac's menu bar](https://getbitbar.com/plugins/Network/pi-hole.1m.py)
-- [Pi-hole unRAID Template](https://forums.lime-technology.com/topic/36810-support-spants-nodered-mqtt-dashing-couchdb/)
-- [Copernicus: Windows Tray Application](https://github.com/goldbattle/copernicus)
-- [Let your blink1 device blink when Pi-hole filters ads](https://gist.github.com/elpatron68/ec0b4c582e5abf604885ac1e068d233f)
-- [Pi-hole metrics](https://github.com/nlamirault/pihole_exporter) exporter for [Prometheus](https://prometheus.io/)
-- [Magic Mirror with DNS Filtering](https://zonksec.com/blog/magic-mirror-dns-filtering/#dnssoftware)
-- [Pi-hole Droid: Android client](https://github.com/friimaind/pi-hole-droid)
-- [Windows DNS Swapper](https://github.com/roots84/DNS-Swapper), see [#1400](https://github.com/pi-hole/pi-hole/issues/1400)
-- [Pi-hole Visualizer](https://www.reddit.com/r/pihole/comments/82ikgb/pihole_visualizer_update/)
 -----
 
 ## Coverage
+- [Software Engineering Daily: Interview with the creator of Pi-hole](https://softwareengineeringdaily.com/2018/05/29/pi-hole-ad-blocker-hardware-with-jacob-salmela/)
+- [Bloomberg Business Week: Brotherhood of the Ad blockers](https://www.bloomberg.com/news/features/2018-05-10/inside-the-brotherhood-of-pi-hole-ad-blockers)
+- [Securing DNS across all of my devices with Pi-Hole + DNS-over-HTTPS + 1.1.1.1](https://scotthelme.co.uk/securing-dns-across-all-of-my-devices-with-pihole-dns-over-https-1-1-1-1/)
+- [Adafruit: installing Pi-hole on a Pi Zero W](https://learn.adafruit.com/pi-hole-ad-blocker-with-pi-zero-w/install-pi-hole)
 - [Lifehacker: Turn A Raspberry Pi Into An Ad Blocker With A Single Command](https://www.lifehacker.com.au/2015/02/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-command/)
 - [MakeUseOf: Adblock Everywhere: The Raspberry Pi-Hole Way](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
 - [Catchpoint: Ad-Blocking on Apple iOS9: Valuing the End User Experience](http://blog.catchpoint.com/2015/09/14/ad-blocking-apple/)
@@ -222,3 +199,12 @@ While quite outdated at this point, [this original blog post about Pi-hole](http
 - [CryptoAUSTRALIA: How We Tried 5 Privacy Focused Raspberry Pi Projects](https://blog.cryptoaustralia.org.au/2017/10/05/5-privacy-focused-raspberry-pi-projects/)
 - [CryptoAUSTRALIA: Pi-hole Workshop](https://blog.cryptoaustralia.org.au/2017/11/02/pi-hole-network-wide-ad-blocker/)
 - [Know How 355: Killing ads with a Raspberry Pi-Hole!](https://www.twit.tv/shows/know-how/episodes/355)
+
+-----
+
+## Pi-hole Projects
+- [The Big Blocklist Collection](https://wally3k.github.io)
+- [Pie in the Sky-Hole](https://dlaa.me/blog/post/skyhole)
+- [Copernicus: Windows Tray Application](https://github.com/goldbattle/copernicus)
+- [Magic Mirror with DNS Filtering](https://zonksec.com/blog/magic-mirror-dns-filtering/#dnssoftware)
+- [Windows DNS Swapper](https://github.com/roots84/DNS-Swapper)
diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh
index 1d96ea3c..b7a24ec0 100755
--- a/advanced/Scripts/list.sh
+++ b/advanced/Scripts/list.sh
@@ -13,10 +13,11 @@ basename=pihole
 piholeDir=/etc/"${basename}"
 whitelist="${piholeDir}"/whitelist.txt
 blacklist="${piholeDir}"/blacklist.txt
-readonly wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
+readonly regexlist="/etc/pihole/regex.list"
 reload=false
 addmode=true
 verbose=true
+wildcard=false
 
 domList=()
 
@@ -31,9 +32,12 @@ helpFunc() {
   if [[ "${listMain}" == "${whitelist}" ]]; then
     param="w"
     type="white"
-  elif [[ "${listMain}" == "${wildcardlist}" ]]; then
-    param="wild"
+  elif [[ "${listMain}" == "${regexlist}" && "${wildcard}" == true ]]; then
+    param="-wild"
     type="wildcard black"
+  elif [[ "${listMain}" == "${regexlist}" ]]; then
+    param="-regex"
+    type="regex black"
   else
     param="b"
     type="black"
@@ -57,7 +61,8 @@ Options:
 EscapeRegexp() {
   # This way we may safely insert an arbitrary
   # string in our regular expressions
-  # Also remove leading "." if present
+  # This sed is intentionally executed in three steps to ease maintainability
+  # The first sed removes any amount of leading dots
   echo $* | sed 's/^\.*//' | sed "s/[]\.|$(){}?+*^]/\\\\&/g" | sed "s/\\//\\\\\//g"
 }
 
@@ -65,10 +70,14 @@ HandleOther() {
   # Convert to lowercase
   domain="${1,,}"
 
-  # Check validity of domain
+  # Check validity of domain (don't check for regex entries)
   if [[ "${#domain}" -le 253 ]]; then
-    validDomain=$(grep -P "^((-|_)*[a-z\d]((-|_)*[a-z\d])*(-|_)*)(\.(-|_)*([a-z\d]((-|_)*[a-z\d])*))*$" <<< "${domain}") # Valid chars check
-    validDomain=$(grep -P "^[^\.]{1,63}(\.[^\.]{1,63})*$" <<< "${validDomain}") # Length of each label
+    if [[ "${listMain}" == "${regexlist}" && "${wildcard}" == false ]]; then
+      validDomain="${domain}"
+    else
+      validDomain=$(grep -P "^((-|_)*[a-z\\d]((-|_)*[a-z\\d])*(-|_)*)(\\.(-|_)*([a-z\\d]((-|_)*[a-z\\d])*))*$" <<< "${domain}") # Valid chars check
+      validDomain=$(grep -P "^[^\\.]{1,63}(\\.[^\\.]{1,63})*$" <<< "${validDomain}") # Length of each label
+    fi
   fi
 
   if [[ -n "${validDomain}" ]]; then
@@ -94,9 +103,6 @@ PoplistFile() {
     if ${addmode}; then
       AddDomain "${dom}" "${listMain}"
       RemoveDomain "${dom}" "${listAlt}"
-      if [[ "${listMain}" == "${whitelist}" || "${listMain}" == "${blacklist}" ]]; then
-        RemoveDomain "${dom}" "${wildcardlist}"
-      fi
     else
       RemoveDomain "${dom}" "${listMain}"
     fi
@@ -109,7 +115,6 @@ AddDomain() {
 
   [[ "${list}" == "${whitelist}" ]] && listname="whitelist"
   [[ "${list}" == "${blacklist}" ]] && listname="blacklist"
-  [[ "${list}" == "${wildcardlist}" ]] && listname="wildcard blacklist"
 
   if [[ "${list}" == "${whitelist}" || "${list}" == "${blacklist}" ]]; then
     [[ "${list}" == "${whitelist}" && -z "${type}" ]] && type="--whitelist-only"
@@ -121,7 +126,7 @@ AddDomain() {
     if [[ "${bool}" == false ]]; then
       # Domain not found in the whitelist file, add it!
       if [[ "${verbose}" == true ]]; then
-      echo -e "  ${INFO} Adding $1 to $listname..."
+      echo -e "  ${INFO} Adding ${1} to ${listname}..."
       fi
       reload=true
       # Add it to the list we want to add it to
@@ -131,28 +136,26 @@ AddDomain() {
         echo -e "  ${INFO} ${1} already exists in ${listname}, no need to add!"
       fi
     fi
-  elif [[ "${list}" == "${wildcardlist}" ]]; then
-    source "${piholeDir}/setupVars.conf"
-    # Remove the /* from the end of the IP addresses
-    IPV4_ADDRESS=${IPV4_ADDRESS%/*}
-    IPV6_ADDRESS=${IPV6_ADDRESS%/*}
+  elif [[ "${list}" == "${regexlist}" ]]; then
     [[ -z "${type}" ]] && type="--wildcard-only"
     bool=true
+    domain="${1}"
+
+    [[ "${wildcard}" == true ]] && domain="((^)|(\\.))${domain//\./\\.}$"
+
     # Is the domain in the list?
-    grep -e "address=\/${domain}\/" "${wildcardlist}" > /dev/null 2>&1 || bool=false
+    # Search only for exactly matching lines
+    grep -Fx "${domain}" "${regexlist}" > /dev/null 2>&1 || bool=false
 
     if [[ "${bool}" == false ]]; then
       if [[ "${verbose}" == true ]]; then
-      echo -e "  ${INFO} Adding $1 to wildcard blacklist..."
+      echo -e "  ${INFO} Adding ${domain} to regex list..."
       fi
       reload="restart"
-      echo "address=/$1/${IPV4_ADDRESS}" >> "${wildcardlist}"
-      if [[ "${#IPV6_ADDRESS}" > 0 ]]; then
-        echo "address=/$1/${IPV6_ADDRESS}" >> "${wildcardlist}"
-      fi
+      echo "$domain" >> "${regexlist}"
     else
       if [[ "${verbose}" == true ]]; then
-        echo -e "  ${INFO} ${1} already exists in wildcard blacklist, no need to add!"
+        echo -e "  ${INFO} ${domain} already exists in regex list, no need to add!"
       fi
     fi
   fi
@@ -164,7 +167,6 @@ RemoveDomain() {
 
   [[ "${list}" == "${whitelist}" ]] && listname="whitelist"
   [[ "${list}" == "${blacklist}" ]] && listname="blacklist"
-  [[ "${list}" == "${wildcardlist}" ]] && listname="wildcard blacklist"
 
   if [[ "${list}" == "${whitelist}" || "${list}" == "${blacklist}" ]]; then
     bool=true
@@ -174,7 +176,7 @@ RemoveDomain() {
     grep -Ex -q "${domain}" "${list}" > /dev/null 2>&1 || bool=false
     if [[ "${bool}" == true ]]; then
       # Remove it from the other one
-      echo -e "  ${INFO} Removing $1 from $listname..."
+      echo -e "  ${INFO} Removing $1 from ${listname}..."
       # /I flag: search case-insensitive
       sed -i "/${domain}/Id" "${list}"
       reload=true
@@ -183,20 +185,25 @@ RemoveDomain() {
         echo -e "  ${INFO} ${1} does not exist in ${listname}, no need to remove!"
       fi
     fi
-  elif [[ "${list}" == "${wildcardlist}" ]]; then
+  elif [[ "${list}" == "${regexlist}" ]]; then
     [[ -z "${type}" ]] && type="--wildcard-only"
+    domain="${1}"
+
+    [[ "${wildcard}" == true ]] && domain="((^)|(\\.))${domain//\./\\.}$"
+
     bool=true
     # Is it in the list?
-    grep -e "address=\/${domain}\/" "${wildcardlist}" > /dev/null 2>&1 || bool=false
+    grep -Fx "${domain}" "${regexlist}" > /dev/null 2>&1 || bool=false
     if [[ "${bool}" == true ]]; then
       # Remove it from the other one
-      echo -e "  ${INFO} Removing $1 from $listname..."
-      # /I flag: search case-insensitive
-      sed -i "/address=\/${domain}/Id" "${list}"
+      echo -e "  ${INFO} Removing $domain from regex list..."
+      local lineNumber
+      lineNumber=$(grep -Fnx "$domain" "${list}" | cut -f1 -d:)
+      sed -i "${lineNumber}d" "${list}"
       reload=true
     else
       if [[ "${verbose}" == true ]]; then
-        echo -e "  ${INFO} ${1} does not exist in ${listname}, no need to remove!"
+        echo -e "  ${INFO} ${domain} does not exist in regex list, no need to remove!"
       fi
     fi
   fi
@@ -218,7 +225,7 @@ Displaylist() {
     verbose=false
     echo -e "Displaying $string:\n"
     count=1
-    while IFS= read -r RD; do
+    while IFS= read -r RD || [ -n "${RD}" ]; do
       echo "  ${count}: ${RD}"
       count=$((count+1))
     done < "${listMain}"
@@ -241,7 +248,8 @@ for var in "$@"; do
   case "${var}" in
     "-w" | "whitelist"   ) listMain="${whitelist}"; listAlt="${blacklist}";;
     "-b" | "blacklist"   ) listMain="${blacklist}"; listAlt="${whitelist}";;
-    "-wild" | "wildcard" ) listMain="${wildcardlist}";;
+    "--wild" | "wildcard" ) listMain="${regexlist}"; wildcard=true;;
+    "--regex" | "regex"   ) listMain="${regexlist}";;
     "-nr"| "--noreload"  ) reload=false;;
     "-d" | "--delmode"   ) addmode=false;;
     "-q" | "--quiet"     ) verbose=false;;
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index a7fa4c2a..2f2b3745 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -780,7 +780,8 @@ dig_at() {
   # Find a random blocked url that has not been whitelisted.
   # This helps emulate queries to different domains that a user might query
   # It will also give extra assurance that Pi-hole is correctly resolving and blocking domains
-  local random_url=$(shuf -n 1 "${PIHOLE_BLOCKLIST_FILE}" | awk -F ' ' '{ print $2 }')
+  local random_url
+  random_url=$(shuf -n 1 "${PIHOLE_BLOCKLIST_FILE}")
 
   # First, do a dig on localhost to see if Pi-hole can use itself to block a domain
   if local_dig=$(dig +tries=1 +time=2 -"${protocol}" "${random_url}" @${local_address} +short "${record_type}"); then
diff --git a/advanced/Scripts/query.sh b/advanced/Scripts/query.sh
new file mode 100644
index 00000000..6bd37079
--- /dev/null
+++ b/advanced/Scripts/query.sh
@@ -0,0 +1,239 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1090
+# Pi-hole: A black hole for Internet advertisements
+# (c) 2018 Pi-hole, LLC (https://pi-hole.net)
+# Network-wide ad blocking via your own hardware.
+#
+# Query Domain Lists
+#
+# This file is copyright under the latest version of the EUPL.
+# Please see LICENSE file for your rights under this license.
+
+# Globals
+piholeDir="/etc/pihole"
+adListsList="$piholeDir/adlists.list"
+wildcardlist="/etc/dnsmasq.d/03-pihole-wildcard.conf"
+options="$*"
+adlist=""
+all=""
+exact=""
+blockpage=""
+matchType="match"
+
+colfile="/opt/pihole/COL_TABLE"
+source "${colfile}"
+
+# Print each subdomain
+# e.g: foo.bar.baz.com = "foo.bar.baz.com bar.baz.com baz.com com"
+processWildcards() {
+  IFS="." read -r -a array <<< "${1}"
+  for (( i=${#array[@]}-1; i>=0; i-- )); do
+    ar=""
+    for (( j=${#array[@]}-1; j>${#array[@]}-i-2; j-- )); do
+      if [[ $j == $((${#array[@]}-1)) ]]; then
+        ar="${array[$j]}"
+      else
+        ar="${array[$j]}.${ar}"
+      fi
+    done
+    echo "${ar}"
+  done
+}
+
+# Scan an array of files for matching strings
+scanList(){
+  # Escape full stops
+  local domain="${1//./\\.}" lists="${2}" type="${3:-}"
+
+  # Prevent grep from printing file path
+  cd "$piholeDir" || exit 1
+
+  # Prevent grep -i matching slowly: http://bit.ly/2xFXtUX
+  export LC_CTYPE=C
+
+  # /dev/null forces filename to be printed when only one list has been generated
+  # shellcheck disable=SC2086
+  case "${type}" in
+    "exact" ) grep -i -E -l "(^|\\s)${domain}($|\\s|#)" ${lists} /dev/null 2>/dev/null;;
+    "wc"    ) grep -i -o -m 1 "/${domain}/" ${lists} 2>/dev/null;;
+    *       ) grep -i "${domain}" ${lists} /dev/null 2>/dev/null;;
+  esac
+}
+
+if [[ "${options}" == "-h" ]] || [[ "${options}" == "--help" ]]; then
+  echo "Usage: pihole -q [option] <domain>
+Example: 'pihole -q -exact domain.com'
+Query the adlists for a specified domain
+
+Options:
+  -adlist             Print the name of the block list URL
+  -exact              Search the block lists for exact domain matches
+  -all                Return all query matches within a block list
+  -h, --help          Show this help dialog"
+  exit 0
+fi
+
+if [[ ! -e "$adListsList" ]]; then
+  echo -e "${COL_LIGHT_RED}The file $adListsList was not found${COL_NC}"
+  exit 1
+fi
+
+# Handle valid options
+if [[ "${options}" == *"-bp"* ]]; then
+  exact="exact"; blockpage=true
+else
+  [[ "${options}" == *"-adlist"* ]] && adlist=true
+  [[ "${options}" == *"-all"* ]] && all=true
+  if [[ "${options}" == *"-exact"* ]]; then
+    exact="exact"; matchType="exact ${matchType}"
+  fi
+fi
+
+# Strip valid options, leaving only the domain and invalid options
+# This allows users to place the options before or after the domain
+options=$(sed -E 's/ ?-(bp|adlists?|all|exact) ?//g' <<< "${options}")
+
+# Handle remaining options
+# If $options contain non ASCII characters, convert to punycode
+case "${options}" in
+  ""             ) str="No domain specified";;
+  *" "*          ) str="Unknown query option specified";;
+  *[![:ascii:]]* ) domainQuery=$(idn2 "${options}");;
+  *              ) domainQuery="${options}";;
+esac
+
+if [[ -n "${str:-}" ]]; then
+  echo -e "${str}${COL_NC}\\nTry 'pihole -q --help' for more information."
+  exit 1
+fi
+
+# Scan Whitelist and Blacklist
+lists="whitelist.txt blacklist.txt"
+mapfile -t results <<< "$(scanList "${domainQuery}" "${lists}" "${exact}")"
+ if [[ -n "${results[*]}" ]]; then
+  wbMatch=true
+   # Loop through each result in order to print unique file title once
+  for result in "${results[@]}"; do
+    fileName="${result%%.*}"
+     if [[ -n "${blockpage}" ]]; then
+      echo "π ${result}"
+      exit 0
+    elif [[ -n "${exact}" ]]; then
+      echo " ${matchType^} found in ${COL_BOLD}${fileName^}${COL_NC}"
+    else
+      # Only print filename title once per file
+      if [[ ! "${fileName}" == "${fileName_prev:-}" ]]; then
+        echo " ${matchType^} found in ${COL_BOLD}${fileName^}${COL_NC}"
+        fileName_prev="${fileName}"
+      fi
+      echo "   ${result#*:}"
+    fi
+  done
+fi
+
+# Scan Wildcards
+if [[ -e "${wildcardlist}" ]]; then
+  # Determine all subdomains, domain and TLDs
+  mapfile -t wildcards <<< "$(processWildcards "${domainQuery}")"
+   for match in "${wildcards[@]}"; do
+    # Search wildcard list for matches
+    mapfile -t results <<< "$(scanList "${match}" "${wildcardlist}" "wc")"
+     if [[ -n "${results[*]}" ]]; then
+      if [[ -z "${wcMatch:-}" ]] && [[ -z "${blockpage}" ]]; then
+        wcMatch=true
+        echo " ${matchType^} found in ${COL_BOLD}Wildcards${COL_NC}:"
+      fi
+       case "${blockpage}" in
+        true ) echo "π ${wildcardlist##*/}"; exit 0;;
+        *    ) echo "   *.${match}";;
+      esac
+    fi
+  done
+fi
+
+# Get version sorted *.domains filenames (without dir path)
+lists=("$(cd "$piholeDir" || exit 0; printf "%s\\n" -- *.domains | sort -V)")
+
+# Query blocklists for occurences of domain
+mapfile -t results <<< "$(scanList "${domainQuery}" "${lists[*]}" "${exact}")"
+
+# Handle notices
+if [[ -z "${wbMatch:-}" ]] && [[ -z "${wcMatch:-}" ]] && [[ -z "${results[*]}" ]]; then
+  echo -e "  ${INFO} No ${exact/t/t }results found for ${COL_BOLD}${domainQuery}${COL_NC} within the block lists"
+  exit 0
+elif [[ -z "${results[*]}" ]]; then
+  # Result found in WL/BL/Wildcards
+  exit 0
+elif [[ -z "${all}" ]] && [[ "${#results[*]}" -ge 100 ]]; then
+  echo -e "  ${INFO} Over 100 ${exact/t/t }results found for ${COL_BOLD}${domainQuery}${COL_NC}
+    This can be overridden using the -all option"
+  exit 0
+fi
+
+# Remove unwanted content from non-exact $results
+if [[ -z "${exact}" ]]; then
+  # Delete lines starting with #
+  # Remove comments after domain
+  # Remove hosts format IP address
+  mapfile -t results <<< "$(IFS=$'\n'; sed \
+    -e "/:#/d" \
+    -e "s/[ \\t]#.*//g" \
+    -e "s/:.*[ \\t]/:/g" \
+  <<< "${results[*]}")"
+   # Exit if result was in a comment
+  [[ -z "${results[*]}" ]] && exit 0
+fi
+
+# Get adlist file content as array
+if [[ -n "${adlist}" ]] || [[ -n "${blockpage}" ]]; then
+  for adlistUrl in $(< "${adListsList}"); do
+    if [[ "${adlistUrl:0:4}" =~ (http|www.) ]]; then
+      adlists+=("${adlistUrl}")
+    fi
+  done
+fi
+
+# Print "Exact matches for" title
+if [[ -n "${exact}" ]] && [[ -z "${blockpage}" ]]; then
+  plural=""; [[ "${#results[*]}" -gt 1 ]] && plural="es"
+  echo " ${matchType^}${plural} for ${COL_BOLD}${domainQuery}${COL_NC} found in:"
+fi
+
+for result in "${results[@]}"; do
+  fileName="${result/:*/}"
+
+  # Determine *.domains URL using filename's number
+  if [[ -n "${adlist}" ]] || [[ -n "${blockpage}" ]]; then
+    fileNum="${fileName/list./}"; fileNum="${fileNum%%.*}"
+    fileName="${adlists[$fileNum]}"
+
+    # Discrepency occurs when adlists has been modified, but Gravity has not been run
+    if [[ -z "${fileName}" ]]; then
+      fileName="${COL_LIGHT_RED}(no associated adlists URL found)${COL_NC}"
+    fi
+  fi
+
+  if [[ -n "${blockpage}" ]]; then
+    echo "${fileNum} ${fileName}"
+  elif [[ -n "${exact}" ]]; then
+    echo "   ${fileName}"
+  else
+    if [[ ! "${fileName}" == "${fileName_prev:-}" ]]; then
+      count=""
+      echo " ${matchType^} found in ${COL_BOLD}${fileName}${COL_NC}:"
+      fileName_prev="${fileName}"
+    fi
+    : $((count++))
+
+    # Print matching domain if $max_count has not been reached
+    [[ -z "${all}" ]] && max_count="50"
+    if [[ -z "${all}" ]] && [[ "${count}" -ge "${max_count}" ]]; then
+      [[ "${count}" -gt "${max_count}" ]] && continue
+      echo "   ${COL_GRAY}Over ${count} results found, skipping rest of file${COL_NC}"
+    else
+      echo "   ${result#*:}"
+    fi
+  fi
+done
+
+exit 0
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 48161604..3c6f1fb5 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -205,6 +205,10 @@ trust-anchor=.,20326,8,2,E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC68345710423
 		add_dnsmasq_setting "interface" "${PIHOLE_INTERFACE}"
 	fi
 
+	if [[ "${CONDITIONAL_FORWARDING}" == true ]]; then
+		add_dnsmasq_setting "server=/${CONDITIONAL_FORWARDING_DOMAIN}/${CONDITIONAL_FORWARDING_IP}"
+		add_dnsmasq_setting "server=/${CONDITIONAL_FORWARDING_REVERSE}/${CONDITIONAL_FORWARDING_IP}"
+	fi
 }
 
 SetDNSServers() {
@@ -234,6 +238,18 @@ SetDNSServers() {
 		change_setting "DNSSEC" "false"
 	fi
 
+	if [[ "${args[6]}" == "conditional_forwarding" ]]; then
+		change_setting "CONDITIONAL_FORWARDING" "true"
+		change_setting "CONDITIONAL_FORWARDING_IP" "${args[7]}"
+		change_setting "CONDITIONAL_FORWARDING_DOMAIN" "${args[8]}"
+		change_setting "CONDITIONAL_FORWARDING_REVERSE" "${args[9]}"
+	else
+		change_setting "CONDITIONAL_FORWARDING" "false"
+		delete_setting "CONDITIONAL_FORWARDING_IP"
+		delete_setting "CONDITIONAL_FORWARDING_DOMAIN"
+		delete_setting "CONDITIONAL_FORWARDING_REVERSE"
+	fi
+
 	ProcessDNSSettings
 
 	# Restart dnsmasq to load new configuration
diff --git a/advanced/Scripts/wildcard_regex_converter.sh b/advanced/Scripts/wildcard_regex_converter.sh
new file mode 100644
index 00000000..d8ebeeb8
--- /dev/null
+++ b/advanced/Scripts/wildcard_regex_converter.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Pi-hole: A black hole for Internet advertisements
+# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# Network-wide ad blocking via your own hardware.
+#
+# Provides an automated migration subroutine to convert Pi-hole v3.x wildcard domains to Pi-hole v4.x regex filters
+#
+# This file is copyright under the latest version of the EUPL.
+# Please see LICENSE file for your rights under this license.
+
+# regexFile set in gravity.sh
+
+wildcardFile="/etc/dnsmasq.d/03-pihole-wildcard.conf"
+
+convert_wildcard_to_regex() {
+  if [ ! -f "${wildcardFile}" ]; then
+    return
+  fi
+  local addrlines domains uniquedomains
+  # Obtain wildcard domains from old file
+  addrlines="$(grep -oE "/.*/" ${wildcardFile})"
+  # Strip "/" from domain names and convert "." to regex-compatible "\."
+  domains="$(sed 's/\///g;s/\./\\./g' <<< "${addrlines}")"
+  # Remove repeated domains (may have been inserted two times due to A and AAAA blocking)
+  uniquedomains="$(uniq <<< "${domains}")"
+  # Automatically generate regex filters and remove old wildcards file
+  awk '{print "((^)|(\\.))"$0"$"}' <<< "${uniquedomains}" >> "${regexFile:?}" && rm "${wildcardFile}"
+}
diff --git a/advanced/bash-completion/pihole b/advanced/bash-completion/pihole
index fc8f2162..c25c570b 100644
--- a/advanced/bash-completion/pihole
+++ b/advanced/bash-completion/pihole
@@ -1,11 +1,79 @@
 _pihole() {
-	local cur prev opts
+	local cur prev opts opts_admin opts_checkout opts_chronometer opts_debug opts_interface  opts_logging opts_privacy opts_query opts_update opts_version
 	COMPREPLY=()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	opts="admin blacklist chronometer debug disable enable flush help logging query reconfigure restartdns setupLCD status tail uninstall updateGravity updatePihole version whitelist checkout"
+	prev2="${COMP_WORDS[COMP_CWORD-2]}"
 
-	COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+	case "${prev}" in
+		"pihole")
+			opts="admin blacklist checkout chronometer debug disable enable flush help logging query reconfigure regex restartdns status tail uninstall updateGravity updatePihole version wildcard whitelist"
+			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+		;;
+		"whitelist"|"blacklist"|"wildcard"|"regex")
+			opts_lists="\--delmode \--noreload \--quiet \--list \--nuke"
+			COMPREPLY=( $(compgen -W "${opts_lists}" -- ${cur}) )
+		;;
+		"admin")
+			opts_admin="celsius email fahrenheit hostrecord interface kelvin password privacylevel"
+			COMPREPLY=( $(compgen -W "${opts_admin}" -- ${cur}) )
+		;;
+		"checkout")
+			opts_checkout="core ftl web master dev"
+			COMPREPLY=( $(compgen -W "${opts_checkout}" -- ${cur}) )
+		;;
+		"chronometer")
+			opts_chronometer="\--exit \--json \--refresh"
+			COMPREPLY=( $(compgen -W "${opts_chronometer}" -- ${cur}) )
+		;;
+		"debug")
+			opts_debug="-a"
+			COMPREPLY=( $(compgen -W "${opts_debug}" -- ${cur}) )
+		;;
+		"logging")
+			opts_logging="on off 'off noflush'"
+			COMPREPLY=( $(compgen -W "${opts_logging}" -- ${cur}) )
+		;;
+		"query")
+			opts_query="-adlist -all -exact"
+			COMPREPLY=( $(compgen -W "${opts_query}" -- ${cur}) )
+		;;
+		"updatePihole"|"-up")
+			opts_update="--check-only"
+			COMPREPLY=( $(compgen -W "${opts_update}" -- ${cur}) )
+		;;
+		"version")
+			opts_version="\--admin \--current \--ftl \--hash \--latest \--pihole"
+			COMPREPLY=( $(compgen -W "${opts_version}" -- ${cur}) )
+		;;
+		"interface")
+			if ( [[ "$prev2" == "admin" ]] || [[ "$prev2" == "-a" ]] ); then
+				opts_interface="$(cat /proc/net/dev | cut -d: -s -f1)"
+				COMPREPLY=( $(compgen -W "${opts_interface}" -- ${cur}) )
+			else
+				return 1
+			fi
+		;;
+		"privacylevel")
+			if ( [[ "$prev2" == "admin" ]] || [[ "$prev2" == "-a" ]] ); then
+				opts_privacy="0 1 2 3"
+				COMPREPLY=( $(compgen -W "${opts_privacy}" -- ${cur}) )
+			else 
+				return 1
+			fi	
+		;;
+		"core"|"admin"|"ftl")
+			if [[ "$prev2" == "checkout" ]]; then
+				opts_checkout="master dev"
+				COMPREPLY=( $(compgen -W "${opts_checkout}" -- ${cur}) )
+			else
+				return 1
+			fi
+		;;
+		*)
+		return 1
+		;;
+	esac
 	return 0
 }
 complete -F _pihole pihole
diff --git a/advanced/index.php b/advanced/index.php
index 1575bafc..cad59ec7 100644
--- a/advanced/index.php
+++ b/advanced/index.php
@@ -329,6 +329,7 @@ setHeader();
           setTimeout(function(){window.location.reload(1);}, 10000);
           $("#bpOutput").removeClass("add");
           $("#bpOutput").addClass("success");
+          $("#bpOutput").html("");
         } else {
           $("#bpOutput").removeClass("add");
           $("#bpOutput").addClass("error");
@@ -338,6 +339,7 @@ setHeader();
       error: function(jqXHR, exception) {
         $("#bpOutput").removeClass("add");
         $("#bpOutput").addClass("exception");
+        $("#bpOutput").html("");
       }
     });
   }
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 395a6203..dd0c6392 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -84,30 +84,30 @@ runUnattended=false
 INSTALL_WEB_SERVER=true
 # Check arguments for the undocumented flags
 for var in "$@"; do
-  case "$var" in
-  "--reconfigure" ) reconfigure=true;;
-  "--i_do_not_follow_recommendations" ) skipSpaceCheck=true;;
-  "--unattended" ) runUnattended=true;;
-  "--disable-install-webserver" ) INSTALL_WEB_SERVER=false;;
-  esac
+    case "$var" in
+        "--reconfigure" ) reconfigure=true;;
+        "--i_do_not_follow_recommendations" ) skipSpaceCheck=true;;
+        "--unattended" ) runUnattended=true;;
+        "--disable-install-webserver" ) INSTALL_WEB_SERVER=false;;
+    esac
 done
 
 # If the color table file exists,
 if [[ -f "${coltable}" ]]; then
-  # source it
-  source ${coltable}
+    # source it
+    source ${coltable}
 # Otherwise,
 else
-  # Set these values so the installer can still run in color
-  COL_NC='\e[0m' # No Color
-  COL_LIGHT_GREEN='\e[1;32m'
-  COL_LIGHT_RED='\e[1;31m'
-  TICK="[${COL_LIGHT_GREEN}✓${COL_NC}]"
-  CROSS="[${COL_LIGHT_RED}✗${COL_NC}]"
-  INFO="[i]"
-  # shellcheck disable=SC2034
-  DONE="${COL_LIGHT_GREEN} done!${COL_NC}"
-  OVER="\\r\\033[K"
+    # Set these values so the installer can still run in color
+    COL_NC='\e[0m' # No Color
+    COL_LIGHT_GREEN='\e[1;32m'
+    COL_LIGHT_RED='\e[1;31m'
+    TICK="[${COL_LIGHT_GREEN}✓${COL_NC}]"
+    CROSS="[${COL_LIGHT_RED}✗${COL_NC}]"
+    INFO="[i]"
+    # shellcheck disable=SC2034
+    DONE="${COL_LIGHT_GREEN} done!${COL_NC}"
+    OVER="\\r\\033[K"
 fi
 
 # A simple function that just echoes out our logo in ASCII format
@@ -141,1017 +141,1029 @@ show_ascii_berry() {
 distro_check() {
 # If apt-get is installed, then we know it's part of the Debian family
 if command -v apt-get &> /dev/null; then
-  # Set some global variables here
-  # We don't set them earlier since the family might be Red Hat, so these values would be different
-  PKG_MANAGER="apt-get"
-  # A variable to store the command used to update the package cache
-  UPDATE_PKG_CACHE="${PKG_MANAGER} update"
-  # An array for something...
-  PKG_INSTALL=(${PKG_MANAGER} --yes --no-install-recommends install)
-  # grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE
-  PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
-  # Some distros vary slightly so these fixes for dependencies may apply
-  # Debian 7 doesn't have iproute2 so if the dry run install is successful,
-  if ${PKG_MANAGER} install --dry-run iproute2 > /dev/null 2>&1; then
-    # we can install it
-    iproute_pkg="iproute2"
-  # Otherwise,
-  else
-    # use iproute
-    iproute_pkg="iproute"
-  fi
-  # We prefer the php metapackage if it's there
-  if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then
-    phpVer="php"
-  # If not,
-  else
-    # fall back on the php5 packages
-    phpVer="php5"
-  fi
-  # We also need the correct version for `php-sqlite` (which differs across distros)
-  if ${PKG_MANAGER} install --dry-run ${phpVer}-sqlite3 > /dev/null 2>&1; then
-    phpSqlite="sqlite3"
-  else
-    phpSqlite="sqlite"
-  fi
-  # Since our install script is so large, we need several other programs to successfully get a machine provisioned
-  # These programs are stored in an array so they can be looped through later
-  INSTALLER_DEPS=(apt-utils dialog debconf dhcpcd5 git ${iproute_pkg} whiptail)
-  # Pi-hole itself has several dependencies that also need to be installed
-  PIHOLE_DEPS=(bc cron curl dnsutils iputils-ping lsof netcat psmisc sudo unzip wget idn2 sqlite3 libcap2-bin dns-root-data resolvconf)
-  # The Web dashboard has some that also need to be installed
-  # It's useful to separate the two since our repos are also setup as "Core" code and "Web" code
-  PIHOLE_WEB_DEPS=(lighttpd ${phpVer}-common ${phpVer}-cgi ${phpVer}-${phpSqlite})
-  # The Web server user,
-  LIGHTTPD_USER="www-data"
-  # group,
-  LIGHTTPD_GROUP="www-data"
-  # and config file
-  LIGHTTPD_CFG="lighttpd.conf.debian"
+    # Set some global variables here
+    # We don't set them earlier since the family might be Red Hat, so these values would be different
+    PKG_MANAGER="apt-get"
+    # A variable to store the command used to update the package cache
+    UPDATE_PKG_CACHE="${PKG_MANAGER} update"
+    # An array for something...
+    PKG_INSTALL=(${PKG_MANAGER} --yes --no-install-recommends install)
+    # grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE
+    PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
+    # Some distros vary slightly so these fixes for dependencies may apply
+    # Debian 7 doesn't have iproute2 so if the dry run install is successful,
+    if ${PKG_MANAGER} install --dry-run iproute2 > /dev/null 2>&1; then
+        # we can install it
+        iproute_pkg="iproute2"
+    # Otherwise,
+    else
+        # use iproute
+        iproute_pkg="iproute"
+    fi
+    # Check for and determine version number (major and minor) of current php install
+    if command -v php &> /dev/null; then
+        phpInsVersion="$(php -v | head -n1 | grep -Po '(?<=PHP )[^ ]+')"
+        echo -e "  ${INFO} Existing PHP installation detected : PHP version $phpInsVersion"
+        phpInsMajor="$(echo "$phpInsVersion" | cut -d\. -f1)"
+        phpInsMinor="$(echo "$phpInsVersion" | cut -d\. -f2)"
+        # Is installed php version 7.0 or greater
+        if [ "$(echo "$phpInsMajor.$phpInsMinor < 7.0" | bc )" == 0 ]; then
+            phpInsNewer=true
+        fi
+    fi
+    # Check if installed php is v 7.0, or newer to determine packages to install
+    if [[ "$phpInsNewer" != true ]]; then
+        # Prefer the php metapackage if it's there
+        if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then
+            phpVer="php"
+        # fall back on the php5 packages
+        else
+            phpVer="php5"
+        fi
+    else
+        # Newer php is installed, its common, cgi & sqlite counterparts are deps
+        phpVer="php$phpInsMajor.$phpInsMinor"
+    fi
+    # We also need the correct version for `php-sqlite` (which differs across distros)
+    if ${PKG_MANAGER} install --dry-run ${phpVer}-sqlite3 > /dev/null 2>&1; then
+        phpSqlite="sqlite3"
+    else
+        phpSqlite="sqlite"
+    fi
+    # Since our install script is so large, we need several other programs to successfully get a machine provisioned
+    # These programs are stored in an array so they can be looped through later
+    INSTALLER_DEPS=(apt-utils dialog debconf dhcpcd5 git ${iproute_pkg} whiptail)
+    # Pi-hole itself has several dependencies that also need to be installed
+    PIHOLE_DEPS=(bc cron curl dnsutils iputils-ping lsof netcat psmisc sudo unzip wget idn2 sqlite3 libcap2-bin dns-root-data resolvconf)
+    # The Web dashboard has some that also need to be installed
+    # It's useful to separate the two since our repos are also setup as "Core" code and "Web" code
+    PIHOLE_WEB_DEPS=(lighttpd ${phpVer}-common ${phpVer}-cgi ${phpVer}-${phpSqlite})
+    # The Web server user,
+    LIGHTTPD_USER="www-data"
+    # group,
+    LIGHTTPD_GROUP="www-data"
+    # and config file
+    LIGHTTPD_CFG="lighttpd.conf.debian"
 
-  # A function to check...
-  test_dpkg_lock() {
-      # An iterator used for counting loop iterations
-      i=0
-      # fuser is a program to show which processes use the named files, sockets, or filesystems
-      # So while the command is true
-      while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-        # Wait half a second
-        sleep 0.5
-        # and increase the iterator
-        ((i=i+1))
-      done
-      # Always return success, since we only return if there is no
-      # lock (anymore)
-      return 0
+    # A function to check...
+    test_dpkg_lock() {
+        # An iterator used for counting loop iterations
+        i=0
+        # fuser is a program to show which processes use the named files, sockets, or filesystems
+        # So while the command is true
+        while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
+            # Wait half a second
+            sleep 0.5
+            # and increase the iterator
+            ((i=i+1))
+        done
+        # Always return success, since we only return if there is no
+        # lock (anymore)
+        return 0
     }
 
 # If apt-get is not found, check for rpm to see if it's a Red Hat family OS
 elif command -v rpm &> /dev/null; then
-  # Then check if dnf or yum is the package manager
-  if command -v dnf &> /dev/null; then
-    PKG_MANAGER="dnf"
-  else
-    PKG_MANAGER="yum"
-  fi
-
-  # Fedora and family update cache on every PKG_INSTALL call, no need for a separate update.
-  UPDATE_PKG_CACHE=":"
-  PKG_INSTALL=(${PKG_MANAGER} install -y)
-  PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l"
-  INSTALLER_DEPS=(dialog git iproute net-tools newt procps-ng which)
-  PIHOLE_DEPS=(bc bind-utils cronie curl findutils nmap-ncat sudo unzip wget libidn2 psmisc)
-  PIHOLE_WEB_DEPS=(lighttpd lighttpd-fastcgi php-common php-cli php-pdo)
-  LIGHTTPD_USER="lighttpd"
-  LIGHTTPD_GROUP="lighttpd"
-  LIGHTTPD_CFG="lighttpd.conf.fedora"
-  # If the host OS is Fedora,
-  if grep -qi 'fedora' /etc/redhat-release; then
-    # all required packages should be available by default with the latest fedora release
-    : # continue
-  # or if host OS is CentOS,
-  elif grep -qi 'centos' /etc/redhat-release; then
-    # Pi-Hole currently supports CentOS 7+ with PHP7+
-    SUPPORTED_CENTOS_VERSION=7
-    SUPPORTED_CENTOS_PHP_VERSION=7
-    # Check current CentOS major release version
-    CURRENT_CENTOS_VERSION=$(rpm -q --queryformat '%{VERSION}' centos-release)
-    # Check if CentOS version is supported
-    if [[ $CURRENT_CENTOS_VERSION -lt $SUPPORTED_CENTOS_VERSION ]]; then
-      echo -e "  ${CROSS} CentOS $CURRENT_CENTOS_VERSION is not suported."
-      echo -e "      Please update to CentOS release $SUPPORTED_CENTOS_VERSION or later"
-      # exit the installer
-      exit
-    fi
-    # on CentOS we need to add the EPEL repository to gain access to Fedora packages
-    EPEL_PKG="epel-release"
-    rpm -q ${EPEL_PKG} &> /dev/null || rc=$?
-    if [[ $rc -ne 0 ]]; then
-      echo -e "  ${INFO} Enabling EPEL package repository (https://fedoraproject.org/wiki/EPEL)"
-      "${PKG_INSTALL[@]}" ${EPEL_PKG} &> /dev/null
-      echo -e "  ${TICK} Installed ${EPEL_PKG}"
-    fi
-
-    # The default php on CentOS 7.x is 5.4 which is EOL
-    # Check if the version of PHP available via installed repositories is >= to PHP 7
-    AVAILABLE_PHP_VERSION=$(${PKG_MANAGER} info php | grep -i version | grep -o '[0-9]\+' | head -1)
-    if [[ $AVAILABLE_PHP_VERSION -ge $SUPPORTED_CENTOS_PHP_VERSION ]]; then
-      # Since PHP 7 is available by default, install via default PHP package names
-      : # do nothing as PHP is current
+    # Then check if dnf or yum is the package manager
+    if command -v dnf &> /dev/null; then
+        PKG_MANAGER="dnf"
     else
-      REMI_PKG="remi-release"
-      REMI_REPO="remi-php72"
-      rpm -q ${REMI_PKG} &> /dev/null || rc=$?
-      if [[ $rc -ne 0 ]]; then
-        # The PHP version available via default repositories is older than version 7
-        if ! whiptail --defaultno --title "PHP 7 Update (recommended)" --yesno "PHP 7.x is recommended for both security and language features.\\nWould you like to install PHP7 via Remi's RPM repository?\\n\\nSee: https://rpms.remirepo.net for more information" ${r} ${c}; then
-          # User decided to NOT update PHP from REMI, attempt to install the default available PHP version
-          echo -e "  ${INFO} User opt-out of PHP 7 upgrade on CentOS. Deprecated PHP may be in use."
-          : # continue with unsupported php version
-        else
-          echo -e "  ${INFO} Enabling Remi's RPM repository (https://rpms.remirepo.net)"
-          "${PKG_INSTALL[@]}" "https://rpms.remirepo.net/enterprise/${REMI_PKG}-$(rpm -E '%{rhel}').rpm" &> /dev/null
-          # enable the PHP 7 repository via yum-config-manager (provided by yum-utils)
-          "${PKG_INSTALL[@]}" "yum-utils" &> /dev/null
-          yum-config-manager --enable ${REMI_REPO} &> /dev/null
-          echo -e "  ${TICK} Remi's RPM repository has been enabled for PHP7"
-
-        fi
-      fi
+        PKG_MANAGER="yum"
     fi
-  else
-    # If not a supported version of Fedora or CentOS,
-    echo -e "  ${CROSS} Unsupported RPM based distribution"
-    # exit the installer
-    exit
-  fi
 
+    # Fedora and family update cache on every PKG_INSTALL call, no need for a separate update.
+    UPDATE_PKG_CACHE=":"
+    PKG_INSTALL=(${PKG_MANAGER} install -y)
+    PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l"
+    INSTALLER_DEPS=(dialog git iproute net-tools newt procps-ng which)
+    PIHOLE_DEPS=(bc bind-utils cronie curl findutils nmap-ncat sudo unzip wget libidn2 psmisc)
+    PIHOLE_WEB_DEPS=(lighttpd lighttpd-fastcgi php-common php-cli php-pdo)
+    LIGHTTPD_USER="lighttpd"
+    LIGHTTPD_GROUP="lighttpd"
+    LIGHTTPD_CFG="lighttpd.conf.fedora"
+    # If the host OS is Fedora,
+    if grep -qi 'fedora' /etc/redhat-release; then
+        # all required packages should be available by default with the latest fedora release
+        : # continue
+    # or if host OS is CentOS,
+    elif grep -qi 'centos' /etc/redhat-release; then
+        # Pi-Hole currently supports CentOS 7+ with PHP7+
+        SUPPORTED_CENTOS_VERSION=7
+        SUPPORTED_CENTOS_PHP_VERSION=7
+        # Check current CentOS major release version
+        CURRENT_CENTOS_VERSION=$(rpm -q --queryformat '%{VERSION}' centos-release)
+        # Check if CentOS version is supported
+        if [[ $CURRENT_CENTOS_VERSION -lt $SUPPORTED_CENTOS_VERSION ]]; then
+            echo -e "  ${CROSS} CentOS $CURRENT_CENTOS_VERSION is not suported."
+            echo -e "      Please update to CentOS release $SUPPORTED_CENTOS_VERSION or later"
+            # exit the installer
+            exit
+        fi
+        # on CentOS we need to add the EPEL repository to gain access to Fedora packages
+        EPEL_PKG="epel-release"
+        rpm -q ${EPEL_PKG} &> /dev/null || rc=$?
+        if [[ $rc -ne 0 ]]; then
+            echo -e "  ${INFO} Enabling EPEL package repository (https://fedoraproject.org/wiki/EPEL)"
+            "${PKG_INSTALL[@]}" ${EPEL_PKG} &> /dev/null
+            echo -e "  ${TICK} Installed ${EPEL_PKG}"
+        fi
+
+        # The default php on CentOS 7.x is 5.4 which is EOL
+        # Check if the version of PHP available via installed repositories is >= to PHP 7
+        AVAILABLE_PHP_VERSION=$(${PKG_MANAGER} info php | grep -i version | grep -o '[0-9]\+' | head -1)
+        if [[ $AVAILABLE_PHP_VERSION -ge $SUPPORTED_CENTOS_PHP_VERSION ]]; then
+            # Since PHP 7 is available by default, install via default PHP package names
+            : # do nothing as PHP is current
+        else
+            REMI_PKG="remi-release"
+            REMI_REPO="remi-php72"
+            rpm -q ${REMI_PKG} &> /dev/null || rc=$?
+        if [[ $rc -ne 0 ]]; then
+            # The PHP version available via default repositories is older than version 7
+            if ! whiptail --defaultno --title "PHP 7 Update (recommended)" --yesno "PHP 7.x is recommended for both security and language features.\\nWould you like to install PHP7 via Remi's RPM repository?\\n\\nSee: https://rpms.remirepo.net for more information" ${r} ${c}; then
+                # User decided to NOT update PHP from REMI, attempt to install the default available PHP version
+                echo -e "  ${INFO} User opt-out of PHP 7 upgrade on CentOS. Deprecated PHP may be in use."
+                : # continue with unsupported php version
+            else
+                echo -e "  ${INFO} Enabling Remi's RPM repository (https://rpms.remirepo.net)"
+                "${PKG_INSTALL[@]}" "https://rpms.remirepo.net/enterprise/${REMI_PKG}-$(rpm -E '%{rhel}').rpm" &> /dev/null
+                # enable the PHP 7 repository via yum-config-manager (provided by yum-utils)
+                "${PKG_INSTALL[@]}" "yum-utils" &> /dev/null
+                yum-config-manager --enable ${REMI_REPO} &> /dev/null
+                echo -e "  ${TICK} Remi's RPM repository has been enabled for PHP7"
+            fi
+        fi
+    fi
+    else
+        # If not a supported version of Fedora or CentOS,
+        echo -e "  ${CROSS} Unsupported RPM based distribution"
+        # exit the installer
+        exit
+    fi
 
 # If neither apt-get or rmp/dnf are found
 else
-  # it's not an OS we can support,
-  echo -e "  ${CROSS} OS distribution not supported"
-  # so exit the installer
-  exit
+    # it's not an OS we can support,
+    echo -e "  ${CROSS} OS distribution not supported"
+    # so exit the installer
+    exit
 fi
 }
 
 # A function for checking if a folder is a git repository
 is_repo() {
-  # Use a named, local variable instead of the vague $1, which is the first argument passed to this function
-  # These local variables should always be lowercase
-  local directory="${1}"
-  # A local variable for the current directory
-  local curdir
-  # A variable to store the return code
-  local rc
-  # Assign the current directory variable by using pwd
-  curdir="${PWD}"
-  # If the first argument passed to this function is a directory,
-  if [[ -d "${directory}" ]]; then
-    # move into the directory
-    cd "${directory}"
-    # Use git to check if the folder is a repo
-    # git -C is not used here to support git versions older than 1.8.4
-    git status --short &> /dev/null || rc=$?
-  # If the command was not successful,
-  else
-    # Set a non-zero return code if directory does not exist
-    rc=1
-  fi
-  # Move back into the directory the user started in
-  cd "${curdir}"
-  # Return the code; if one is not set, return 0
-  return "${rc:-0}"
+    # Use a named, local variable instead of the vague $1, which is the first argument passed to this function
+    # These local variables should always be lowercase
+    local directory="${1}"
+    # A local variable for the current directory
+    local curdir
+    # A variable to store the return code
+    local rc
+    # Assign the current directory variable by using pwd
+    curdir="${PWD}"
+    # If the first argument passed to this function is a directory,
+    if [[ -d "${directory}" ]]; then
+        # move into the directory
+        cd "${directory}"
+        # Use git to check if the folder is a repo
+        # git -C is not used here to support git versions older than 1.8.4
+        git status --short &> /dev/null || rc=$?
+    # If the command was not successful,
+    else
+        # Set a non-zero return code if directory does not exist
+        rc=1
+    fi
+    # Move back into the directory the user started in
+    cd "${curdir}"
+    # Return the code; if one is not set, return 0
+    return "${rc:-0}"
 }
 
 # A function to clone a repo
 make_repo() {
-  # Set named variables for better readability
-  local directory="${1}"
-  local remoteRepo="${2}"
-  # The message to display when this function is running
-  str="Clone ${remoteRepo} into ${directory}"
-  # Display the message and use the color table to preface the message with an "info" indicator
-  echo -ne "  ${INFO} ${str}..."
-  # If the directory exists,
-  if [[ -d "${directory}" ]]; then
-    # delete everything in it so git can clone into it
-    rm -rf "${directory}"
-  fi
-  # Clone the repo and return the return code from this command
-  git clone -q --depth 1 "${remoteRepo}" "${directory}" &> /dev/null || return $?
-  # Show a colored message showing it's status
-  echo -e "${OVER}  ${TICK} ${str}"
-  # Always return 0? Not sure this is correct
-  return 0
+    # Set named variables for better readability
+    local directory="${1}"
+    local remoteRepo="${2}"
+    # The message to display when this function is running
+    str="Clone ${remoteRepo} into ${directory}"
+    # Display the message and use the color table to preface the message with an "info" indicator
+    echo -ne "  ${INFO} ${str}..."
+    # If the directory exists,
+    if [[ -d "${directory}" ]]; then
+        # delete everything in it so git can clone into it
+        rm -rf "${directory}"
+    fi
+    # Clone the repo and return the return code from this command
+    git clone -q --depth 1 "${remoteRepo}" "${directory}" &> /dev/null || return $?
+    # Show a colored message showing it's status
+    echo -e "${OVER}  ${TICK} ${str}"
+    # Always return 0? Not sure this is correct
+    return 0
 }
 
 # We need to make sure the repos are up-to-date so we can effectively install Clean out the directory if it exists for git to clone into
 update_repo() {
-  # Use named, local variables
-  # As you can see, these are the same variable names used in the last function,
-  # but since they are local, their scope does not go beyond this function
-  # This helps prevent the wrong value from being assigned if you were to set the variable as a GLOBAL one
-  local directory="${1}"
-  local curdir
+    # Use named, local variables
+    # As you can see, these are the same variable names used in the last function,
+    # but since they are local, their scope does not go beyond this function
+    # This helps prevent the wrong value from being assigned if you were to set the variable as a GLOBAL one
+    local directory="${1}"
+    local curdir
 
-  # A variable to store the message we want to display;
-  # Again, it's useful to store these in variables in case we need to reuse or change the message;
-  # we only need to make one change here
-  local str="Update repo in ${1}"
+    # A variable to store the message we want to display;
+    # Again, it's useful to store these in variables in case we need to reuse or change the message;
+    # we only need to make one change here
+    local str="Update repo in ${1}"
 
-  # Make sure we know what directory we are in so we can move back into it
-  curdir="${PWD}"
-  # Move into the directory that was passed as an argument
-  cd "${directory}" &> /dev/null || return 1
-  # Let the user know what's happening
-  echo -ne "  ${INFO} ${str}..."
-  # Stash any local commits as they conflict with our working code
-  git stash --all --quiet &> /dev/null || true # Okay for stash failure
-  git clean --quiet --force -d || true # Okay for already clean directory
-  # Pull the latest commits
-  git pull --quiet &> /dev/null || return $?
-  # Show a completion message
-  echo -e "${OVER}  ${TICK} ${str}"
-  # Move back into the original directory
-  cd "${curdir}" &> /dev/null || return 1
-  return 0
+    # Make sure we know what directory we are in so we can move back into it
+    curdir="${PWD}"
+    # Move into the directory that was passed as an argument
+    cd "${directory}" &> /dev/null || return 1
+    # Let the user know what's happening
+    echo -ne "  ${INFO} ${str}..."
+    # Stash any local commits as they conflict with our working code
+    git stash --all --quiet &> /dev/null || true # Okay for stash failure
+    git clean --quiet --force -d || true # Okay for already clean directory
+    # Pull the latest commits
+    git pull --quiet &> /dev/null || return $?
+    # Show a completion message
+    echo -e "${OVER}  ${TICK} ${str}"
+    # Move back into the original directory
+    cd "${curdir}" &> /dev/null || return 1
+    return 0
 }
 
 # A function that combines the functions previously made
 getGitFiles() {
-  # Setup named variables for the git repos
-  # We need the directory
-  local directory="${1}"
-  # as well as the repo URL
-  local remoteRepo="${2}"
-  # A local variable containing the message to be displayed
-  local str="Check for existing repository in ${1}"
-  # Show the message
-  echo -ne "  ${INFO} ${str}..."
-  # Check if the directory is a repository
-  if is_repo "${directory}"; then
-    # Show that we're checking it
-    echo -e "${OVER}  ${TICK} ${str}"
-    # Update the repo, returning an error message on failure
-    update_repo "${directory}" || { echo -e "\\n  ${COL_LIGHT_RED}Error: Could not update local repository. Contact support.${COL_NC}"; exit 1; }
-  # If it's not a .git repo,
-  else
-    # Show an error
-    echo -e "${OVER}  ${CROSS} ${str}"
-    # Attempt to make the repository, showing an error on failure
-    make_repo "${directory}" "${remoteRepo}" || { echo -e "\\n  ${COL_LIGHT_RED}Error: Could not update local repository. Contact support.${COL_NC}"; exit 1; }
-  fi
-  # echo a blank line
-  echo ""
-  # and return success?
-  return 0
+    # Setup named variables for the git repos
+    # We need the directory
+    local directory="${1}"
+    # as well as the repo URL
+    local remoteRepo="${2}"
+    # A local variable containing the message to be displayed
+    local str="Check for existing repository in ${1}"
+    # Show the message
+    echo -ne "  ${INFO} ${str}..."
+    # Check if the directory is a repository
+    if is_repo "${directory}"; then
+        # Show that we're checking it
+        echo -e "${OVER}  ${TICK} ${str}"
+        # Update the repo, returning an error message on failure
+        update_repo "${directory}" || { echo -e "\\n  ${COL_LIGHT_RED}Error: Could not update local repository. Contact support.${COL_NC}"; exit 1; }
+    # If it's not a .git repo,
+    else
+        # Show an error
+        echo -e "${OVER}  ${CROSS} ${str}"
+        # Attempt to make the repository, showing an error on failure
+        make_repo "${directory}" "${remoteRepo}" || { echo -e "\\n  ${COL_LIGHT_RED}Error: Could not update local repository. Contact support.${COL_NC}"; exit 1; }
+    fi
+    # echo a blank line
+    echo ""
+    # and return success?
+    return 0
 }
 
 # Reset a repo to get rid of any local changed
 resetRepo() {
-  # Use named variables for arguments
-  local directory="${1}"
-  # Move into the directory
-  cd "${directory}" &> /dev/null || return 1
-  # Store the message in a variable
-  str="Resetting repository within ${1}..."
-  # Show the message
-  echo -ne "  ${INFO} ${str}"
-  # Use git to remove the local changes
-  git reset --hard &> /dev/null || return $?
-  # And show the status
-  echo -e "${OVER}  ${TICK} ${str}"
-  # Returning success anyway?
-  return 0
+    # Use named variables for arguments
+    local directory="${1}"
+    # Move into the directory
+    cd "${directory}" &> /dev/null || return 1
+    # Store the message in a variable
+    str="Resetting repository within ${1}..."
+    # Show the message
+    echo -ne "  ${INFO} ${str}"
+    # Use git to remove the local changes
+    git reset --hard &> /dev/null || return $?
+    # And show the status
+    echo -e "${OVER}  ${TICK} ${str}"
+    # Returning success anyway?
+    return 0
 }
 
 # We need to know the IPv4 information so we can effectively setup the DNS server
 # Without this information, we won't know where to Pi-hole will be found
 find_IPv4_information() {
-  # Named, local variables
-  local route
-  # Find IP used to route to outside world by checking the the route to Google's public DNS server
-  route=$(ip route get 8.8.8.8)
-  # Use awk to strip out just the interface device as it is used in future commands
-  IPv4dev=$(awk '{for (i=1; i<=NF; i++) if ($i~/dev/) print $(i+1)}' <<< "${route}")
-  # Get just the IP address
-  IPv4bare=$(awk '{print $7}' <<< "${route}")
-  # Append the CIDR notation to the IP address
-  IPV4_ADDRESS=$(ip -o -f inet addr show | grep "${IPv4bare}" |  awk '{print $4}' | awk 'END {print}')
-  # Get the default gateway (the way to reach the Internet)
-  IPv4gw=$(awk '{print $3}' <<< "${route}")
-
+    # Named, local variables
+    local route
+    # Find IP used to route to outside world by checking the the route to Google's public DNS server
+    route=$(ip route get 8.8.8.8)
+    # Use awk to strip out just the interface device as it is used in future commands
+    IPv4dev=$(awk '{for (i=1; i<=NF; i++) if ($i~/dev/) print $(i+1)}' <<< "${route}")
+    # Get just the IP address
+    IPv4bare=$(awk '{print $7}' <<< "${route}")
+    # Append the CIDR notation to the IP address
+    IPV4_ADDRESS=$(ip -o -f inet addr show | grep "${IPv4bare}" |  awk '{print $4}' | awk 'END {print}')
+    # Get the default gateway (the way to reach the Internet)
+    IPv4gw=$(awk '{print $3}' <<< "${route}")
 }
 
 # Get available interfaces that are UP
 get_available_interfaces() {
-  # There may be more than one so it's all stored in a variable
-  availableInterfaces=$(ip --oneline link show up | grep -v "lo" | awk '{print $2}' | cut -d':' -f1 | cut -d'@' -f1)
+    # There may be more than one so it's all stored in a variable
+    availableInterfaces=$(ip --oneline link show up | grep -v "lo" | awk '{print $2}' | cut -d':' -f1 | cut -d'@' -f1)
 }
 
 # A function for displaying the dialogs the user sees when first running the installer
 welcomeDialogs() {
-  # Display the welcome dialog using an appropriately sized window via the calculation conducted earlier in the script
-  whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "\\n\\nThis installer will transform your device into a network-wide ad blocker!" ${r} ${c}
+    # Display the welcome dialog using an appropriately sized window via the calculation conducted earlier in the script
+    whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "\\n\\nThis installer will transform your device into a network-wide ad blocker!" ${r} ${c}
 
-  # Request that users donate if they enjoy the software since we all work on it in our free time
-  whiptail --msgbox --backtitle "Plea" --title "Free and open source" "\\n\\nThe Pi-hole is free, but powered by your donations:  http://pi-hole.net/donate" ${r} ${c}
+    # Request that users donate if they enjoy the software since we all work on it in our free time
+    whiptail --msgbox --backtitle "Plea" --title "Free and open source" "\\n\\nThe Pi-hole is free, but powered by your donations:  http://pi-hole.net/donate" ${r} ${c}
 
-  # Explain the need for a static address
-  whiptail --msgbox --backtitle "Initiating network interface" --title "Static IP Needed" "\\n\\nThe Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.
+    # Explain the need for a static address
+    whiptail --msgbox --backtitle "Initiating network interface" --title "Static IP Needed" "\\n\\nThe Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.
 
 In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." ${r} ${c}
 }
 
 # We need to make sure there is enough space before installing, so there is a function to check this
 verifyFreeDiskSpace() {
+    # 50MB is the minimum space needed (45MB install (includes web admin bootstrap/jquery libraries etc) + 5MB one day of logs.)
+    # - Fourdee: Local ensures the variable is only created, and accessible within this function/void. Generally considered a "good" coding practice for non-global variables.
+    local str="Disk space check"
+    # Required space in KB
+    local required_free_kilobytes=51200
+    # Calculate existing free space on this machine
+    local existing_free_kilobytes
+    existing_free_kilobytes=$(df -Pk | grep -m1 '\/$' | awk '{print $4}')
 
-  # 50MB is the minimum space needed (45MB install (includes web admin bootstrap/jquery libraries etc) + 5MB one day of logs.)
-  # - Fourdee: Local ensures the variable is only created, and accessible within this function/void. Generally considered a "good" coding practice for non-global variables.
-  local str="Disk space check"
-  # Required space in KB
-  local required_free_kilobytes=51200
-  # Calculate existing free space on this machine
-  local existing_free_kilobytes
-  existing_free_kilobytes=$(df -Pk | grep -m1 '\/$' | awk '{print $4}')
-
-  # If the existing space is not an integer,
-  if ! [[ "${existing_free_kilobytes}" =~ ^([0-9])+$ ]]; then
-    # show an error that we can't determine the free space
-    echo -e "  ${CROSS} ${str}
-      Unknown free disk space!
-      We were unable to determine available free disk space on this system.
-      You may override this check, however, it is not recommended
-      The option '${COL_LIGHT_RED}--i_do_not_follow_recommendations${COL_NC}' can override this
-      e.g: curl -L https://install.pi-hole.net | bash /dev/stdin ${COL_LIGHT_RED}<option>${COL_NC}"
-    # exit with an error code
-    exit 1
-  # If there is insufficient free disk space,
-  elif [[ "${existing_free_kilobytes}" -lt "${required_free_kilobytes}" ]]; then
-    # show an error message
-    echo -e "  ${CROSS} ${str}
-      Your system disk appears to only have ${existing_free_kilobytes} KB free
-      It is recommended to have a minimum of ${required_free_kilobytes} KB to run the Pi-hole"
-    # if the vcgencmd command exists,
-    if command -v vcgencmd &> /dev/null; then
-      # it's probably a Raspbian install, so show a message about expanding the filesystem
-      echo "      If this is a new install you may need to expand your disk
-      Run 'sudo raspi-config', and choose the 'expand file system' option
-      After rebooting, run this installation again
-      e.g: curl -L https://install.pi-hole.net | bash"
+    # If the existing space is not an integer,
+    if ! [[ "${existing_free_kilobytes}" =~ ^([0-9])+$ ]]; then
+        # show an error that we can't determine the free space
+        echo -e "  ${CROSS} ${str}"
+        echo -e "  ${INFO} Unknown free disk space!"
+        echo -e "  ${INFO} We were unable to determine available free disk space on this system."
+        echo -e "  ${INFO} You may override this check, however, it is not recommended"
+        echo -e "  ${INFO} The option '${COL_LIGHT_RED}--i_do_not_follow_recommendations${COL_NC}' can override this"
+        echo -e "  ${INFO} e.g: curl -L https://install.pi-hole.net | bash /dev/stdin ${COL_LIGHT_RED}<option>${COL_NC}"
+        # exit with an error code
+        exit 1
+    # If there is insufficient free disk space,
+    elif [[ "${existing_free_kilobytes}" -lt "${required_free_kilobytes}" ]]; then
+        # show an error message
+        echo -e "  ${CROSS} ${str}"
+        echo -e "  ${INFO} Your system disk appears to only have ${existing_free_kilobytes} KB free"
+        echo -e "  ${INFO} It is recommended to have a minimum of ${required_free_kilobytes} KB to run the Pi-hole"
+        # if the vcgencmd command exists,
+        if command -v vcgencmd &> /dev/null; then
+            # it's probably a Raspbian install, so show a message about expanding the filesystem
+            echo -e "  ${INFO} If this is a new install you may need to expand your disk"
+            echo -e "  ${INFO} Run 'sudo raspi-config', and choose the 'expand file system' option"
+            echo -e "  ${INFO} After rebooting, run this installation again"
+            echo -e "  ${INFO} e.g: curl -L https://install.pi-hole.net | bash"
+        fi
+        # Show there is not enough free space
+        echo -e "\\n      ${COL_LIGHT_RED}Insufficient free space, exiting...${COL_NC}"
+        # and exit with an error
+        exit 1
+    # Otherwise,
+    else
+        # Show that we're running a disk space check
+        echo -e "  ${TICK} ${str}"
     fi
-    # Show there is not enough free space
-    echo -e "\\n      ${COL_LIGHT_RED}Insufficient free space, exiting...${COL_NC}"
-    # and exit with an error
-    exit 1
-  # Otherwise,
-  else
-    # Show that we're running a disk space check
-    echo -e "  ${TICK} ${str}"
-  fi
 }
 
 # A function that let's the user pick an interface to use with Pi-hole
 chooseInterface() {
-  # Turn the available interfaces into an array so it can be used with a whiptail dialog
-  local interfacesArray=()
-  # Number of available interfaces
-  local interfaceCount
-  # Whiptail variable storage
-  local chooseInterfaceCmd
-  # Temporary Whiptail options storage
-  local chooseInterfaceOptions
-  # Loop sentinel variable
-  local firstLoop=1
+    # Turn the available interfaces into an array so it can be used with a whiptail dialog
+    local interfacesArray=()
+    # Number of available interfaces
+    local interfaceCount
+    # Whiptail variable storage
+    local chooseInterfaceCmd
+    # Temporary Whiptail options storage
+    local chooseInterfaceOptions
+    # Loop sentinel variable
+    local firstLoop=1
 
-  # Find out how many interfaces are available to choose from
-  interfaceCount=$(echo "${availableInterfaces}" | wc -l)
+    # Find out how many interfaces are available to choose from
+    interfaceCount=$(echo "${availableInterfaces}" | wc -l)
 
-  # If there is one interface,
-  if [[ "${interfaceCount}" -eq 1 ]]; then
-      # Set it as the interface to use since there is no other option
-      PIHOLE_INTERFACE="${availableInterfaces}"
-  # Otherwise,
-  else
-      # While reading through the available interfaces
-      while read -r line; do
-        # use a variable to set the option as OFF to begin with
-        mode="OFF"
-        # If it's the first loop,
-        if [[ "${firstLoop}" -eq 1 ]]; then
-          # set this as the interface to use (ON)
-          firstLoop=0
-          mode="ON"
-        fi
-        # Put all these interfaces into an array
-        interfacesArray+=("${line}" "available" "${mode}")
-      # Feed the available interfaces into this while loop
-      done <<< "${availableInterfaces}"
-      # The whiptail command that will be run, stored in a variable
-      chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface (press space to select)" ${r} ${c} ${interfaceCount})
-      # Now run the command using the interfaces saved into the array
-      chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty) || \
-      # If the user chooses Cancel, exit
-      { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
-      # For each interface
-      for desiredInterface in ${chooseInterfaceOptions}; do
-        # Set the one the user selected as the interface to use
-        PIHOLE_INTERFACE=${desiredInterface}
-        # and show this information to the user
-        echo -e "  ${INFO} Using interface: $PIHOLE_INTERFACE"
-      done
-  fi
+    # If there is one interface,
+    if [[ "${interfaceCount}" -eq 1 ]]; then
+        # Set it as the interface to use since there is no other option
+        PIHOLE_INTERFACE="${availableInterfaces}"
+    # Otherwise,
+    else
+        # While reading through the available interfaces
+        while read -r line; do
+            # use a variable to set the option as OFF to begin with
+            mode="OFF"
+            # If it's the first loop,
+            if [[ "${firstLoop}" -eq 1 ]]; then
+                # set this as the interface to use (ON)
+                firstLoop=0
+                mode="ON"
+            fi
+            # Put all these interfaces into an array
+            interfacesArray+=("${line}" "available" "${mode}")
+        # Feed the available interfaces into this while loop
+        done <<< "${availableInterfaces}"
+        # The whiptail command that will be run, stored in a variable
+        chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface (press space to select)" ${r} ${c} ${interfaceCount})
+        # Now run the command using the interfaces saved into the array
+        chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty) || \
+        # If the user chooses Cancel, exit
+        { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
+        # For each interface
+        for desiredInterface in ${chooseInterfaceOptions}; do
+            # Set the one the user selected as the interface to use
+            PIHOLE_INTERFACE=${desiredInterface}
+            # and show this information to the user
+            echo -e "  ${INFO} Using interface: $PIHOLE_INTERFACE"
+        done
+    fi
 }
 
 # This lets us prefer ULA addresses over GUA
 # This caused problems for some users when their ISP changed their IPv6 addresses
 # See https://github.com/pi-hole/pi-hole/issues/1473#issuecomment-301745953
 testIPv6() {
-  # first will contain fda2 (ULA)
-  first="$(cut -f1 -d":" <<< "$1")"
-  # value1 will contain 253 which is the decimal value corresponding to 0xfd
-  value1=$(( (0x$first)/256 ))
-  # will contain 162 which is the decimal value corresponding to 0xa2
-  value2=$(( (0x$first)%256 ))
-  # the ULA test is testing for fc00::/7 according to RFC 4193
-  if (( (value1&254)==252 )); then
-    echo "ULA"
-  fi
-  # the GUA test is testing for 2000::/3 according to RFC 4291
-  if (( (value1&112)==32 )); then
-    echo "GUA"
-  fi
-  # the LL test is testing for fe80::/10 according to RFC 4193
-  if (( (value1)==254 )) && (( (value2&192)==128 )); then
-    echo "Link-local"
-  fi
+    # first will contain fda2 (ULA)
+    first="$(cut -f1 -d":" <<< "$1")"
+    # value1 will contain 253 which is the decimal value corresponding to 0xfd
+    value1=$(( (0x$first)/256 ))
+    # will contain 162 which is the decimal value corresponding to 0xa2
+    value2=$(( (0x$first)%256 ))
+    # the ULA test is testing for fc00::/7 according to RFC 4193
+    if (( (value1&254)==252 )); then
+        echo "ULA"
+    fi
+    # the GUA test is testing for 2000::/3 according to RFC 4291
+    if (( (value1&112)==32 )); then
+        echo "GUA"
+    fi
+    # the LL test is testing for fe80::/10 according to RFC 4193
+    if (( (value1)==254 )) && (( (value2&192)==128 )); then
+        echo "Link-local"
+    fi
 }
 
 # A dialog for showing the user about IPv6 blocking
 useIPv6dialog() {
-  # Determine the IPv6 address used for blocking
-  IPV6_ADDRESSES=($(ip -6 address | grep 'scope global' | awk '{print $2}'))
+    # Determine the IPv6 address used for blocking
+    IPV6_ADDRESSES=($(ip -6 address | grep 'scope global' | awk '{print $2}'))
 
-  # For each address in the array above, determine the type of IPv6 address it is
-  for i in "${IPV6_ADDRESSES[@]}"; do
-    # Check if it's ULA, GUA, or LL by using the function created earlier
-    result=$(testIPv6 "$i")
-    # If it's a ULA address, use it and store it as a global variable
-    [[ "${result}" == "ULA" ]] && ULA_ADDRESS="${i%/*}"
-    # If it's a GUA address, we can still use it si store it as a global variable
-    [[ "${result}" == "GUA" ]] && GUA_ADDRESS="${i%/*}"
-  done
+    # For each address in the array above, determine the type of IPv6 address it is
+    for i in "${IPV6_ADDRESSES[@]}"; do
+        # Check if it's ULA, GUA, or LL by using the function created earlier
+        result=$(testIPv6 "$i")
+        # If it's a ULA address, use it and store it as a global variable
+        [[ "${result}" == "ULA" ]] && ULA_ADDRESS="${i%/*}"
+        # If it's a GUA address, we can still use it si store it as a global variable
+        [[ "${result}" == "GUA" ]] && GUA_ADDRESS="${i%/*}"
+    done
 
-  # Determine which address to be used: Prefer ULA over GUA or don't use any if none found
-  # If the ULA_ADDRESS contains a value,
-  if [[ ! -z "${ULA_ADDRESS}" ]]; then
-    # set the IPv6 address to the ULA address
-    IPV6_ADDRESS="${ULA_ADDRESS}"
-    # Show this info to the user
-    echo -e "  ${INFO} Found IPv6 ULA address, using it for blocking IPv6 ads"
-  # Otherwise, if the GUA_ADDRESS has a value,
-  elif [[ ! -z "${GUA_ADDRESS}" ]]; then
-    # Let the user know
-    echo -e "  ${INFO} Found IPv6 GUA address, using it for blocking IPv6 ads"
-    # And assign it to the global variable
-    IPV6_ADDRESS="${GUA_ADDRESS}"
-  # If none of those work,
-  else
-    # explain that IPv6 blocking will not be used
-    echo -e "  ${INFO} Unable to find IPv6 ULA/GUA address, IPv6 adblocking will not be enabled"
-    # So set the variable to be empty
-    IPV6_ADDRESS=""
-  fi
+    # Determine which address to be used: Prefer ULA over GUA or don't use any if none found
+    # If the ULA_ADDRESS contains a value,
+    if [[ ! -z "${ULA_ADDRESS}" ]]; then
+        # set the IPv6 address to the ULA address
+        IPV6_ADDRESS="${ULA_ADDRESS}"
+        # Show this info to the user
+        echo -e "  ${INFO} Found IPv6 ULA address, using it for blocking IPv6 ads"
+    # Otherwise, if the GUA_ADDRESS has a value,
+    elif [[ ! -z "${GUA_ADDRESS}" ]]; then
+        # Let the user know
+        echo -e "  ${INFO} Found IPv6 GUA address, using it for blocking IPv6 ads"
+        # And assign it to the global variable
+        IPV6_ADDRESS="${GUA_ADDRESS}"
+    # If none of those work,
+    else
+        # explain that IPv6 blocking will not be used
+        echo -e "  ${INFO} Unable to find IPv6 ULA/GUA address, IPv6 adblocking will not be enabled"
+        # So set the variable to be empty
+        IPV6_ADDRESS=""
+    fi
 
-  # If the IPV6_ADDRESS contains a value
-  if [[ ! -z "${IPV6_ADDRESS}" ]]; then
-    # Display that IPv6 is supported and will be used
-    whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$IPV6_ADDRESS will be used to block ads." ${r} ${c}
-  fi
+    # If the IPV6_ADDRESS contains a value
+    if [[ ! -z "${IPV6_ADDRESS}" ]]; then
+        # Display that IPv6 is supported and will be used
+        whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$IPV6_ADDRESS will be used to block ads." ${r} ${c}
+    fi
 }
 
 # A function to check if we should use IPv4 and/or IPv6 for blocking ads
 use4andor6() {
-  # Named local variables
-  local useIPv4
-  local useIPv6
-  # Let use select IPv4 and/or IPv6 via a checklist
-  cmd=(whiptail --separate-output --checklist "Select Protocols (press space to select)" ${r} ${c} 2)
-  # In an array, show the options available:
-  # IPv4 (on by default)
-  options=(IPv4 "Block ads over IPv4" on
-  # or IPv6 (on by default if available)
-  IPv6 "Block ads over IPv6" on)
-  # In a variable, show the choices available; exit if Cancel is selected
-  choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) || { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
-  # For each choice available,
-  for choice in ${choices}
-  do
-    # Set the values to true
-    case ${choice} in
-    IPv4  )   useIPv4=true;;
-    IPv6  )   useIPv6=true;;
-    esac
-  done
-  # If IPv4 is to be used,
-  if [[ "${useIPv4}" ]]; then
-    # Run our function to get the information we need
-    find_IPv4_information
-    getStaticIPv4Settings
-    setStaticIPv4
-  fi
-  # If IPv6 is to be used,
-  if [[ "${useIPv6}" ]]; then
-    # Run our function to get this information
-    useIPv6dialog
-  fi
-  # Echo the information to the user
+    # Named local variables
+    local useIPv4
+    local useIPv6
+    # Let use select IPv4 and/or IPv6 via a checklist
+    cmd=(whiptail --separate-output --checklist "Select Protocols (press space to select)" ${r} ${c} 2)
+    # In an array, show the options available:
+    # IPv4 (on by default)
+    options=(IPv4 "Block ads over IPv4" on
+    # or IPv6 (on by default if available)
+    IPv6 "Block ads over IPv6" on)
+    # In a variable, show the choices available; exit if Cancel is selected
+    choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) || { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
+    # For each choice available,
+    for choice in ${choices}
+    do
+        # Set the values to true
+        case ${choice} in
+        IPv4  )   useIPv4=true;;
+        IPv6  )   useIPv6=true;;
+        esac
+    done
+    # If IPv4 is to be used,
+    if [[ "${useIPv4}" ]]; then
+        # Run our function to get the information we need
+        find_IPv4_information
+        getStaticIPv4Settings
+        setStaticIPv4
+    fi
+    # If IPv6 is to be used,
+    if [[ "${useIPv6}" ]]; then
+        # Run our function to get this information
+        useIPv6dialog
+    fi
+    # Echo the information to the user
     echo -e "  ${INFO} IPv4 address: ${IPV4_ADDRESS}"
     echo -e "  ${INFO} IPv6 address: ${IPV6_ADDRESS}"
-  # If neither protocol is selected,
-  if [[ ! "${useIPv4}" ]] && [[ ! "${useIPv6}" ]]; then
-    # Show an error in red
-    echo -e "  ${COL_LIGHT_RED}Error: Neither IPv4 or IPv6 selected${COL_NC}"
-    # and exit with an error
-    exit 1
-  fi
+    # If neither protocol is selected,
+    if [[ ! "${useIPv4}" ]] && [[ ! "${useIPv6}" ]]; then
+        # Show an error in red
+        echo -e "  ${COL_LIGHT_RED}Error: Neither IPv4 or IPv6 selected${COL_NC}"
+        # and exit with an error
+        exit 1
+    fi
 }
 
 #
 getStaticIPv4Settings() {
-  # Local, named variables
-  local ipSettingsCorrect
-  # Ask if the user wants to use DHCP settings as their static IP
-  # This is useful for users that are using DHCP reservations; then we can just use the information gathered via our functions
-  if whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
+    # Local, named variables
+    local ipSettingsCorrect
+    # Ask if the user wants to use DHCP settings as their static IP
+    # This is useful for users that are using DHCP reservations; then we can just use the information gathered via our functions
+    if whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
           IP address:    ${IPV4_ADDRESS}
           Gateway:       ${IPv4gw}" ${r} ${c}; then
-    # If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict.
-    whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict.  But in most cases the router is smart enough to not do that.
+        # If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict.
+        whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict.  But in most cases the router is smart enough to not do that.
 If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.
 It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." ${r} ${c}
-  # Nothing else to do since the variables are already set above
-  else
+    # Nothing else to do since the variables are already set above
+    else
     # Otherwise, we need to ask the user to input their desired settings.
     # Start by getting the IPv4 address (pre-filling it with info gathered from DHCP)
     # Start a loop to let the user enter their information with the chance to go back and edit it if necessary
     until [[ "${ipSettingsCorrect}" = True ]]; do
 
-      # Ask for the IPv4 address
-      IPV4_ADDRESS=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" ${r} ${c} "${IPV4_ADDRESS}" 3>&1 1>&2 2>&3) || \
-      # Cancelling IPv4 settings window
-      { ipSettingsCorrect=False; echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
-      echo -e "  ${INFO} Your static IPv4 address: ${IPV4_ADDRESS}"
+        # Ask for the IPv4 address
+        IPV4_ADDRESS=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" ${r} ${c} "${IPV4_ADDRESS}" 3>&1 1>&2 2>&3) || \
+        # Cancelling IPv4 settings window
+        { ipSettingsCorrect=False; echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
+        echo -e "  ${INFO} Your static IPv4 address: ${IPV4_ADDRESS}"
 
-      # Ask for the gateway
-      IPv4gw=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" ${r} ${c} "${IPv4gw}" 3>&1 1>&2 2>&3) || \
-      # Cancelling gateway settings window
-      { ipSettingsCorrect=False; echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
-      echo -e "  ${INFO} Your static IPv4 gateway: ${IPv4gw}"
+        # Ask for the gateway
+        IPv4gw=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" ${r} ${c} "${IPv4gw}" 3>&1 1>&2 2>&3) || \
+        # Cancelling gateway settings window
+        { ipSettingsCorrect=False; echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
+        echo -e "  ${INFO} Your static IPv4 gateway: ${IPv4gw}"
 
-      # Give the user a chance to review their settings before moving on
-      if whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
-        IP address: ${IPV4_ADDRESS}
-        Gateway:    ${IPv4gw}" ${r} ${c}; then
-        # After that's done, the loop ends and we move on
-        ipSettingsCorrect=True
+        # Give the user a chance to review their settings before moving on
+        if whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
+            IP address: ${IPV4_ADDRESS}
+            Gateway:    ${IPv4gw}" ${r} ${c}; then
+                # After that's done, the loop ends and we move on
+                ipSettingsCorrect=True
         else
-        # If the settings are wrong, the loop continues
-        ipSettingsCorrect=False
-      fi
+            # If the settings are wrong, the loop continues
+            ipSettingsCorrect=False
+        fi
     done
     # End the if statement for DHCP vs. static
-  fi
+    fi
 }
 
 # dhcpcd is very annoying,
 setDHCPCD() {
-  # but we can append these lines to dhcpcd.conf to enable a static IP
-  echo "interface ${PIHOLE_INTERFACE}
-  static ip_address=${IPV4_ADDRESS}
-  static routers=${IPv4gw}
-  static domain_name_servers=127.0.0.1" | tee -a /etc/dhcpcd.conf >/dev/null
+    # but we can append these lines to dhcpcd.conf to enable a static IP
+    echo "interface ${PIHOLE_INTERFACE}
+    static ip_address=${IPV4_ADDRESS}
+    static routers=${IPv4gw}
+    static domain_name_servers=127.0.0.1" | tee -a /etc/dhcpcd.conf >/dev/null
 }
 
 setStaticIPv4() {
-  # Local, named variables
-  local IFCFG_FILE
-  local IPADDR
-  local CIDR
-  # For the Debian family, if dhcpcd.conf exists,
-  if [[ -f "/etc/dhcpcd.conf" ]]; then
-    # check if the IP is already in the file
-    if grep -q "${IPV4_ADDRESS}" /etc/dhcpcd.conf; then
-      echo -e "  ${INFO} Static IP already configured"
-    # If it's not,
+    # Local, named variables
+    local IFCFG_FILE
+    local IPADDR
+    local CIDR
+    # For the Debian family, if dhcpcd.conf exists,
+    if [[ -f "/etc/dhcpcd.conf" ]]; then
+        # check if the IP is already in the file
+        if grep -q "${IPV4_ADDRESS}" /etc/dhcpcd.conf; then
+            echo -e "  ${INFO} Static IP already configured"
+        # If it's not,
+        else
+            # set it using our function
+            setDHCPCD
+            # Then use the ip command to immediately set the new address
+            ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
+            # Also give a warning that the user may need to reboot their system
+            echo -e "  ${TICK} Set IP address to ${IPV4_ADDRESS%/*}
+            You may need to restart after the install is complete"
+        fi
+    # If it's not Debian, check if it's the Fedora family by checking for the file below
+    elif [[ -f "/etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE}" ]];then
+        # If it exists,
+        IFCFG_FILE=/etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE}
+        IPADDR=$(echo "${IPV4_ADDRESS}" | cut -f1 -d/)
+        # check if the desired IP is already set
+        if grep -Eq "${IPADDR}(\\b|\\/)" "${IFCFG_FILE}"; then
+            echo -e "  ${INFO} Static IP already configured"
+        # Otherwise,
+        else
+            # Put the IP in variables without the CIDR notation
+            CIDR=$(echo "${IPV4_ADDRESS}" | cut -f2 -d/)
+            # Backup existing interface configuration:
+            cp "${IFCFG_FILE}" "${IFCFG_FILE}".pihole.orig
+            # Build Interface configuration file using the GLOBAL variables we have
+            {
+            echo "# Configured via Pi-hole installer"
+            echo "DEVICE=$PIHOLE_INTERFACE"
+            echo "BOOTPROTO=none"
+            echo "ONBOOT=yes"
+            echo "IPADDR=$IPADDR"
+            echo "PREFIX=$CIDR"
+            echo "GATEWAY=$IPv4gw"
+            echo "DNS1=$PIHOLE_DNS_1"
+            echo "DNS2=$PIHOLE_DNS_2"
+            echo "USERCTL=no"
+            }> "${IFCFG_FILE}"
+            # Use ip to immediately set the new address
+            ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
+            # If NetworkMangler command line interface exists and ready to mangle,
+            if command -v nmcli &> /dev/null && nmcli general status &> /dev/null; then
+                # Tell NetworkManagler to read our new sysconfig file
+                nmcli con load "${IFCFG_FILE}" > /dev/null
+            fi
+            # Show a warning that the user may need to restart
+            echo -e "  ${TICK} Set IP address to ${IPV4_ADDRESS%/*}
+            You may need to restart after the install is complete"
+        fi
+    # If all that fails,
     else
-      # set it using our function
-      setDHCPCD
-      # Then use the ip command to immediately set the new address
-      ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
-      # Also give a warning that the user may need to reboot their system
-      echo -e "  ${TICK} Set IP address to ${IPV4_ADDRESS%/*}
-      You may need to restart after the install is complete"
+        # show an error and exit
+        echo -e "  ${INFO} Warning: Unable to locate configuration file to set static IPv4 address"
+        exit 1
     fi
-  # If it's not Debian, check if it's the Fedora family by checking for the file below
-  elif [[ -f "/etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE}" ]];then
-    # If it exists,
-    IFCFG_FILE=/etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE}
-    IPADDR=$(echo "${IPV4_ADDRESS}" | cut -f1 -d/)
-    # check if the desired IP is already set
-    if grep -Eq "${IPADDR}(\\b|\\/)" "${IFCFG_FILE}"; then
-      echo -e "  ${INFO} Static IP already configured"
-    # Otherwise,
-    else
-      # Put the IP in variables without the CIDR notation
-      CIDR=$(echo "${IPV4_ADDRESS}" | cut -f2 -d/)
-      # Backup existing interface configuration:
-      cp "${IFCFG_FILE}" "${IFCFG_FILE}".pihole.orig
-      # Build Interface configuration file using the GLOBAL variables we have
-      {
-        echo "# Configured via Pi-hole installer"
-        echo "DEVICE=$PIHOLE_INTERFACE"
-        echo "BOOTPROTO=none"
-        echo "ONBOOT=yes"
-        echo "IPADDR=$IPADDR"
-        echo "PREFIX=$CIDR"
-        echo "GATEWAY=$IPv4gw"
-        echo "DNS1=$PIHOLE_DNS_1"
-        echo "DNS2=$PIHOLE_DNS_2"
-        echo "USERCTL=no"
-      }> "${IFCFG_FILE}"
-      # Use ip to immediately set the new address
-      ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
-      # If NetworkMangler command line interface exists and ready to mangle,
-      if command -v nmcli &> /dev/null && nmcli general status &> /dev/null; then
-        # Tell NetworkManagler to read our new sysconfig file
-        nmcli con load "${IFCFG_FILE}" > /dev/null
-      fi
-      # Show a warning that the user may need to restart
-      echo -e "  ${TICK} Set IP address to ${IPV4_ADDRESS%/*}
-      You may need to restart after the install is complete"
-    fi
-  # If all that fails,
-  else
-    # show an error and exit
-    echo -e "  ${INFO} Warning: Unable to locate configuration file to set static IPv4 address"
-    exit 1
-  fi
 }
 
 # Check an IP address to see if it is a valid one
 valid_ip() {
-  # Local, named variables
-  local ip=${1}
-  local stat=1
+    # Local, named variables
+    local ip=${1}
+    local stat=1
 
-  # If the IP matches the format xxx.xxx.xxx.xxx,
-  if [[ "${ip}" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-    # Save the old Internal Field Separator in a variable
-    OIFS=$IFS
-    # and set the new one to a dot (period)
-    IFS='.'
-    # Put the IP into an array
-    ip=(${ip})
-    # Restore the IFS to what it was
-    IFS=${OIFS}
-    ## Evaluate each octet by checking if it's less than or equal to 255 (the max for each octet)
-    [[ "${ip[0]}" -le 255 && "${ip[1]}" -le 255 \
-    && "${ip[2]}" -le 255 && "${ip[3]}" -le 255 ]]
-    # Save the exit code
-    stat=$?
-  fi
-  # Return the exit code
-  return ${stat}
+    # If the IP matches the format xxx.xxx.xxx.xxx,
+    if [[ "${ip}" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+        # Save the old Internal Field Separator in a variable
+        OIFS=$IFS
+        # and set the new one to a dot (period)
+        IFS='.'
+        # Put the IP into an array
+        ip=(${ip})
+        # Restore the IFS to what it was
+        IFS=${OIFS}
+        ## Evaluate each octet by checking if it's less than or equal to 255 (the max for each octet)
+        [[ "${ip[0]}" -le 255 && "${ip[1]}" -le 255 \
+        && "${ip[2]}" -le 255 && "${ip[3]}" -le 255 ]]
+        # Save the exit code
+        stat=$?
+    fi
+    # Return the exit code
+    return ${stat}
 }
 
 # A function to choose the upstream DNS provider(s)
 setDNS() {
-  # Local, named variables
-  local DNSSettingsCorrect
+    # Local, named variables
+    local DNSSettingsCorrect
 
-  # In an array, list the available upstream providers
-  DNSChooseOptions=(Google ""
-      OpenDNS ""
-      Level3 ""
-      Norton ""
-      Comodo ""
-      DNSWatch ""
-      Quad9 ""
-      FamilyShield ""
-      Cloudflare ""
-      Custom "")
-  # In a whiptail dialog, show the options
-  DNSchoices=$(whiptail --separate-output --menu "Select Upstream DNS Provider. To use your own, select Custom." ${r} ${c} 7 \
+    # In an array, list the available upstream providers
+    DNSChooseOptions=(Google ""
+        OpenDNS ""
+        Level3 ""
+        Norton ""
+        Comodo ""
+        DNSWatch ""
+        Quad9 ""
+        FamilyShield ""
+        Cloudflare ""
+        Custom "")
+    # In a whiptail dialog, show the options
+    DNSchoices=$(whiptail --separate-output --menu "Select Upstream DNS Provider. To use your own, select Custom." ${r} ${c} 7 \
     "${DNSChooseOptions[@]}" 2>&1 >/dev/tty) || \
     # exit if Cancel is selected
     { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
 
-  # Display the selection
-  echo -ne "  ${INFO} Using "
-  # Depending on the user's choice, set the GLOBAl variables to the IP of the respective provider
-  case ${DNSchoices} in
-    Google)
-      echo "Google DNS servers"
-      PIHOLE_DNS_1="8.8.8.8"
-      PIHOLE_DNS_2="8.8.4.4"
-      ;;
-    OpenDNS)
-      echo "OpenDNS servers"
-      PIHOLE_DNS_1="208.67.222.222"
-      PIHOLE_DNS_2="208.67.220.220"
-      ;;
-    Level3)
-      echo "Level3 servers"
-      PIHOLE_DNS_1="4.2.2.1"
-      PIHOLE_DNS_2="4.2.2.2"
-      ;;
-    Norton)
-      echo "Norton ConnectSafe servers"
-      PIHOLE_DNS_1="199.85.126.10"
-      PIHOLE_DNS_2="199.85.127.10"
-      ;;
-    Comodo)
-      echo "Comodo Secure servers"
-      PIHOLE_DNS_1="8.26.56.26"
-      PIHOLE_DNS_2="8.20.247.20"
-      ;;
-    DNSWatch)
-      echo "DNS.WATCH servers"
-      PIHOLE_DNS_1="84.200.69.80"
-      PIHOLE_DNS_2="84.200.70.40"
-      ;;
-    Quad9)
-      echo "Quad9 servers"
-      PIHOLE_DNS_1="9.9.9.9"
-      PIHOLE_DNS_2="149.112.112.112"
-      ;;
-    FamilyShield)
-      echo "FamilyShield servers"
-      PIHOLE_DNS_1="208.67.222.123"
-      PIHOLE_DNS_2="208.67.220.123"
-      ;;
-    Cloudflare)
-      echo "Cloudflare servers"
-      PIHOLE_DNS_1="1.1.1.1"
-      PIHOLE_DNS_2="1.0.0.1"
-      ;;
-    Custom)
-      # Until the DNS settings are selected,
-      until [[ "${DNSSettingsCorrect}" = True ]]; do
-      #
-      strInvalid="Invalid"
-      # If the first
-      if [[ ! "${PIHOLE_DNS_1}" ]]; then
-        # and second upstream servers do not exist
-        if [[ ! "${PIHOLE_DNS_2}" ]]; then
-          #
-          prePopulate=""
-        # Otherwise,
-        else
-          #
-          prePopulate=", ${PIHOLE_DNS_2}"
-        fi
-      #
-      elif  [[ "${PIHOLE_DNS_1}" ]] && [[ ! "${PIHOLE_DNS_2}" ]]; then
-        #
-        prePopulate="${PIHOLE_DNS_1}"
-      #
-      elif [[ "${PIHOLE_DNS_1}" ]] && [[ "${PIHOLE_DNS_2}" ]]; then
-        #
-        prePopulate="${PIHOLE_DNS_1}, ${PIHOLE_DNS_2}"
-      fi
+    # Display the selection
+    echo -ne "  ${INFO} Using "
+    # Depending on the user's choice, set the GLOBAl variables to the IP of the respective provider
+    case ${DNSchoices} in
+        Google)
+            echo "Google DNS servers"
+            PIHOLE_DNS_1="8.8.8.8"
+            PIHOLE_DNS_2="8.8.4.4"
+            ;;
+        OpenDNS)
+            echo "OpenDNS servers"
+            PIHOLE_DNS_1="208.67.222.222"
+            PIHOLE_DNS_2="208.67.220.220"
+            ;;
+        Level3)
+            echo "Level3 servers"
+            PIHOLE_DNS_1="4.2.2.1"
+            PIHOLE_DNS_2="4.2.2.2"
+            ;;
+        Norton)
+            echo "Norton ConnectSafe servers"
+            PIHOLE_DNS_1="199.85.126.10"
+            PIHOLE_DNS_2="199.85.127.10"
+            ;;
+        Comodo)
+            echo "Comodo Secure servers"
+            PIHOLE_DNS_1="8.26.56.26"
+            PIHOLE_DNS_2="8.20.247.20"
+            ;;
+        DNSWatch)
+            echo "DNS.WATCH servers"
+            PIHOLE_DNS_1="84.200.69.80"
+            PIHOLE_DNS_2="84.200.70.40"
+            ;;
+        Quad9)
+            echo "Quad9 servers"
+            PIHOLE_DNS_1="9.9.9.9"
+            PIHOLE_DNS_2="149.112.112.112"
+            ;;
+        FamilyShield)
+            echo "FamilyShield servers"
+            PIHOLE_DNS_1="208.67.222.123"
+            PIHOLE_DNS_2="208.67.220.123"
+            ;;
+        Cloudflare)
+            echo "Cloudflare servers"
+            PIHOLE_DNS_1="1.1.1.1"
+            PIHOLE_DNS_2="1.0.0.1"
+            ;;
+        Custom)
+            # Until the DNS settings are selected,
+            until [[ "${DNSSettingsCorrect}" = True ]]; do
+                #
+                strInvalid="Invalid"
+                # If the first
+                if [[ ! "${PIHOLE_DNS_1}" ]]; then
+                    # and second upstream servers do not exist
+                    if [[ ! "${PIHOLE_DNS_2}" ]]; then
+                        #
+                        prePopulate=""
+                    # Otherwise,
+                    else
+                        #
+                        prePopulate=", ${PIHOLE_DNS_2}"
+                    fi
+                #
+                elif  [[ "${PIHOLE_DNS_1}" ]] && [[ ! "${PIHOLE_DNS_2}" ]]; then
+                    #
+                    prePopulate="${PIHOLE_DNS_1}"
+                #
+                elif [[ "${PIHOLE_DNS_1}" ]] && [[ "${PIHOLE_DNS_2}" ]]; then
+                    #
+                    prePopulate="${PIHOLE_DNS_1}, ${PIHOLE_DNS_2}"
+                fi
 
-      # Dialog for the user to enter custom upstream servers
-      piholeDNS=$(whiptail --backtitle "Specify Upstream DNS Provider(s)"  --inputbox "Enter your desired upstream DNS provider(s), separated by a comma.\\n\\nFor example '8.8.8.8, 8.8.4.4'" ${r} ${c} "${prePopulate}" 3>&1 1>&2 2>&3) || \
-      { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
-      #
-      PIHOLE_DNS_1=$(echo "${piholeDNS}" | sed 's/[, \t]\+/,/g' | awk -F, '{print$1}')
-      PIHOLE_DNS_2=$(echo "${piholeDNS}" | sed 's/[, \t]\+/,/g' | awk -F, '{print$2}')
-      # If the IP is valid,
-      if ! valid_ip "${PIHOLE_DNS_1}" || [[ ! "${PIHOLE_DNS_1}" ]]; then
-        # store it in the variable so we can use it
-        PIHOLE_DNS_1=${strInvalid}
-      fi
-      # Do the same for the secondary server
-      if ! valid_ip "${PIHOLE_DNS_2}" && [[ "${PIHOLE_DNS_2}" ]]; then
-        PIHOLE_DNS_2=${strInvalid}
-      fi
-      # If either of the DNS servers are invalid,
-      if [[ "${PIHOLE_DNS_1}" == "${strInvalid}" ]] || [[ "${PIHOLE_DNS_2}" == "${strInvalid}" ]]; then
-        # explain this to the user
-        whiptail --msgbox --backtitle "Invalid IP" --title "Invalid IP" "One or both entered IP addresses were invalid. Please try again.\\n\\n    DNS Server 1:   $PIHOLE_DNS_1\\n    DNS Server 2:   ${PIHOLE_DNS_2}" ${r} ${c}
-        # and set the variables back to nothing
-        if [[ "${PIHOLE_DNS_1}" == "${strInvalid}" ]]; then
-          PIHOLE_DNS_1=""
-        fi
-        if [[ "${PIHOLE_DNS_2}" == "${strInvalid}" ]]; then
-          PIHOLE_DNS_2=""
-        fi
-        # Since the settings will not work, stay in the loop
-        DNSSettingsCorrect=False
-      # Otherwise,
-      else
-        # Show the settings
-        if (whiptail --backtitle "Specify Upstream DNS Provider(s)" --title "Upstream DNS Provider(s)" --yesno "Are these settings correct?\\n    DNS Server 1:   $PIHOLE_DNS_1\\n    DNS Server 2:   ${PIHOLE_DNS_2}" ${r} ${c}); then
-        # and break from the loop since the servers are valid
-        DNSSettingsCorrect=True
-      # Otherwise,
-      else
-        # If the settings are wrong, the loop continues
-        DNSSettingsCorrect=False
-        fi
-      fi
-      done
-      ;;
-  esac
+                # Dialog for the user to enter custom upstream servers
+                piholeDNS=$(whiptail --backtitle "Specify Upstream DNS Provider(s)"  --inputbox "Enter your desired upstream DNS provider(s), separated by a comma.\\n\\nFor example '8.8.8.8, 8.8.4.4'" ${r} ${c} "${prePopulate}" 3>&1 1>&2 2>&3) || \
+                { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
+                #
+                PIHOLE_DNS_1=$(echo "${piholeDNS}" | sed 's/[, \t]\+/,/g' | awk -F, '{print$1}')
+                PIHOLE_DNS_2=$(echo "${piholeDNS}" | sed 's/[, \t]\+/,/g' | awk -F, '{print$2}')
+                # If the IP is valid,
+                if ! valid_ip "${PIHOLE_DNS_1}" || [[ ! "${PIHOLE_DNS_1}" ]]; then
+                    # store it in the variable so we can use it
+                    PIHOLE_DNS_1=${strInvalid}
+                fi
+                # Do the same for the secondary server
+                if ! valid_ip "${PIHOLE_DNS_2}" && [[ "${PIHOLE_DNS_2}" ]]; then
+                    PIHOLE_DNS_2=${strInvalid}
+                fi
+                # If either of the DNS servers are invalid,
+                if [[ "${PIHOLE_DNS_1}" == "${strInvalid}" ]] || [[ "${PIHOLE_DNS_2}" == "${strInvalid}" ]]; then
+                    # explain this to the user
+                    whiptail --msgbox --backtitle "Invalid IP" --title "Invalid IP" "One or both entered IP addresses were invalid. Please try again.\\n\\n    DNS Server 1:   $PIHOLE_DNS_1\\n    DNS Server 2:   ${PIHOLE_DNS_2}" ${r} ${c}
+                    # and set the variables back to nothing
+                    if [[ "${PIHOLE_DNS_1}" == "${strInvalid}" ]]; then
+                        PIHOLE_DNS_1=""
+                    fi
+                    if [[ "${PIHOLE_DNS_2}" == "${strInvalid}" ]]; then
+                        PIHOLE_DNS_2=""
+                    fi
+                # Since the settings will not work, stay in the loop
+                DNSSettingsCorrect=False
+                # Otherwise,
+                else
+                    # Show the settings
+                    if (whiptail --backtitle "Specify Upstream DNS Provider(s)" --title "Upstream DNS Provider(s)" --yesno "Are these settings correct?\\n    DNS Server 1:   $PIHOLE_DNS_1\\n    DNS Server 2:   ${PIHOLE_DNS_2}" ${r} ${c}); then
+                    # and break from the loop since the servers are valid
+                    DNSSettingsCorrect=True
+                    # Otherwise,
+                    else
+                        # If the settings are wrong, the loop continues
+                        DNSSettingsCorrect=False
+                    fi
+                fi
+            done
+            ;;
+    esac
 }
 
 # Allow the user to enable/disable logging
 setLogging() {
-  # Local, named variables
-  local LogToggleCommand
-  local LogChooseOptions
-  local LogChoices
+    # Local, named variables
+    local LogToggleCommand
+    local LogChooseOptions
+    local LogChoices
 
-  # Ask if the user wants to log queries
-  LogToggleCommand=(whiptail --separate-output --radiolist "Do you want to log queries?\\n (Disabling will render graphs on the Admin page useless):" ${r} ${c} 6)
-  # The default selection is on
-  LogChooseOptions=("On (Recommended)" "" on
-      Off "" off)
-  # Get the user's choice
-  LogChoices=$("${LogToggleCommand[@]}" "${LogChooseOptions[@]}" 2>&1 >/dev/tty) || (echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}" && exit 1)
+    # Ask if the user wants to log queries
+    LogToggleCommand=(whiptail --separate-output --radiolist "Do you want to log queries?" "${r}" "${c}" 6)
+    # The default selection is on
+    LogChooseOptions=("On (Recommended)" "" on
+        Off "" off)
+    # Get the user's choice
+    LogChoices=$("${LogToggleCommand[@]}" "${LogChooseOptions[@]}" 2>&1 >/dev/tty) || (echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}" && exit 1)
     case ${LogChoices} in
-      # If it's on
-      "On (Recommended)")
-        echo -e "  ${INFO} Logging On."
-        # Set the GLOBAL variable to true so we know what they selected
-        QUERY_LOGGING=true
-        ;;
-      # Otherwise, it's off,
-      Off)
-        echo -e "  ${INFO} Logging Off."
-        # So set it to false
-        QUERY_LOGGING=false
-        ;;
+        # If it's on
+        "On (Recommended)")
+            echo -e "  ${INFO} Logging On."
+            # Set the GLOBAL variable to true so we know what they selected
+            QUERY_LOGGING=true
+            ;;
+        # Otherwise, it's off,
+        Off)
+            echo -e "  ${INFO} Logging Off."
+            # So set it to false
+            QUERY_LOGGING=false
+            ;;
     esac
 }
 
 # Function to ask the user if they want to install the dashboard
 setAdminFlag() {
-  # Local, named variables
-  local WebToggleCommand
-  local WebChooseOptions
-  local WebChoices
+    # Local, named variables
+    local WebToggleCommand
+    local WebChooseOptions
+    local WebChoices
 
-  # Similar to the logging function, ask what the user wants
-  WebToggleCommand=(whiptail --separate-output --radiolist "Do you wish to install the web admin interface?" ${r} ${c} 6)
-  # with the default being enabled
-  WebChooseOptions=("On (Recommended)" "" on
-      Off "" off)
-  WebChoices=$("${WebToggleCommand[@]}" "${WebChooseOptions[@]}" 2>&1 >/dev/tty) || (echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}" && exit 1)
-    # Depending on their choice
-    case ${WebChoices} in
-      "On (Recommended)")
-        echo -e "  ${INFO} Web Interface On"
-        # Set it to true
-        INSTALL_WEB_INTERFACE=true
-        ;;
-      Off)
-        echo -e "  ${INFO} Web Interface Off"
-        # or false
-        INSTALL_WEB_INTERFACE=false
-        ;;
-    esac
-
-  # Request user to install web server, if --disable-install-webserver has not been used (INSTALL_WEB_SERVER=true is default).
-  if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
-    WebToggleCommand=(whiptail --separate-output --radiolist "Do you wish to install the web server (lighttpd)?\\n\\nNB: If you disable this, and, do not have an existing webserver installed, the web interface will not function." "${r}" "${c}" 6)
+    # Similar to the logging function, ask what the user wants
+    WebToggleCommand=(whiptail --separate-output --radiolist "Do you wish to install the web admin interface?" ${r} ${c} 6)
     # with the default being enabled
     WebChooseOptions=("On (Recommended)" "" on
         Off "" off)
     WebChoices=$("${WebToggleCommand[@]}" "${WebChooseOptions[@]}" 2>&1 >/dev/tty) || (echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}" && exit 1)
     # Depending on their choice
     case ${WebChoices} in
-      "On (Recommended)")
-        echo -e "  ${INFO} Web Server On"
-        # set it to true, as clearly seen below.
-        INSTALL_WEB_SERVER=true
-        ;;
-      Off)
-        echo -e "  ${INFO} Web Server Off"
-        # or false
-        INSTALL_WEB_SERVER=false
-        ;;
+        "On (Recommended)")
+            echo -e "  ${INFO} Web Interface On"
+            # Set it to true
+            INSTALL_WEB_INTERFACE=true
+            ;;
+        Off)
+            echo -e "  ${INFO} Web Interface Off"
+            # or false
+            INSTALL_WEB_INTERFACE=false
+            ;;
     esac
-  fi
+
+    # Request user to install web server, if --disable-install-webserver has not been used (INSTALL_WEB_SERVER=true is default).
+    if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+        WebToggleCommand=(whiptail --separate-output --radiolist "Do you wish to install the web server (lighttpd)?\\n\\nNB: If you disable this, and, do not have an existing webserver installed, the web interface will not function." "${r}" "${c}" 6)
+        # with the default being enabled
+        WebChooseOptions=("On (Recommended)" "" on
+            Off "" off)
+        WebChoices=$("${WebToggleCommand[@]}" "${WebChooseOptions[@]}" 2>&1 >/dev/tty) || (echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}" && exit 1)
+        # Depending on their choice
+        case ${WebChoices} in
+            "On (Recommended)")
+                echo -e "  ${INFO} Web Server On"
+                # set it to true, as clearly seen below.
+                INSTALL_WEB_SERVER=true
+                ;;
+            Off)
+                echo -e "  ${INFO} Web Server Off"
+                # or false
+                INSTALL_WEB_SERVER=false
+                ;;
+        esac
+    fi
 }
 
 # A function to display a list of example blocklists for users to select
 chooseBlocklists() {
-  # Back up any existing adlist file, on the off chance that it exists. Useful in case of a reconfigure.
-  if [[ -f "${adlistFile}" ]]; then
-    mv "${adlistFile}" "${adlistFile}.old"
-  fi
-  # Let user select (or not) blocklists via a checklist
-  cmd=(whiptail --separate-output --checklist "Pi-hole relies on third party lists in order to block ads.\\n\\nYou can use the suggestions below, and/or add your own after installation\\n\\nTo deselect any list, use the arrow keys and spacebar" "${r}" "${c}" 7)
-  # In an array, show the options available (all off by default):
-  options=(StevenBlack "StevenBlack's Unified Hosts List" on
-  MalwareDom "MalwareDomains" on
-  Cameleon "Cameleon" on
-  ZeusTracker "ZeusTracker" on
-  DisconTrack "Disconnect.me Tracking" on
-  DisconAd "Disconnect.me Ads" on
-  HostsFile "Hosts-file.net Ads" on)
+    # Back up any existing adlist file, on the off chance that it exists. Useful in case of a reconfigure.
+    if [[ -f "${adlistFile}" ]]; then
+        mv "${adlistFile}" "${adlistFile}.old"
+    fi
+    # Let user select (or not) blocklists via a checklist
+    cmd=(whiptail --separate-output --checklist "Pi-hole relies on third party lists in order to block ads.\\n\\nYou can use the suggestions below, and/or add your own after installation\\n\\nTo deselect any list, use the arrow keys and spacebar" "${r}" "${c}" 7)
+    # In an array, show the options available (all off by default):
+    options=(StevenBlack "StevenBlack's Unified Hosts List" on
+        MalwareDom "MalwareDomains" on
+        Cameleon "Cameleon" on
+        ZeusTracker "ZeusTracker" on
+        DisconTrack "Disconnect.me Tracking" on
+        DisconAd "Disconnect.me Ads" on
+        HostsFile "Hosts-file.net Ads" on)
 
-  # In a variable, show the choices available; exit if Cancel is selected
-  choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) || { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; rm "${adlistFile}" ;exit 1; }
-  # For each choice available,
-  for choice in ${choices}
-  do
-    # Set the values to true
-    case ${choice} in
-    StevenBlack  )  echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >> "${adlistFile}";;
-    MalwareDom   )  echo "https://mirror1.malwaredomains.com/files/justdomains" >> "${adlistFile}";;
-    Cameleon     )  echo "http://sysctl.org/cameleon/hosts" >> "${adlistFile}";;
-    ZeusTracker  )  echo "https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist" >> "${adlistFile}";;
-    DisconTrack  )  echo "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" >> "${adlistFile}";;
-    DisconAd     )  echo "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" >> "${adlistFile}";;
-    HostsFile    )  echo "https://hosts-file.net/ad_servers.txt" >> "${adlistFile}";;
-    esac
-  done
+    # In a variable, show the choices available; exit if Cancel is selected
+    choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) || { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; rm "${adlistFile}" ;exit 1; }
+    # For each choice available,
+    for choice in ${choices}
+    do
+        # Set the values to true
+        case ${choice} in
+            StevenBlack  )  echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >> "${adlistFile}";;
+            MalwareDom   )  echo "https://mirror1.malwaredomains.com/files/justdomains" >> "${adlistFile}";;
+            Cameleon     )  echo "http://sysctl.org/cameleon/hosts" >> "${adlistFile}";;
+            ZeusTracker  )  echo "https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist" >> "${adlistFile}";;
+            DisconTrack  )  echo "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" >> "${adlistFile}";;
+            DisconAd     )  echo "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" >> "${adlistFile}";;
+            HostsFile    )  echo "https://hosts-file.net/ad_servers.txt" >> "${adlistFile}";;
+        esac
+    done
 }
 
 # Check if /etc/dnsmasq.conf is from pi-hole.  If so replace with an original and install new in .d directory
 version_check_dnsmasq() {
-  # Local, named variables
-  local dnsmasq_conf="/etc/dnsmasq.conf"
-  local dnsmasq_conf_orig="/etc/dnsmasq.conf.orig"
-  local dnsmasq_pihole_id_string="addn-hosts=/etc/pihole/gravity.list"
-  local dnsmasq_original_config="${PI_HOLE_LOCAL_REPO}/advanced/dnsmasq.conf.original"
-  local dnsmasq_pihole_01_snippet="${PI_HOLE_LOCAL_REPO}/advanced/01-pihole.conf"
-  local dnsmasq_pihole_01_location="/etc/dnsmasq.d/01-pihole.conf"
+    # Local, named variables
+    local dnsmasq_conf="/etc/dnsmasq.conf"
+    local dnsmasq_conf_orig="/etc/dnsmasq.conf.orig"
+    local dnsmasq_pihole_id_string="addn-hosts=/etc/pihole/gravity.list"
+    local dnsmasq_original_config="${PI_HOLE_LOCAL_REPO}/advanced/dnsmasq.conf.original"
+    local dnsmasq_pihole_01_snippet="${PI_HOLE_LOCAL_REPO}/advanced/01-pihole.conf"
+    local dnsmasq_pihole_01_location="/etc/dnsmasq.d/01-pihole.conf"
 
-  # If the dnsmasq config file exists
-  if [[ -f "${dnsmasq_conf}" ]]; then
-    echo -ne "  ${INFO} Existing dnsmasq.conf found..."
-    # If gravity.list is found within this file, we presume it's from older versions on Pi-hole,
-    if grep -q ${dnsmasq_pihole_id_string} ${dnsmasq_conf}; then
-      echo " it is from a previous Pi-hole install."
-      echo -ne "  ${INFO} Backing up dnsmasq.conf to dnsmasq.conf.orig..."
-      # so backup the original file
-      mv -f ${dnsmasq_conf} ${dnsmasq_conf_orig}
-      echo -e "${OVER}  ${TICK} Backing up dnsmasq.conf to dnsmasq.conf.orig..."
-      echo -ne "  ${INFO} Restoring default dnsmasq.conf..."
-      # and replace it with the default
-      cp ${dnsmasq_original_config} ${dnsmasq_conf}
-      echo -e "${OVER}  ${TICK} Restoring default dnsmasq.conf..."
-    # Otherwise,
+    # If the dnsmasq config file exists
+    if [[ -f "${dnsmasq_conf}" ]]; then
+        echo -ne "  ${INFO} Existing dnsmasq.conf found..."
+        # If gravity.list is found within this file, we presume it's from older versions on Pi-hole,
+        if grep -q ${dnsmasq_pihole_id_string} ${dnsmasq_conf}; then
+            echo " it is from a previous Pi-hole install."
+            echo -ne "  ${INFO} Backing up dnsmasq.conf to dnsmasq.conf.orig..."
+            # so backup the original file
+            mv -f ${dnsmasq_conf} ${dnsmasq_conf_orig}
+            echo -e "${OVER}  ${TICK} Backing up dnsmasq.conf to dnsmasq.conf.orig..."
+            echo -ne "  ${INFO} Restoring default dnsmasq.conf..."
+            # and replace it with the default
+            cp ${dnsmasq_original_config} ${dnsmasq_conf}
+            echo -e "${OVER}  ${TICK} Restoring default dnsmasq.conf..."
+        # Otherwise,
+        else
+        # Don't to anything
+        echo " it is not a Pi-hole file, leaving alone!"
+        fi
     else
-      # Don't to anything
-      echo " it is not a Pi-hole file, leaving alone!"
+        # If a file cannot be found,
+        echo -ne "  ${INFO} No dnsmasq.conf found... restoring default dnsmasq.conf..."
+        # restore the default one
+        cp ${dnsmasq_original_config} ${dnsmasq_conf}
+        echo -e "${OVER}  ${TICK} No dnsmasq.conf found... restoring default dnsmasq.conf..."
+    fi
+
+    echo -en "  ${INFO} Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf..."
+    # Check to see if dnsmasq directory exists (it may not due to being a fresh install and dnsmasq no longer being a dependency)
+    if [[ ! -d "/etc/dnsmasq.d"  ]];then
+        mkdir "/etc/dnsmasq.d"
+    fi
+    # Copy the new Pi-hole DNS config file into the dnsmasq.d directory
+    cp ${dnsmasq_pihole_01_snippet} ${dnsmasq_pihole_01_location}
+    echo -e "${OVER}  ${TICK} Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf"
+    # Replace our placeholder values with the GLOBAL DNS variables that we populated earlier
+    # First, swap in the interface to listen on
+    sed -i "s/@INT@/$PIHOLE_INTERFACE/" ${dnsmasq_pihole_01_location}
+    if [[ "${PIHOLE_DNS_1}" != "" ]]; then
+        # Then swap in the primary DNS server
+        sed -i "s/@DNS1@/$PIHOLE_DNS_1/" ${dnsmasq_pihole_01_location}
+    else
+        #
+        sed -i '/^server=@DNS1@/d' ${dnsmasq_pihole_01_location}
+    fi
+    if [[ "${PIHOLE_DNS_2}" != "" ]]; then
+        # Then swap in the primary DNS server
+        sed -i "s/@DNS2@/$PIHOLE_DNS_2/" ${dnsmasq_pihole_01_location}
+    else
+        #
+        sed -i '/^server=@DNS2@/d' ${dnsmasq_pihole_01_location}
     fi
-  else
-    # If a file cannot be found,
-    echo -ne "  ${INFO} No dnsmasq.conf found... restoring default dnsmasq.conf..."
-    # restore the default one
-    cp ${dnsmasq_original_config} ${dnsmasq_conf}
-    echo -e "${OVER}  ${TICK} No dnsmasq.conf found... restoring default dnsmasq.conf..."
-  fi
 
-  echo -en "  ${INFO} Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf..."
-  # Check to see if dnsmasq directory exists (it may not due to being a fresh install and dnsmasq no longer being a dependency)
-  if [[ ! -d "/etc/dnsmasq.d"  ]];then
-    mkdir "/etc/dnsmasq.d"
-  fi
-  # Copy the new Pi-hole DNS config file into the dnsmasq.d directory
-  cp ${dnsmasq_pihole_01_snippet} ${dnsmasq_pihole_01_location}
-  echo -e "${OVER}  ${TICK} Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf"
-  # Replace our placeholder values with the GLOBAL DNS variables that we populated earlier
-  # First, swap in the interface to listen on
-  sed -i "s/@INT@/$PIHOLE_INTERFACE/" ${dnsmasq_pihole_01_location}
-  if [[ "${PIHOLE_DNS_1}" != "" ]]; then
-    # Then swap in the primary DNS server
-    sed -i "s/@DNS1@/$PIHOLE_DNS_1/" ${dnsmasq_pihole_01_location}
-  else
     #
-    sed -i '/^server=@DNS1@/d' ${dnsmasq_pihole_01_location}
-  fi
-  if [[ "${PIHOLE_DNS_2}" != "" ]]; then
-    # Then swap in the primary DNS server
-    sed -i "s/@DNS2@/$PIHOLE_DNS_2/" ${dnsmasq_pihole_01_location}
-  else
-    #
-    sed -i '/^server=@DNS2@/d' ${dnsmasq_pihole_01_location}
-  fi
+    sed -i 's/^#conf-dir=\/etc\/dnsmasq.d$/conf-dir=\/etc\/dnsmasq.d/' ${dnsmasq_conf}
 
-  #
-  sed -i 's/^#conf-dir=\/etc\/dnsmasq.d$/conf-dir=\/etc\/dnsmasq.d/' ${dnsmasq_conf}
-
-  # If the user does not want to enable logging,
-  if [[ "${QUERY_LOGGING}" == false ]] ; then
+    # If the user does not want to enable logging,
+    if [[ "${QUERY_LOGGING}" == false ]] ; then
         # Disable it by commenting out the directive in the DNS config file
         sed -i 's/^log-queries/#log-queries/' ${dnsmasq_pihole_01_location}
     # Otherwise,
@@ -1163,675 +1175,682 @@ version_check_dnsmasq() {
 
 # Clean an existing installation to prepare for upgrade/reinstall
 clean_existing() {
-  # Local, named variables
-  # ${1} Directory to clean
-  local clean_directory="${1}"
-  # Make ${2} the new one?
-  shift
-  # ${2} Array of files to remove
-  local old_files=( "$@" )
+    # Local, named variables
+    # ${1} Directory to clean
+    local clean_directory="${1}"
+    # Make ${2} the new one?
+    shift
+    # ${2} Array of files to remove
+    local old_files=( "$@" )
 
-  # For each script found in the old files array
-  for script in "${old_files[@]}"; do
-    # Remove them
-    rm -f "${clean_directory}/${script}.sh"
-  done
+    # For each script found in the old files array
+    for script in "${old_files[@]}"; do
+        # Remove them
+        rm -f "${clean_directory}/${script}.sh"
+    done
 }
 
 # Install the scripts from repository to their various locations
 installScripts() {
-  # Local, named variables
-  local str="Installing scripts from ${PI_HOLE_LOCAL_REPO}"
-  echo -ne "  ${INFO} ${str}..."
+    # Local, named variables
+    local str="Installing scripts from ${PI_HOLE_LOCAL_REPO}"
+    echo -ne "  ${INFO} ${str}..."
 
-  # Clear out script files from Pi-hole scripts directory.
-  clean_existing "${PI_HOLE_INSTALL_DIR}" "${PI_HOLE_FILES[@]}"
+    # Clear out script files from Pi-hole scripts directory.
+    clean_existing "${PI_HOLE_INSTALL_DIR}" "${PI_HOLE_FILES[@]}"
 
-  # Install files from local core repository
-  if is_repo "${PI_HOLE_LOCAL_REPO}"; then
-    # move into the directory
-    cd "${PI_HOLE_LOCAL_REPO}"
-    # Install the scripts by:
-    #  -o setting the owner to the user
-    #  -Dm755 create all leading components of destination except the last, then copy the source to the destination and setting the permissions to 755
-    #
-    # This first one is the directory
-    install -o "${USER}" -Dm755 -d "${PI_HOLE_INSTALL_DIR}"
-    # The rest are the scripts Pi-hole needs
-    install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" gravity.sh
-    install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./advanced/Scripts/*.sh
-    install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./automated\ install/uninstall.sh
-    install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./advanced/Scripts/COL_TABLE
-    install -o "${USER}" -Dm755 -t /usr/local/bin/ pihole
-    install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
-    echo -e "${OVER}  ${TICK} ${str}"
- # Otherwise,
-  else
-    # Show an error and exit
-    echo -e "${OVER}  ${CROSS} ${str}
-  ${COL_LIGHT_RED}Error: Local repo ${PI_HOLE_LOCAL_REPO} not found, exiting installer${COL_NC}"
-    exit 1
-  fi
+    # Install files from local core repository
+    if is_repo "${PI_HOLE_LOCAL_REPO}"; then
+        # move into the directory
+        cd "${PI_HOLE_LOCAL_REPO}"
+        # Install the scripts by:
+        #  -o setting the owner to the user
+        #  -Dm755 create all leading components of destination except the last, then copy the source to the destination and setting the permissions to 755
+        #
+        # This first one is the directory
+        install -o "${USER}" -Dm755 -d "${PI_HOLE_INSTALL_DIR}"
+        # The rest are the scripts Pi-hole needs
+        install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" gravity.sh
+        install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./advanced/Scripts/*.sh
+        install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./automated\ install/uninstall.sh
+        install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./advanced/Scripts/COL_TABLE
+        install -o "${USER}" -Dm755 -t /usr/local/bin/ pihole
+        install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
+        echo -e "${OVER}  ${TICK} ${str}"
+    # Otherwise,
+    else
+        # Show an error and exit
+        echo -e "${OVER}  ${CROSS} ${str}
+        ${COL_LIGHT_RED}Error: Local repo ${PI_HOLE_LOCAL_REPO} not found, exiting installer${COL_NC}"
+        exit 1
+    fi
 }
 
 # Install the configs from PI_HOLE_LOCAL_REPO to their various locations
 installConfigs() {
-  echo ""
-  echo -e "  ${INFO} Installing configs from ${PI_HOLE_LOCAL_REPO}..."
-  # Make sure Pi-hole's config files are in place
-  version_check_dnsmasq
+    echo ""
+    echo -e "  ${INFO} Installing configs from ${PI_HOLE_LOCAL_REPO}..."
+    # Make sure Pi-hole's config files are in place
+    version_check_dnsmasq
 
-  # If the user chose to install the dashboard,
-  if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
-    # and if the Web server conf directory does not exist,
-    if [[ ! -d "/etc/lighttpd" ]]; then
-      # make it
-      mkdir /etc/lighttpd
-      # and set the owners
-      chown "${USER}":root /etc/lighttpd
-    # Otherwise, if the config file already exists
-    elif [[ -f "/etc/lighttpd/lighttpd.conf" ]]; then
-      # back up the original
-      mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+    # If the user chose to install the dashboard,
+    if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+        # and if the Web server conf directory does not exist,
+        if [[ ! -d "/etc/lighttpd" ]]; then
+            # make it
+            mkdir /etc/lighttpd
+            # and set the owners
+            chown "${USER}":root /etc/lighttpd
+        # Otherwise, if the config file already exists
+        elif [[ -f "/etc/lighttpd/lighttpd.conf" ]]; then
+            # back up the original
+            mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+        fi
+        # and copy in the config file Pi-hole needs
+        cp ${PI_HOLE_LOCAL_REPO}/advanced/${LIGHTTPD_CFG} /etc/lighttpd/lighttpd.conf
+        # if there is a custom block page in the html/pihole directory, replace 404 handler in lighttpd config
+        if [[ -f "/var/www/html/pihole/custom.php" ]]; then
+            sed -i 's/^\(server\.error-handler-404\s*=\s*\).*$/\1"pihole\/custom\.php"/' /etc/lighttpd/lighttpd.conf
+        fi
+        # Make the directories if they do not exist and set the owners
+        mkdir -p /var/run/lighttpd
+        chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/run/lighttpd
+        mkdir -p /var/cache/lighttpd/compress
+        chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/cache/lighttpd/compress
+        mkdir -p /var/cache/lighttpd/uploads
+        chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/cache/lighttpd/uploads
     fi
-    # and copy in the config file Pi-hole needs
-    cp ${PI_HOLE_LOCAL_REPO}/advanced/${LIGHTTPD_CFG} /etc/lighttpd/lighttpd.conf
-    # if there is a custom block page in the html/pihole directory, replace 404 handler in lighttpd config
-    if [[ -f "/var/www/html/pihole/custom.php" ]]; then
-      sed -i 's/^\(server\.error-handler-404\s*=\s*\).*$/\1"pihole\/custom\.php"/' /etc/lighttpd/lighttpd.conf
-    fi
-    # Make the directories if they do not exist and set the owners
-    mkdir -p /var/run/lighttpd
-    chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/run/lighttpd
-    mkdir -p /var/cache/lighttpd/compress
-    chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/cache/lighttpd/compress
-    mkdir -p /var/cache/lighttpd/uploads
-    chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/cache/lighttpd/uploads
-  fi
 }
 
 install_manpage() {
-  # Copy Pi-hole man page and call mandb to update man page database
-  # Default location for man files for /usr/local/bin is /usr/local/share/man
-  # on lightweight systems may not be present, so check before copying.
-  echo -en "  ${INFO} Testing man page installation"
-  if ! command -v mandb &>/dev/null; then
-    # if mandb is not present, no manpage support
-    echo -e "${OVER}  ${INFO} man not installed"
-    return
-  elif [[ ! -d "/usr/local/share/man" ]]; then
-    # appropriate directory for Pi-hole's man page is not present
-    echo -e "${OVER}  ${INFO} man page not installed"
-    return
-  elif [[ ! -d "/usr/local/share/man/man8" ]]; then
-    # if not present, create man8 directory
-    mkdir /usr/local/share/man/man8
-  fi
-  # Testing complete, copy the file & update the man db
-  cp ${PI_HOLE_LOCAL_REPO}/pihole.8 /usr/local/share/man/man8/pihole.8
-  if mandb -q &>/dev/null; then
-    # Updated successfully
-    echo -e "${OVER}  ${TICK} man page installed and database updated"
-    return
-  else
-    # Something is wrong with the system's man installation, clean up 
-    # our file, (leave everything how we found it).
-    rm /usr/local/share/man/man8/pihole.8
-    echo -e "${OVER}  ${CROSS} man page db not updated, man page not installed"
-  fi
+    # Copy Pi-hole man pages and call mandb to update man page database
+    # Default location for man files for /usr/local/bin is /usr/local/share/man
+    # on lightweight systems may not be present, so check before copying.
+    echo -en "  ${INFO} Testing man page installation"
+    if ! command -v mandb &>/dev/null; then
+        # if mandb is not present, no manpage support
+        echo -e "${OVER}  ${INFO} man not installed"
+        return
+    elif [[ ! -d "/usr/local/share/man" ]]; then
+        # appropriate directory for Pi-hole's man page is not present
+        echo -e "${OVER}  ${INFO} man pages not installed"
+        return
+    fi
+    if [[ ! -d "/usr/local/share/man/man8" ]]; then
+        # if not present, create man8 directory
+        mkdir /usr/local/share/man/man8
+    fi
+    if [[ ! -d "/usr/local/share/man/man5" ]]; then
+        # if not present, create man8 directory
+        mkdir /usr/local/share/man/man5
+    fi
+    # Testing complete, copy the files & update the man db
+    cp ${PI_HOLE_LOCAL_REPO}/manpages/pihole.8 /usr/local/share/man/man8/pihole.8
+    cp ${PI_HOLE_LOCAL_REPO}/manpages/pihole-FTL.8 /usr/local/share/man/man8/pihole-FTL.8
+    cp ${PI_HOLE_LOCAL_REPO}/manpages/pihole-FTL.conf.5 /usr/local/share/man/man5/pihole-FTL.conf.5
+    if mandb -q &>/dev/null; then
+        # Updated successfully
+        echo -e "${OVER}  ${TICK} man pages installed and database updated"
+        return
+    else
+        # Something is wrong with the system's man installation, clean up
+        # our files, (leave everything how we found it).
+        rm /usr/local/share/man/man8/pihole.8 /usr/local/share/man/man8/pihole-FTL.8 /usr/local/share/man/man5/pihole-FTL.conf.5
+        echo -e "${OVER}  ${CROSS} man page db not updated, man pages not installed"
+    fi
 }
 
 stop_service() {
-  # Stop service passed in as argument.
-  # Can softfail, as process may not be installed when this is called
-  local str="Stopping ${1} service"
-  echo -ne "  ${INFO} ${str}..."
-  if command -v systemctl &> /dev/null; then
-    systemctl stop "${1}" &> /dev/null || true
-  else
-    service "${1}" stop &> /dev/null || true
-  fi
-  echo -e "${OVER}  ${TICK} ${str}..."
+    # Stop service passed in as argument.
+    # Can softfail, as process may not be installed when this is called
+    local str="Stopping ${1} service"
+    echo -ne "  ${INFO} ${str}..."
+    if command -v systemctl &> /dev/null; then
+        systemctl stop "${1}" &> /dev/null || true
+    else
+        service "${1}" stop &> /dev/null || true
+    fi
+    echo -e "${OVER}  ${TICK} ${str}..."
 }
 
 # Start/Restart service passed in as argument
 start_service() {
-  # Local, named variables
-  local str="Starting ${1} service"
-  echo -ne "  ${INFO} ${str}..."
-  # If systemctl exists,
-  if command -v systemctl &> /dev/null; then
-    # use that to restart the service
-    systemctl restart "${1}" &> /dev/null
-  # Otherwise,
-  else
-    # fall back to the service command
-    service "${1}" restart &> /dev/null
-  fi
-  echo -e "${OVER}  ${TICK} ${str}"
+    # Local, named variables
+    local str="Starting ${1} service"
+    echo -ne "  ${INFO} ${str}..."
+    # If systemctl exists,
+    if command -v systemctl &> /dev/null; then
+        # use that to restart the service
+        systemctl restart "${1}" &> /dev/null
+    # Otherwise,
+    else
+        # fall back to the service command
+        service "${1}" restart &> /dev/null
+    fi
+    echo -e "${OVER}  ${TICK} ${str}"
 }
 
 # Enable service so that it will start with next reboot
 enable_service() {
-  # Local, named variables
-  local str="Enabling ${1} service to start on reboot"
-  echo -ne "  ${INFO} ${str}..."
-  # If systemctl exists,
-  if command -v systemctl &> /dev/null; then
-    # use that to enable the service
-    systemctl enable "${1}" &> /dev/null
-  # Otherwise,
-  else
-    # use update-rc.d to accomplish this
-    update-rc.d "${1}" defaults &> /dev/null
-  fi
-  echo -e "${OVER}  ${TICK} ${str}"
+    # Local, named variables
+    local str="Enabling ${1} service to start on reboot"
+    echo -ne "  ${INFO} ${str}..."
+    # If systemctl exists,
+    if command -v systemctl &> /dev/null; then
+        # use that to enable the service
+        systemctl enable "${1}" &> /dev/null
+    # Otherwise,
+    else
+        # use update-rc.d to accomplish this
+        update-rc.d "${1}" defaults &> /dev/null
+    fi
+    echo -e "${OVER}  ${TICK} ${str}"
 }
 
 # Disable service so that it will not with next reboot
 disable_service() {
-  # Local, named variables
-  local str="Disabling ${1} service"
-  echo -ne "  ${INFO} ${str}..."
-  # If systemctl exists,
-  if command -v systemctl &> /dev/null; then
-    # use that to disable the service
-    systemctl disable "${1}" &> /dev/null
-  # Otherwise,
-  else
-    # use update-rc.d to accomplish this
-    update-rc.d "${1}" disable &> /dev/null
-  fi
-  echo -e "${OVER}  ${TICK} ${str}"
+    # Local, named variables
+    local str="Disabling ${1} service"
+    echo -ne "  ${INFO} ${str}..."
+    # If systemctl exists,
+    if command -v systemctl &> /dev/null; then
+        # use that to disable the service
+        systemctl disable "${1}" &> /dev/null
+    # Otherwise,
+    else
+        # use update-rc.d to accomplish this
+        update-rc.d "${1}" disable &> /dev/null
+    fi
+    echo -e "${OVER}  ${TICK} ${str}"
 }
 
 check_service_active() {
     # If systemctl exists,
-  if command -v systemctl &> /dev/null; then
-    # use that to check the status of the service
-    systemctl is-enabled "${1}" > /dev/null
-  # Otherwise,
-  else
-    # fall back to service command
-    service "${1}" status > /dev/null
-  fi
+    if command -v systemctl &> /dev/null; then
+        # use that to check the status of the service
+        systemctl is-enabled "${1}" > /dev/null
+    # Otherwise,
+    else
+        # fall back to service command
+        service "${1}" status > /dev/null
+    fi
 }
 
-# Systemd-resolved's DNSStubListener and dnsmasq can't share port 53. 
+# Systemd-resolved's DNSStubListener and dnsmasq can't share port 53.
 disable_resolved_stublistener() {
-  echo -en "  ${INFO} Testing if systemd-resolved is enabled"
-  # Check if Systemd-resolved's DNSStubListener is enabled and active on port 53
-  if check_service_active "systemd-resolved"; then
-    # Check if DNSStubListener is enabled
-    echo -en "  ${OVER}  ${INFO} Testing if systemd-resolved DNSStub-Listener is active"
-    if ( grep -E '#?DNSStubListener=yes' /etc/systemd/resolved.conf &> /dev/null ); then
-      # Disable the DNSStubListener to unbind it from port 53
-      # Note that this breaks dns functionality on host until dnsmasq/ftl are up and running
-      echo -en "${OVER}  ${TICK} Disabling systemd-resolved DNSStubListener"
-      # Make a backup of the original /etc/systemd/resolved.conf
-      # (This will need to be restored on uninstallation)
-      sed -r -i.orig 's/#?DNSStubListener=yes/DNSStubListener=no/g' /etc/systemd/resolved.conf
-      echo -e " and restarting systemd-resolved"
-      systemctl reload-or-restart systemd-resolved
+    echo -en "  ${INFO} Testing if systemd-resolved is enabled"
+    # Check if Systemd-resolved's DNSStubListener is enabled and active on port 53
+    if check_service_active "systemd-resolved"; then
+        # Check if DNSStubListener is enabled
+        echo -en "  ${OVER}  ${INFO} Testing if systemd-resolved DNSStub-Listener is active"
+        if ( grep -E '#?DNSStubListener=yes' /etc/systemd/resolved.conf &> /dev/null ); then
+            # Disable the DNSStubListener to unbind it from port 53
+            # Note that this breaks dns functionality on host until dnsmasq/ftl are up and running
+            echo -en "${OVER}  ${TICK} Disabling systemd-resolved DNSStubListener"
+            # Make a backup of the original /etc/systemd/resolved.conf
+            # (This will need to be restored on uninstallation)
+            sed -r -i.orig 's/#?DNSStubListener=yes/DNSStubListener=no/g' /etc/systemd/resolved.conf
+            echo -e " and restarting systemd-resolved"
+            systemctl reload-or-restart systemd-resolved
+        else
+            echo -e "${OVER}  ${INFO} Systemd-resolved does not need to be restarted"
+        fi
     else
-      echo -e "${OVER}  ${INFO} Systemd-resolved does not need to be restarted"
+        echo -e "${OVER}  ${INFO} Systemd-resolved is not enabled"
     fi
-  else
-    echo -e "${OVER}  ${INFO} Systemd-resolved is not enabled"
-  fi
 }
 
 update_package_cache() {
-  # Running apt-get update/upgrade with minimal output can cause some issues with
-  # requiring user input (e.g password for phpmyadmin see #218)
+    # Running apt-get update/upgrade with minimal output can cause some issues with
+    # requiring user input (e.g password for phpmyadmin see #218)
 
-  # Update package cache on apt based OSes. Do this every time since
-  # it's quick and packages can be updated at any time.
+    # Update package cache on apt based OSes. Do this every time since
+    # it's quick and packages can be updated at any time.
 
-  # Local, named variables
-  local str="Update local cache of available packages"
-  echo ""
-  echo -ne "  ${INFO} ${str}..."
-  # Create a command from the package cache variable
-  if eval "${UPDATE_PKG_CACHE}" &> /dev/null; then
-    echo -e "${OVER}  ${TICK} ${str}"
-  # Otherwise,
-  else
-    # show an error and exit
-    echo -e "${OVER}  ${CROSS} ${str}"
-    echo -ne "  ${COL_LIGHT_RED}Error: Unable to update package cache. Please try \"${UPDATE_PKG_CACHE}\"${COL_NC}"
-    return 1
-  fi
+    # Local, named variables
+    local str="Update local cache of available packages"
+    echo ""
+    echo -ne "  ${INFO} ${str}..."
+    # Create a command from the package cache variable
+    if eval "${UPDATE_PKG_CACHE}" &> /dev/null; then
+        echo -e "${OVER}  ${TICK} ${str}"
+    # Otherwise,
+    else
+        # show an error and exit
+        echo -e "${OVER}  ${CROSS} ${str}"
+        echo -ne "  ${COL_LIGHT_RED}Error: Unable to update package cache. Please try \"${UPDATE_PKG_CACHE}\"${COL_NC}"
+        return 1
+    fi
 }
 
 # Let user know if they have outdated packages on their system and
 # advise them to run a package update at soonest possible.
 notify_package_updates_available() {
-  # Local, named variables
-  local str="Checking ${PKG_MANAGER} for upgraded packages"
-  echo -ne "\\n  ${INFO} ${str}..."
-  # Store the list of packages in a variable
-  updatesToInstall=$(eval "${PKG_COUNT}")
+    # Local, named variables
+    local str="Checking ${PKG_MANAGER} for upgraded packages"
+    echo -ne "\\n  ${INFO} ${str}..."
+    # Store the list of packages in a variable
+    updatesToInstall=$(eval "${PKG_COUNT}")
 
-  if [[ -d "/lib/modules/$(uname -r)" ]]; then
-    #
-    if [[ "${updatesToInstall}" -eq 0 ]]; then
-      #
-      echo -e "${OVER}  ${TICK} ${str}... up to date!"
-      echo ""
+    if [[ -d "/lib/modules/$(uname -r)" ]]; then
+        #
+        if [[ "${updatesToInstall}" -eq 0 ]]; then
+            #
+            echo -e "${OVER}  ${TICK} ${str}... up to date!"
+            echo ""
+        else
+            #
+            echo -e "${OVER}  ${TICK} ${str}... ${updatesToInstall} updates available"
+            echo -e "  ${INFO} ${COL_LIGHT_GREEN}It is recommended to update your OS after installing the Pi-hole! ${COL_NC}"
+            echo ""
+        fi
     else
-      #
-      echo -e "${OVER}  ${TICK} ${str}... ${updatesToInstall} updates available"
-      echo -e "  ${INFO} ${COL_LIGHT_GREEN}It is recommended to update your OS after installing the Pi-hole! ${COL_NC}"
-      echo ""
+        echo -e "${OVER}  ${CROSS} ${str}
+        Kernel update detected. If the install fails, please reboot and try again\\n"
     fi
-  else
-    echo -e "${OVER}  ${CROSS} ${str}
-      Kernel update detected. If the install fails, please reboot and try again\\n"
-  fi
 }
 
 # What's this doing outside of a function in the middle of nowhere?
 counter=0
 
 install_dependent_packages() {
-  # Local, named variables should be used here, especially for an iterator
-  # Add one to the counter
-  counter=$((counter+1))
-  # If it equals 1,
-  if [[ "${counter}" == 1 ]]; then
-    #
-    echo -e "  ${INFO} Installer Dependency checks..."
-  else
-    #
-    echo -e "  ${INFO} Main Dependency checks..."
-  fi
+    # Local, named variables should be used here, especially for an iterator
+    # Add one to the counter
+    counter=$((counter+1))
+    # If it equals 1,
+    if [[ "${counter}" == 1 ]]; then
+        #
+        echo -e "  ${INFO} Installer Dependency checks..."
+    else
+        #
+        echo -e "  ${INFO} Main Dependency checks..."
+    fi
 
-  # Install packages passed in via argument array
-  # No spinner - conflicts with set -e
-  declare -a argArray1=("${!1}")
-  declare -a installArray
+    # Install packages passed in via argument array
+    # No spinner - conflicts with set -e
+    declare -a argArray1=("${!1}")
+    declare -a installArray
 
-  # Debian based package install - debconf will download the entire package list
-  # so we just create an array of packages not currently installed to cut down on the
-  # amount of download traffic.
-  # NOTE: We may be able to use this installArray in the future to create a list of package that were
-  # installed by us, and remove only the installed packages, and not the entire list.
-  if command -v debconf-apt-progress &> /dev/null; then
-    # For each package,
+    # Debian based package install - debconf will download the entire package list
+    # so we just create an array of packages not currently installed to cut down on the
+    # amount of download traffic.
+    # NOTE: We may be able to use this installArray in the future to create a list of package that were
+    # installed by us, and remove only the installed packages, and not the entire list.
+    if command -v debconf-apt-progress &> /dev/null; then
+        # For each package,
+        for i in "${argArray1[@]}"; do
+            echo -ne "  ${INFO} Checking for $i..."
+            #
+            if dpkg-query -W -f='${Status}' "${i}" 2>/dev/null | grep "ok installed" &> /dev/null; then
+                #
+                echo -e "${OVER}  ${TICK} Checking for $i"
+            else
+                #
+                echo -e "${OVER}  ${INFO} Checking for $i (will be installed)"
+                #
+                installArray+=("${i}")
+            fi
+        done
+        #
+        if [[ "${#installArray[@]}" -gt 0 ]]; then
+            #
+            test_dpkg_lock
+            #
+            debconf-apt-progress -- "${PKG_INSTALL[@]}" "${installArray[@]}"
+            return
+        fi
+        echo ""
+        #
+        return 0
+    fi
+
+    # Install Fedora/CentOS packages
     for i in "${argArray1[@]}"; do
-      echo -ne "  ${INFO} Checking for $i..."
-      #
-      if dpkg-query -W -f='${Status}' "${i}" 2>/dev/null | grep "ok installed" &> /dev/null; then
+        echo -ne "  ${INFO} Checking for $i..."
         #
-        echo -e "${OVER}  ${TICK} Checking for $i"
-      else
-        #
-        echo -e "${OVER}  ${INFO} Checking for $i (will be installed)"
-        #
-        installArray+=("${i}")
-      fi
+        if ${PKG_MANAGER} -q list installed "${i}" &> /dev/null; then
+            echo -e "${OVER}  ${TICK} Checking for $i"
+        else
+            echo -e "${OVER}  ${INFO} Checking for $i (will be installed)"
+            #
+            installArray+=("${i}")
+        fi
     done
     #
     if [[ "${#installArray[@]}" -gt 0 ]]; then
-      #
-      test_dpkg_lock
-      #
-      debconf-apt-progress -- "${PKG_INSTALL[@]}" "${installArray[@]}"
-      return
+        #
+        "${PKG_INSTALL[@]}" "${installArray[@]}" &> /dev/null
+        return
     fi
-      echo ""
-      #
-      return 0
-  fi
-
-  # Install Fedora/CentOS packages
-  for i in "${argArray1[@]}"; do
-    echo -ne "  ${INFO} Checking for $i..."
-    #
-    if ${PKG_MANAGER} -q list installed "${i}" &> /dev/null; then
-      echo -e "${OVER}  ${TICK} Checking for $i"
-    else
-      echo -e "${OVER}  ${INFO} Checking for $i (will be installed)"
-      #
-      installArray+=("${i}")
-    fi
-  done
-  #
-  if [[ "${#installArray[@]}" -gt 0 ]]; then
-    #
-    "${PKG_INSTALL[@]}" "${installArray[@]}" &> /dev/null
-    return
-  fi
-  echo ""
-  return 0
+    echo ""
+    return 0
 }
 
 # Install the Web interface dashboard
 installPiholeWeb() {
-  echo ""
-  echo "  ${INFO} Installing blocking page..."
+    echo ""
+    echo "  ${INFO} Installing blocking page..."
 
-  local str="Creating directory for blocking page, and copying files"
-  echo -ne "  ${INFO} ${str}..."
-  # Install the directory
-  install -d /var/www/html/pihole
-  # and the blockpage
-  install -D ${PI_HOLE_LOCAL_REPO}/advanced/{index,blockingpage}.* /var/www/html/pihole/
+    local str="Creating directory for blocking page, and copying files"
+    echo -ne "  ${INFO} ${str}..."
+    # Install the directory
+    install -d /var/www/html/pihole
+    # and the blockpage
+    install -D ${PI_HOLE_LOCAL_REPO}/advanced/{index,blockingpage}.* /var/www/html/pihole/
 
-  # Remove superseded file
-  if [[ -e "/var/www/html/pihole/index.js" ]]; then
-    rm "/var/www/html/pihole/index.js"
-  fi
+    # Remove superseded file
+    if [[ -e "/var/www/html/pihole/index.js" ]]; then
+        rm "/var/www/html/pihole/index.js"
+    fi
 
-  echo -e "${OVER}  ${TICK} ${str}"
-
-  local str="Backing up index.lighttpd.html"
-  echo -ne "  ${INFO} ${str}..."
-  # If the default index file exists,
-  if [[ -f "/var/www/html/index.lighttpd.html" ]]; then
-    # back it up
-    mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
     echo -e "${OVER}  ${TICK} ${str}"
-  # Otherwise,
-  else
-    # don't do anything
-    echo -e "${OVER}  ${CROSS} ${str}
-      No default index.lighttpd.html file found... not backing up"
-  fi
 
-  # Install Sudoers file
-  echo ""
-  local str="Installing sudoer file"
-  echo -ne "  ${INFO} ${str}..."
-  # Make the .d directory if it doesn't exist
-  mkdir -p /etc/sudoers.d/
-  # and copy in the pihole sudoers file
-  cp ${PI_HOLE_LOCAL_REPO}/advanced/pihole.sudo /etc/sudoers.d/pihole
-  # Add lighttpd user (OS dependent) to sudoers file
-  echo "${LIGHTTPD_USER} ALL=NOPASSWD: /usr/local/bin/pihole" >> /etc/sudoers.d/pihole
+    local str="Backing up index.lighttpd.html"
+    echo -ne "  ${INFO} ${str}..."
+    # If the default index file exists,
+    if [[ -f "/var/www/html/index.lighttpd.html" ]]; then
+        # back it up
+        mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
+        echo -e "${OVER}  ${TICK} ${str}"
+    # Otherwise,
+    else
+        # don't do anything
+        echo -e "${OVER}  ${CROSS} ${str}
+        No default index.lighttpd.html file found... not backing up"
+    fi
 
-  # If the Web server user is lighttpd,
-  if [[ "$LIGHTTPD_USER" == "lighttpd" ]]; then
-    # Allow executing pihole via sudo with Fedora
-    # Usually /usr/local/bin is not permitted as directory for sudoable programs
-    echo "Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin" >> /etc/sudoers.d/pihole
-  fi
-  # Set the strict permissions on the file
-  chmod 0440 /etc/sudoers.d/pihole
-  echo -e "${OVER}  ${TICK} ${str}"
+    # Install Sudoers file
+    echo ""
+    local str="Installing sudoer file"
+    echo -ne "  ${INFO} ${str}..."
+    # Make the .d directory if it doesn't exist
+    mkdir -p /etc/sudoers.d/
+    # and copy in the pihole sudoers file
+    cp ${PI_HOLE_LOCAL_REPO}/advanced/pihole.sudo /etc/sudoers.d/pihole
+    # Add lighttpd user (OS dependent) to sudoers file
+    echo "${LIGHTTPD_USER} ALL=NOPASSWD: /usr/local/bin/pihole" >> /etc/sudoers.d/pihole
+
+    # If the Web server user is lighttpd,
+    if [[ "$LIGHTTPD_USER" == "lighttpd" ]]; then
+        # Allow executing pihole via sudo with Fedora
+        # Usually /usr/local/bin is not permitted as directory for sudoable programs
+        echo "Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin" >> /etc/sudoers.d/pihole
+    fi
+    # Set the strict permissions on the file
+    chmod 0440 /etc/sudoers.d/pihole
+    echo -e "${OVER}  ${TICK} ${str}"
 }
 
 # Installs a cron file
 installCron() {
-  # Install the cron job
-  local str="Installing latest Cron script"
-  echo ""
-  echo -ne "  ${INFO} ${str}..."
-  # Copy the cron file over from the local repo
-  cp ${PI_HOLE_LOCAL_REPO}/advanced/pihole.cron /etc/cron.d/pihole
-  # Randomize gravity update time
-  sed -i "s/59 1 /$((1 + RANDOM % 58)) $((3 + RANDOM % 2))/" /etc/cron.d/pihole
-  # Randomize update checker time
-  sed -i "s/59 17/$((1 + RANDOM % 58)) $((12 + RANDOM % 8))/" /etc/cron.d/pihole
-  echo -e "${OVER}  ${TICK} ${str}"
+    # Install the cron job
+    local str="Installing latest Cron script"
+    echo ""
+    echo -ne "  ${INFO} ${str}..."
+    # Copy the cron file over from the local repo
+    cp ${PI_HOLE_LOCAL_REPO}/advanced/pihole.cron /etc/cron.d/pihole
+    # Randomize gravity update time
+    sed -i "s/59 1 /$((1 + RANDOM % 58)) $((3 + RANDOM % 2))/" /etc/cron.d/pihole
+    # Randomize update checker time
+    sed -i "s/59 17/$((1 + RANDOM % 58)) $((12 + RANDOM % 8))/" /etc/cron.d/pihole
+    echo -e "${OVER}  ${TICK} ${str}"
 }
 
 # Gravity is a very important script as it aggregates all of the domains into a single HOSTS formatted list,
 # which is what Pi-hole needs to begin blocking ads
 runGravity() {
-  # Run gravity in the current shell
-  { /opt/pihole/gravity.sh --force; }
+    # Run gravity in the current shell
+    { /opt/pihole/gravity.sh --force; }
 }
 
 # Check if the pihole user exists and create if it does not
 create_pihole_user() {
-  local str="Checking for user 'pihole'"
-  echo -ne "  ${INFO} ${str}..."
-  # If the user pihole exists,
-  if id -u pihole &> /dev/null; then
-    # just show a success
-    echo -ne "${OVER}  ${TICK} ${str}"
-  # Otherwise,
-  else
-    echo -ne "${OVER}  ${CROSS} ${str}"
-    local str="Creating user 'pihole'"
+    local str="Checking for user 'pihole'"
     echo -ne "  ${INFO} ${str}..."
-    # create her with the useradd command
-    useradd -r -s /usr/sbin/nologin pihole
-    echo -ne "${OVER}  ${TICK} ${str}"
-  fi
+    # If the user pihole exists,
+    if id -u pihole &> /dev/null; then
+        # just show a success
+        echo -ne "${OVER}  ${TICK} ${str}"
+    # Otherwise,
+    else
+        echo -ne "${OVER}  ${CROSS} ${str}"
+        local str="Creating user 'pihole'"
+        echo -ne "  ${INFO} ${str}..."
+        # create her with the useradd command
+        useradd -r -s /usr/sbin/nologin pihole
+        echo -ne "${OVER}  ${TICK} ${str}"
+    fi
 }
 
 # Allow HTTP and DNS traffic
 configureFirewall() {
-  echo ""
-  # If a firewall is running,
-  if firewall-cmd --state &> /dev/null; then
-    # ask if the user wants to install Pi-hole's default firewall rules
-    whiptail --title "Firewall in use" --yesno "We have detected a running firewall\\n\\nPi-hole currently requires HTTP and DNS port access.\\n\\n\\n\\nInstall Pi-hole default firewall rules?" ${r} ${c} || \
-    { echo -e "  ${INFO} Not installing firewall rulesets."; return 0; }
-    echo -e "  ${TICK} Configuring FirewallD for httpd and pihole-FTL"
-    # Allow HTTP and DNS traffic
-    firewall-cmd --permanent --add-service=http --add-service=dns
-    # Reload the firewall to apply these changes
-    firewall-cmd --reload
-    return 0
-  # Check for proper kernel modules to prevent failure
-  elif modinfo ip_tables &> /dev/null && command -v iptables &> /dev/null; then
+    echo ""
+    # If a firewall is running,
+    if firewall-cmd --state &> /dev/null; then
+        # ask if the user wants to install Pi-hole's default firewall rules
+        whiptail --title "Firewall in use" --yesno "We have detected a running firewall\\n\\nPi-hole currently requires HTTP and DNS port access.\\n\\n\\n\\nInstall Pi-hole default firewall rules?" ${r} ${c} || \
+        { echo -e "  ${INFO} Not installing firewall rulesets."; return 0; }
+        echo -e "  ${TICK} Configuring FirewallD for httpd and pihole-FTL"
+        # Allow HTTP and DNS traffic
+        firewall-cmd --permanent --add-service=http --add-service=dns
+        # Reload the firewall to apply these changes
+        firewall-cmd --reload
+        return 0
+        # Check for proper kernel modules to prevent failure
+    elif modinfo ip_tables &> /dev/null && command -v iptables &> /dev/null; then
     # If chain Policy is not ACCEPT or last Rule is not ACCEPT
     # then check and insert our Rules above the DROP/REJECT Rule.
-    if iptables -S INPUT | head -n1 | grep -qv '^-P.*ACCEPT$' || iptables -S INPUT | tail -n1 | grep -qv '^-\(A\|P\).*ACCEPT$'; then
-      whiptail --title "Firewall in use" --yesno "We have detected a running firewall\\n\\nPi-hole currently requires HTTP and DNS port access.\\n\\n\\n\\nInstall Pi-hole default firewall rules?" ${r} ${c} || \
-      { echo -e "  ${INFO} Not installing firewall rulesets."; return 0; }
-      echo -e "  ${TICK} Installing new IPTables firewall rulesets"
-      # Check chain first, otherwise a new rule will duplicate old ones
-      iptables -C INPUT -p tcp -m tcp --dport 80 -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT
-      iptables -C INPUT -p tcp -m tcp --dport 53 -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT
-      iptables -C INPUT -p udp -m udp --dport 53 -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT
-      iptables -C INPUT -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT
-      return 0
+        if iptables -S INPUT | head -n1 | grep -qv '^-P.*ACCEPT$' || iptables -S INPUT | tail -n1 | grep -qv '^-\(A\|P\).*ACCEPT$'; then
+            whiptail --title "Firewall in use" --yesno "We have detected a running firewall\\n\\nPi-hole currently requires HTTP and DNS port access.\\n\\n\\n\\nInstall Pi-hole default firewall rules?" ${r} ${c} || \
+            { echo -e "  ${INFO} Not installing firewall rulesets."; return 0; }
+            echo -e "  ${TICK} Installing new IPTables firewall rulesets"
+            # Check chain first, otherwise a new rule will duplicate old ones
+            iptables -C INPUT -p tcp -m tcp --dport 80 -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT
+            iptables -C INPUT -p tcp -m tcp --dport 53 -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT
+            iptables -C INPUT -p udp -m udp --dport 53 -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT
+            iptables -C INPUT -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT &> /dev/null || iptables -I INPUT 1 -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT
+            return 0
+        fi
+    # Otherwise,
+    else
+        # no firewall is running
+        echo -e "  ${INFO} No active firewall detected.. skipping firewall configuration"
+        # so just exit
+        return 0
     fi
-  # Otherwise,
-  else
-    # no firewall is running
-    echo -e "  ${INFO} No active firewall detected.. skipping firewall configuration"
-    # so just exit
-    return 0
-  fi
-  echo -e "  ${INFO} Skipping firewall configuration"
+    echo -e "  ${INFO} Skipping firewall configuration"
 }
 
 #
 finalExports() {
-  # If the Web interface is not set to be installed,
-  if [[ "${INSTALL_WEB_INTERFACE}" == false ]]; then
-    # and if there is not an IPv4 address,
-    if [[ "${IPV4_ADDRESS}" ]]; then
-      # there is no block page, so set IPv4 to 0.0.0.0 (all IP addresses)
-      IPV4_ADDRESS="0.0.0.0"
+    # If the Web interface is not set to be installed,
+    if [[ "${INSTALL_WEB_INTERFACE}" == false ]]; then
+        # and if there is not an IPv4 address,
+        if [[ "${IPV4_ADDRESS}" ]]; then
+            # there is no block page, so set IPv4 to 0.0.0.0 (all IP addresses)
+            IPV4_ADDRESS="0.0.0.0"
+        fi
+        if [[ "${IPV6_ADDRESS}" ]]; then
+            # and IPv6 to ::/0
+            IPV6_ADDRESS="::/0"
+        fi
     fi
-    if [[ "${IPV6_ADDRESS}" ]]; then
-      # and IPv6 to ::/0
-      IPV6_ADDRESS="::/0"
-    fi
-  fi
 
-  # If the setup variable file exists,
-  if [[ -e "${setupVars}" ]]; then
-    # update the variables in the file
-    sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;/INSTALL_WEB_SERVER/d;/INSTALL_WEB_INTERFACE/d;/LIGHTTPD_ENABLED/d;' "${setupVars}"
-  fi
-  # echo the information to the user
+    # If the setup variable file exists,
+    if [[ -e "${setupVars}" ]]; then
+        # update the variables in the file
+        sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;/INSTALL_WEB_SERVER/d;/INSTALL_WEB_INTERFACE/d;/LIGHTTPD_ENABLED/d;' "${setupVars}"
+    fi
+    # echo the information to the user
     {
-  echo "PIHOLE_INTERFACE=${PIHOLE_INTERFACE}"
-  echo "IPV4_ADDRESS=${IPV4_ADDRESS}"
-  echo "IPV6_ADDRESS=${IPV6_ADDRESS}"
-  echo "PIHOLE_DNS_1=${PIHOLE_DNS_1}"
-  echo "PIHOLE_DNS_2=${PIHOLE_DNS_2}"
-  echo "QUERY_LOGGING=${QUERY_LOGGING}"
-  echo "INSTALL_WEB_SERVER=${INSTALL_WEB_SERVER}"
-  echo "INSTALL_WEB_INTERFACE=${INSTALL_WEB_INTERFACE}"
-  echo "LIGHTTPD_ENABLED=${LIGHTTPD_ENABLED}"
+    echo "PIHOLE_INTERFACE=${PIHOLE_INTERFACE}"
+    echo "IPV4_ADDRESS=${IPV4_ADDRESS}"
+    echo "IPV6_ADDRESS=${IPV6_ADDRESS}"
+    echo "PIHOLE_DNS_1=${PIHOLE_DNS_1}"
+    echo "PIHOLE_DNS_2=${PIHOLE_DNS_2}"
+    echo "QUERY_LOGGING=${QUERY_LOGGING}"
+    echo "INSTALL_WEB_SERVER=${INSTALL_WEB_SERVER}"
+    echo "INSTALL_WEB_INTERFACE=${INSTALL_WEB_INTERFACE}"
+    echo "LIGHTTPD_ENABLED=${LIGHTTPD_ENABLED}"
     }>> "${setupVars}"
 
-  # Bring in the current settings and the functions to manipulate them
-  source "${setupVars}"
-  source "${PI_HOLE_LOCAL_REPO}/advanced/Scripts/webpage.sh"
+    # Bring in the current settings and the functions to manipulate them
+    source "${setupVars}"
+    source "${PI_HOLE_LOCAL_REPO}/advanced/Scripts/webpage.sh"
 
-  # Look for DNS server settings which would have to be reapplied
-  ProcessDNSSettings
+    # Look for DNS server settings which would have to be reapplied
+    ProcessDNSSettings
 
-  # Look for DHCP server settings which would have to be reapplied
-  ProcessDHCPSettings
+    # Look for DHCP server settings which would have to be reapplied
+    ProcessDHCPSettings
 }
 
 # Install the logrotate script
 installLogrotate() {
 
-  local str="Installing latest logrotate script"
-  echo ""
-  echo -ne "  ${INFO} ${str}..."
-  # Copy the file over from the local repo
-  cp ${PI_HOLE_LOCAL_REPO}/advanced/logrotate /etc/pihole/logrotate
-  # Different operating systems have different user / group
-  # settings for logrotate that makes it impossible to create
-  # a static logrotate file that will work with e.g.
-  # Rasbian and Ubuntu at the same time. Hence, we have to
-  # customize the logrotate script here in order to reflect
-  # the local properties of the /var/log directory
-  logusergroup="$(stat -c '%U %G' /var/log)"
-  # If the variable has a value,
-  if [[ ! -z "${logusergroup}" ]]; then
-    #
-    sed -i "s/# su #/su ${logusergroup}/g;" /etc/pihole/logrotate
-  fi
-  echo -e "${OVER}  ${TICK} ${str}"
+    local str="Installing latest logrotate script"
+    echo ""
+    echo -ne "  ${INFO} ${str}..."
+    # Copy the file over from the local repo
+    cp ${PI_HOLE_LOCAL_REPO}/advanced/logrotate /etc/pihole/logrotate
+    # Different operating systems have different user / group
+    # settings for logrotate that makes it impossible to create
+    # a static logrotate file that will work with e.g.
+    # Rasbian and Ubuntu at the same time. Hence, we have to
+    # customize the logrotate script here in order to reflect
+    # the local properties of the /var/log directory
+    logusergroup="$(stat -c '%U %G' /var/log)"
+    # If the variable has a value,
+    if [[ ! -z "${logusergroup}" ]]; then
+        #
+        sed -i "s/# su #/su ${logusergroup}/g;" /etc/pihole/logrotate
+    fi
+    echo -e "${OVER}  ${TICK} ${str}"
 }
 
 # At some point in the future this list can be pruned, for now we'll need it to ensure updates don't break.
 # Refactoring of install script has changed the name of a couple of variables. Sort them out here.
 accountForRefactor() {
-  sed -i 's/piholeInterface/PIHOLE_INTERFACE/g' ${setupVars}
-  sed -i 's/IPv4_address/IPV4_ADDRESS/g' ${setupVars}
-  sed -i 's/IPv4addr/IPV4_ADDRESS/g' ${setupVars}
-  sed -i 's/IPv6_address/IPV6_ADDRESS/g' ${setupVars}
-  sed -i 's/piholeIPv6/IPV6_ADDRESS/g' ${setupVars}
-  sed -i 's/piholeDNS1/PIHOLE_DNS_1/g' ${setupVars}
-  sed -i 's/piholeDNS2/PIHOLE_DNS_2/g' ${setupVars}
-  sed -i 's/^INSTALL_WEB=/INSTALL_WEB_INTERFACE=/' ${setupVars}
-  # Add 'INSTALL_WEB_SERVER', if its not been applied already: https://github.com/pi-hole/pi-hole/pull/2115
-  if ! grep -q '^INSTALL_WEB_SERVER=' ${setupVars}; then
-    local webserver_installed=false
-    if grep -q '^INSTALL_WEB_INTERFACE=true' ${setupVars}; then
-      webserver_installed=true
+    sed -i 's/piholeInterface/PIHOLE_INTERFACE/g' ${setupVars}
+    sed -i 's/IPv4_address/IPV4_ADDRESS/g' ${setupVars}
+    sed -i 's/IPv4addr/IPV4_ADDRESS/g' ${setupVars}
+    sed -i 's/IPv6_address/IPV6_ADDRESS/g' ${setupVars}
+    sed -i 's/piholeIPv6/IPV6_ADDRESS/g' ${setupVars}
+    sed -i 's/piholeDNS1/PIHOLE_DNS_1/g' ${setupVars}
+    sed -i 's/piholeDNS2/PIHOLE_DNS_2/g' ${setupVars}
+    sed -i 's/^INSTALL_WEB=/INSTALL_WEB_INTERFACE=/' ${setupVars}
+    # Add 'INSTALL_WEB_SERVER', if its not been applied already: https://github.com/pi-hole/pi-hole/pull/2115
+    if ! grep -q '^INSTALL_WEB_SERVER=' ${setupVars}; then
+        local webserver_installed=false
+        if grep -q '^INSTALL_WEB_INTERFACE=true' ${setupVars}; then
+            webserver_installed=true
+        fi
+        echo -e "INSTALL_WEB_SERVER=$webserver_installed" >> ${setupVars}
     fi
-    echo -e "INSTALL_WEB_SERVER=$webserver_installed" >> ${setupVars}
-  fi
 }
 
 # Install base files and web interface
 installPihole() {
-  # Create the pihole user
-  create_pihole_user
+    # Create the pihole user
+    create_pihole_user
 
-  # If the user wants to install the Web interface,
-  if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-    if [[ ! -d "/var/www/html" ]]; then
-      # make the Web directory if necessary
-      mkdir -p /var/www/html
+    # If the user wants to install the Web interface,
+    if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+        if [[ ! -d "/var/www/html" ]]; then
+            # make the Web directory if necessary
+            mkdir -p /var/www/html
+        fi
+
+        if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+            # Set the owner and permissions
+            chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/www/html
+            chmod 775 /var/www/html
+            # Give pihole access to the Web server group
+            usermod -a -G ${LIGHTTPD_GROUP} pihole
+            # If the lighttpd command is executable,
+            if [[ -x "$(command -v lighty-enable-mod)" ]]; then
+                # enable fastcgi and fastcgi-php
+                lighty-enable-mod fastcgi fastcgi-php > /dev/null || true
+            else
+                # Otherwise, show info about installing them
+                echo -e  "  ${INFO} Warning: 'lighty-enable-mod' utility not found
+                Please ensure fastcgi is enabled if you experience issues\\n"
+            fi
+        fi
+    fi
+    # For updates and unattended install.
+    if [[ "${useUpdateVars}" == true ]]; then
+        accountForRefactor
+    fi
+    # Install base files and web interface
+    installScripts
+    # Install config files
+    installConfigs
+    # If the user wants to install the dashboard,
+    if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+        # do so
+        installPiholeWeb
+    fi
+    # Install the cron file
+    installCron
+    # Install the logrotate file
+    installLogrotate
+    # Check if FTL is installed
+    FTLdetect || echo -e "  ${CROSS} FTL Engine not installed"
+    # Configure the firewall
+    if [[ "${useUpdateVars}" == false ]]; then
+        configureFirewall
     fi
 
-    if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
-      # Set the owner and permissions
-      chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/www/html
-      chmod 775 /var/www/html
-      # Give pihole access to the Web server group
-      usermod -a -G ${LIGHTTPD_GROUP} pihole
-      # If the lighttpd command is executable,
-      if [[ -x "$(command -v lighty-enable-mod)" ]]; then
-        # enable fastcgi and fastcgi-php
-        lighty-enable-mod fastcgi fastcgi-php > /dev/null || true
-      else
-        # Otherwise, show info about installing them
-        echo -e  "  ${INFO} Warning: 'lighty-enable-mod' utility not found
-        Please ensure fastcgi is enabled if you experience issues\\n"
-      fi
-    fi
-  fi
-  # For updates and unattended install.
-  if [[ "${useUpdateVars}" == true ]]; then
-    accountForRefactor
-  fi
-  # Install base files and web interface
-  installScripts
-  # Install config files
-  installConfigs
-  # If the user wants to install the dashboard,
-  if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-    # do so
-    installPiholeWeb
-  fi
-  # Install the cron file
-  installCron
-  # Install the logrotate file
-  installLogrotate
-  # Check if FTL is installed
-  FTLdetect || echo -e "  ${CROSS} FTL Engine not installed"
-  # Configure the firewall
-  if [[ "${useUpdateVars}" == false ]]; then
-    configureFirewall
-  fi
+    # install a man page entry for pihole
+    install_manpage
 
-  # install a man page entry for pihole
-  install_manpage
-
-  # Update setupvars.conf with any variables that may or may not have been changed during the install
-  finalExports
+    # Update setupvars.conf with any variables that may or may not have been changed during the install
+    finalExports
 }
 
 # SELinux
 checkSelinux() {
-  # If the getenforce command exists,
-  if command -v getenforce &> /dev/null; then
-    # Store the current mode in a variable
-    enforceMode=$(getenforce)
-    echo -e "\\n  ${INFO} SELinux mode detected: ${enforceMode}"
+    # If the getenforce command exists,
+    if command -v getenforce &> /dev/null; then
+        # Store the current mode in a variable
+        enforceMode=$(getenforce)
+        echo -e "\\n  ${INFO} SELinux mode detected: ${enforceMode}"
 
-    # If it's enforcing,
-    if [[ "${enforceMode}" == "Enforcing" ]]; then
-      # Explain Pi-hole does not support it yet
-      whiptail --defaultno --title "SELinux Enforcing Detected" --yesno "SELinux is being ENFORCED on your system! \\n\\nPi-hole currently does not support SELinux, but you may still continue with the installation.\\n\\nNote: Web Admin will not be fully functional unless you set your policies correctly\\n\\nContinue installing Pi-hole?" ${r} ${c} || \
-        { echo -e "\\n  ${COL_LIGHT_RED}SELinux Enforcing detected, exiting installer${COL_NC}"; exit 1; }
-      echo -e "  ${INFO} Continuing installation with SELinux Enforcing
-  ${INFO} Please refer to official SELinux documentation to create a custom policy"
+        # If it's enforcing,
+        if [[ "${enforceMode}" == "Enforcing" ]]; then
+            # Explain Pi-hole does not support it yet
+            whiptail --defaultno --title "SELinux Enforcing Detected" --yesno "SELinux is being ENFORCED on your system! \\n\\nPi-hole currently does not support SELinux, but you may still continue with the installation.\\n\\nNote: Web Admin will not be fully functional unless you set your policies correctly\\n\\nContinue installing Pi-hole?" ${r} ${c} || \
+            { echo -e "\\n  ${COL_LIGHT_RED}SELinux Enforcing detected, exiting installer${COL_NC}"; exit 1; }
+            echo -e "  ${INFO} Continuing installation with SELinux Enforcing
+            ${INFO} Please refer to official SELinux documentation to create a custom policy"
+        fi
     fi
-  fi
 }
 
 # Installation complete message with instructions for the user
 displayFinalMessage() {
-  # If
-  if [[ "${#1}" -gt 0 ]] ; then
-    pwstring="$1"
-  # else, if the dashboard password in the setup variables exists,
-  elif [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) -gt 0 ]]; then
-    # set a variable for evaluation later
-    pwstring="unchanged"
-  else
-    # set a variable for evaluation later
-    pwstring="NOT SET"
-  fi
-   # If the user wants to install the dashboard,
-   if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-       # Store a message in a variable and display it
-       additional="View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin
+    # If
+    if [[ "${#1}" -gt 0 ]] ; then
+        pwstring="$1"
+        # else, if the dashboard password in the setup variables exists,
+    elif [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) -gt 0 ]]; then
+        # set a variable for evaluation later
+        pwstring="unchanged"
+    else
+        # set a variable for evaluation later
+        pwstring="NOT SET"
+    fi
+    # If the user wants to install the dashboard,
+    if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+        # Store a message in a variable and display it
+        additional="View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin
 
 Your Admin Webpage login password is ${pwstring}"
    fi
 
-  # Final completion message to user
-  whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
+    # Final completion message to user
+    whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
 
 IPv4:	${IPV4_ADDRESS%/*}
 IPv6:	${IPV6_ADDRESS:-"Not Configured"}
@@ -1844,645 +1863,653 @@ ${additional}" ${r} ${c}
 }
 
 update_dialogs() {
-  # If pihole -r "reconfigure" option was selected,
-  if [[ "${reconfigure}" = true ]]; then
-    # set some variables that will be used
-    opt1a="Repair"
-    opt1b="This will retain existing settings"
-    strAdd="You will remain on the same version"
-  # Otherwise,
-  else
-    # set some variables with different values
-    opt1a="Update"
-    opt1b="This will retain existing settings."
-    strAdd="You will be updated to the latest version."
-  fi
-  opt2a="Reconfigure"
-  opt2b="This will reset your Pi-hole and allow you to enter new settings."
+    # If pihole -r "reconfigure" option was selected,
+    if [[ "${reconfigure}" = true ]]; then
+        # set some variables that will be used
+        opt1a="Repair"
+        opt1b="This will retain existing settings"
+        strAdd="You will remain on the same version"
+    # Otherwise,
+    else
+        # set some variables with different values
+        opt1a="Update"
+        opt1b="This will retain existing settings."
+        strAdd="You will be updated to the latest version."
+    fi
+    opt2a="Reconfigure"
+    opt2b="This will reset your Pi-hole and allow you to enter new settings."
 
-  # Display the information to the user
-  UpdateCmd=$(whiptail --title "Existing Install Detected!" --menu "\\n\\nWe have detected an existing install.\\n\\nPlease choose from the following options: \\n($strAdd)" ${r} ${c} 2 \
-  "${opt1a}"  "${opt1b}" \
-  "${opt2a}"  "${opt2b}" 3>&2 2>&1 1>&3) || \
-  { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
+    # Display the information to the user
+    UpdateCmd=$(whiptail --title "Existing Install Detected!" --menu "\\n\\nWe have detected an existing install.\\n\\nPlease choose from the following options: \\n($strAdd)" ${r} ${c} 2 \
+    "${opt1a}"  "${opt1b}" \
+    "${opt2a}"  "${opt2b}" 3>&2 2>&1 1>&3) || \
+    { echo -e "  ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
 
-  # Set the variable based on if the user chooses
-  case ${UpdateCmd} in
-    # repair, or
-    ${opt1a})
-      echo -e "  ${INFO} ${opt1a} option selected"
-      useUpdateVars=true
-      ;;
-    # reconfigure,
-    ${opt2a})
-      echo -e "  ${INFO} ${opt2a} option selected"
-      useUpdateVars=false
-      ;;
+    # Set the variable based on if the user chooses
+    case ${UpdateCmd} in
+        # repair, or
+        ${opt1a})
+            echo -e "  ${INFO} ${opt1a} option selected"
+            useUpdateVars=true
+            ;;
+        # reconfigure,
+        ${opt2a})
+            echo -e "  ${INFO} ${opt2a} option selected"
+            useUpdateVars=false
+            ;;
     esac
 }
 
 check_download_exists() {
-  status=$(curl --head --silent "https://ftl.pi-hole.net/${1}" | head -n 1)
-  if grep -q "404" <<< "$status"; then
-    return 1
-  else
-    return 0
-  fi
+    status=$(curl --head --silent "https://ftl.pi-hole.net/${1}" | head -n 1)
+    if grep -q "404" <<< "$status"; then
+        return 1
+    else
+        return 0
+    fi
 }
 
 fully_fetch_repo() {
-  # Add upstream branches to shallow clone
-  local directory="${1}"
+    # Add upstream branches to shallow clone
+    local directory="${1}"
 
-  cd "${directory}" || return 1
-  if is_repo "${directory}"; then
-    git remote set-branches origin '*' || return 1
-    git fetch --quiet || return 1
-  else
-    return 1
-  fi
-  return 0
+    cd "${directory}" || return 1
+    if is_repo "${directory}"; then
+        git remote set-branches origin '*' || return 1
+        git fetch --quiet || return 1
+    else
+        return 1
+    fi
+    return 0
 }
 
 get_available_branches() {
-  # Return available branches
-  local directory
-  directory="${1}"
-  local output
+    # Return available branches
+    local directory
+    directory="${1}"
+    local output
 
-  cd "${directory}" || return 1
-  # Get reachable remote branches, but store STDERR as STDOUT variable
-  output=$( { git remote show origin | grep 'tracked' | sed 's/tracked//;s/ //g'; } 2>&1 )
-  echo "$output"
-  return
+    cd "${directory}" || return 1
+    # Get reachable remote branches, but store STDERR as STDOUT variable
+    output=$( { git remote show origin | grep 'tracked' | sed 's/tracked//;s/ //g'; } 2>&1 )
+    echo "$output"
+    return
 }
 
 fetch_checkout_pull_branch() {
-  # Check out specified branch
-  local directory
-  directory="${1}"
-  local branch
-  branch="${2}"
+    # Check out specified branch
+    local directory
+    directory="${1}"
+    local branch
+    branch="${2}"
 
-  # Set the reference for the requested branch, fetch, check it put and pull it
-  cd "${directory}" || return 1
-  git remote set-branches origin "${branch}" || return 1
-  git stash --all --quiet &> /dev/null || true
-  git clean --quiet --force -d || true
-  git fetch --quiet || return 1
-  checkout_pull_branch "${directory}" "${branch}" || return 1
+    # Set the reference for the requested branch, fetch, check it put and pull it
+    cd "${directory}" || return 1
+    git remote set-branches origin "${branch}" || return 1
+    git stash --all --quiet &> /dev/null || true
+    git clean --quiet --force -d || true
+    git fetch --quiet || return 1
+    checkout_pull_branch "${directory}" "${branch}" || return 1
 }
 
 checkout_pull_branch() {
-  # Check out specified branch
-  local directory
-  directory="${1}"
-  local branch
-  branch="${2}"
-  local oldbranch
+    # Check out specified branch
+    local directory
+    directory="${1}"
+    local branch
+    branch="${2}"
+    local oldbranch
 
-  cd "${directory}" || return 1
+    cd "${directory}" || return 1
 
-  oldbranch="$(git symbolic-ref HEAD)"
+    oldbranch="$(git symbolic-ref HEAD)"
 
-  str="Switching to branch: '${branch}' from '${oldbranch}'"
-  echo -ne "  ${INFO} $str"
-  git checkout "${branch}" --quiet || return 1
-  echo -e "${OVER}  ${TICK} $str"
+    str="Switching to branch: '${branch}' from '${oldbranch}'"
+    echo -ne "  ${INFO} $str"
+    git checkout "${branch}" --quiet || return 1
+    echo -e "${OVER}  ${TICK} $str"
 
-  git_pull=$(git pull || return 1)
+    git_pull=$(git pull || return 1)
 
-  if [[ "$git_pull" == *"up-to-date"* ]]; then
-    echo -e "  ${INFO} ${git_pull}"
-  else
-    echo -e "$git_pull\\n"
-  fi
+    if [[ "$git_pull" == *"up-to-date"* ]]; then
+        echo -e "  ${INFO} ${git_pull}"
+    else
+        echo -e "$git_pull\\n"
+    fi
 
-  return 0
+    return 0
 }
 
 clone_or_update_repos() {
-  # If the user wants to reconfigure,
-  if [[ "${reconfigure}" == true ]]; then
-    echo "  ${INFO} Performing reconfiguration, skipping download of local repos"
-    # Reset the Core repo
-    resetRepo ${PI_HOLE_LOCAL_REPO} || \
-      { echo -e "  ${COL_LIGHT_RED}Unable to reset ${PI_HOLE_LOCAL_REPO}, exiting installer${COL_NC}"; \
+    # If the user wants to reconfigure,
+    if [[ "${reconfigure}" == true ]]; then
+        echo "  ${INFO} Performing reconfiguration, skipping download of local repos"
+        # Reset the Core repo
+        resetRepo ${PI_HOLE_LOCAL_REPO} || \
+        { echo -e "  ${COL_LIGHT_RED}Unable to reset ${PI_HOLE_LOCAL_REPO}, exiting installer${COL_NC}"; \
         exit 1; \
-      }
-    # If the Web interface was installed,
-    if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-      # reset it's repo
-      resetRepo ${webInterfaceDir} || \
-        { echo -e "  ${COL_LIGHT_RED}Unable to reset ${webInterfaceDir}, exiting installer${COL_NC}"; \
-          exit 1; \
         }
+        # If the Web interface was installed,
+        if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+            # reset it's repo
+            resetRepo ${webInterfaceDir} || \
+            { echo -e "  ${COL_LIGHT_RED}Unable to reset ${webInterfaceDir}, exiting installer${COL_NC}"; \
+            exit 1; \
+            }
+        fi
+    # Otherwise, a repair is happening
+    else
+        # so get git files for Core
+        getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl} || \
+        { echo -e "  ${COL_LIGHT_RED}Unable to clone ${piholeGitUrl} into ${PI_HOLE_LOCAL_REPO}, unable to continue${COL_NC}"; \
+        exit 1; \
+        }
+        # If the Web interface was installed,
+        if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+            # get the Web git files
+            getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl} || \
+            { echo -e "  ${COL_LIGHT_RED}Unable to clone ${webInterfaceGitUrl} into ${webInterfaceDir}, exiting installer${COL_NC}"; \
+            exit 1; \
+            }
+        fi
     fi
-  # Otherwise, a repair is happening
-  else
-    # so get git files for Core
-    getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl} || \
-      { echo -e "  ${COL_LIGHT_RED}Unable to clone ${piholeGitUrl} into ${PI_HOLE_LOCAL_REPO}, unable to continue${COL_NC}"; \
-        exit 1; \
-      }
-      # If the Web interface was installed,
-      if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-        # get the Web git files
-        getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl} || \
-        { echo -e "  ${COL_LIGHT_RED}Unable to clone ${webInterfaceGitUrl} into ${webInterfaceDir}, exiting installer${COL_NC}"; \
-          exit 1; \
-        }
-      fi
-  fi
 }
 
 # Download FTL binary to random temp directory and install FTL binary
 FTLinstall() {
-  # Local, named variables
-  local binary="${1}"
-  local latesttag
-  local str="Downloading and Installing FTL"
-  echo -ne "  ${INFO} ${str}..."
+    # Local, named variables
+    local binary="${1}"
+    local latesttag
+    local str="Downloading and Installing FTL"
+    echo -ne "  ${INFO} ${str}..."
 
-  # Find the latest version tag for FTL
-  latesttag=$(curl -sI https://github.com/pi-hole/FTL/releases/latest | grep "Location" | awk -F '/' '{print $NF}')
-  # Tags should always start with v, check for that.
-  if [[ ! "${latesttag}" == v* ]]; then
-    echo -e "${OVER}  ${CROSS} ${str}"
-    echo -e "  ${COL_LIGHT_RED}Error: Unable to get latest release location from GitHub${COL_NC}"
-    return 1
-  fi
+    # Find the latest version tag for FTL
+    latesttag=$(curl -sI https://github.com/pi-hole/FTL/releases/latest | grep "Location" | awk -F '/' '{print $NF}')
+    # Tags should always start with v, check for that.
+    if [[ ! "${latesttag}" == v* ]]; then
+        echo -e "${OVER}  ${CROSS} ${str}"
+        echo -e "  ${COL_LIGHT_RED}Error: Unable to get latest release location from GitHub${COL_NC}"
+        return 1
+    fi
 
-  # Move into the temp ftl directory
-  pushd "$(mktemp -d)" > /dev/null || { echo "Unable to make temporary directory for FTL binary download"; return 1; }
+    # Move into the temp ftl directory
+    pushd "$(mktemp -d)" > /dev/null || { echo "Unable to make temporary directory for FTL binary download"; return 1; }
 
-  # Always replace pihole-FTL.service
-  install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/pihole-FTL.service" "/etc/init.d/pihole-FTL"
+    # Always replace pihole-FTL.service
+    install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/pihole-FTL.service" "/etc/init.d/pihole-FTL"
 
-  local ftlBranch
-  local url
-  local ftlBranch
+    local ftlBranch
+    local url
 
-  if [[ -f "/etc/pihole/ftlbranch" ]];then
-    ftlBranch=$(</etc/pihole/ftlbranch)
-  else
-    ftlBranch="master"
-  fi
+    if [[ -f "/etc/pihole/ftlbranch" ]];then
+        ftlBranch=$(</etc/pihole/ftlbranch)
+    else
+        ftlBranch="master"
+    fi
 
-  # Determine which version of FTL to download
-  if [[ "${ftlBranch}" == "master" ]];then
-    url="https://github.com/pi-hole/FTL/releases/download/${latesttag%$'\r'}"
-  else
-    url="https://ftl.pi-hole.net/${ftlBranch}"
-  fi
+    # Determine which version of FTL to download
+    if [[ "${ftlBranch}" == "master" ]];then
+        url="https://github.com/pi-hole/FTL/releases/download/${latesttag%$'\r'}"
+    else
+        url="https://ftl.pi-hole.net/${ftlBranch}"
+    fi
 
-  # If the download worked,
-  if curl -sSL --fail "${url}/${binary}" -o "${binary}"; then
-    # get sha1 of the binary we just downloaded for verification.
-    curl -sSL --fail "${url}/${binary}.sha1" -o "${binary}.sha1"
+    # If the download worked,
+    if curl -sSL --fail "${url}/${binary}" -o "${binary}"; then
+        # get sha1 of the binary we just downloaded for verification.
+        curl -sSL --fail "${url}/${binary}.sha1" -o "${binary}.sha1"
 
-    # If we downloaded binary file (as opposed to text),
-    if sha1sum --status --quiet -c "${binary}".sha1; then
-      echo -n "transferred... "
-      # Stop FTL
-      stop_service pihole-FTL &> /dev/null
-      # Install the new version with the correct permissions
-      install -T -m 0755 "${binary}" /usr/bin/pihole-FTL
-      # Move back into the original directory the user was in
-      popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
-      # Install the FTL service
-      echo -e "${OVER}  ${TICK} ${str}"
-      # dnsmasq can now be stopped and disabled if it exists
-      if which dnsmasq > /dev/null; then
-        if check_service_active "dnsmasq";then
-          echo "  ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately"
-          stop_service dnsmasq
-          disable_service dnsmasq
+        # If we downloaded binary file (as opposed to text),
+        if sha1sum --status --quiet -c "${binary}".sha1; then
+            echo -n "transferred... "
+            # Stop FTL
+            stop_service pihole-FTL &> /dev/null
+            # Install the new version with the correct permissions
+            install -T -m 0755 "${binary}" /usr/bin/pihole-FTL
+            # Move back into the original directory the user was in
+            popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
+            # Install the FTL service
+            echo -e "${OVER}  ${TICK} ${str}"
+            # dnsmasq can now be stopped and disabled if it exists
+            if which dnsmasq > /dev/null; then
+                if check_service_active "dnsmasq";then
+                    echo "  ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately"
+                    stop_service dnsmasq
+                    disable_service dnsmasq
+                fi
+            fi
+
+            #ensure /etc/dnsmasq.conf contains `conf-dir=/etc/dnsmasq.d`
+            confdir="conf-dir=/etc/dnsmasq.d"
+            conffile="/etc/dnsmasq.conf"
+            if ! grep -q "$confdir" "$conffile"; then
+                echo "$confdir" >> "$conffile"
+            fi
+
+            return 0
+        # Otherwise,
+        else
+            # the download failed, so just go back to the original directory
+            popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
+            echo -e "${OVER}  ${CROSS} ${str}"
+            echo -e "  ${COL_LIGHT_RED}Error: Download of binary from Github failed${COL_NC}"
+            return 1
         fi
-      fi
-
-      #ensure /etc/dnsmasq.conf contains `conf-dir=/etc/dnsmasq.d`
-      confdir="conf-dir=/etc/dnsmasq.d"
-      conffile="/etc/dnsmasq.conf"
-      if ! grep -q "$confdir" "$conffile"; then
-          echo "$confdir" >> "$conffile"
-      fi
-
-      return 0
     # Otherwise,
     else
-      # the download failed, so just go back to the original directory
-      popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
-      echo -e "${OVER}  ${CROSS} ${str}"
-      echo -e "  ${COL_LIGHT_RED}Error: Download of binary from Github failed${COL_NC}"
-      return 1
+        popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
+        echo -e "${OVER}  ${CROSS} ${str}"
+        # The URL could not be found
+        echo -e "  ${COL_LIGHT_RED}Error: URL not found${COL_NC}"
+        return 1
     fi
-  # Otherwise,
-  else
-    popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
-    echo -e "${OVER}  ${CROSS} ${str}"
-    # The URL could not be found
-    echo -e "  ${COL_LIGHT_RED}Error: URL not found${COL_NC}"
-    return 1
-  fi
 }
 
 get_binary_name() {
-# Local, named variables
-  local machine
-  # Store architecture in a variable
-  machine=$(uname -m)
+    # This gives the machine architecture which may be different from the OS architecture...
+    local machine
+    machine=$(uname -m)
 
-  local str="Detecting architecture"
-  echo -ne "  ${INFO} ${str}..."
-  # If the machine is arm or aarch
-  if [[ "${machine}" == "arm"* || "${machine}" == *"aarch"* ]]; then
-    # ARM
-    #
-    local rev
-    rev=$(uname -m | sed "s/[^0-9]//g;")
-    #
-    local lib
-    lib=$(ldd /bin/ls | grep -E '^\s*/lib' | awk '{ print $1 }')
-    #
-    if [[ "${lib}" == "/lib/ld-linux-aarch64.so.1" ]]; then
-      echo -e "${OVER}  ${TICK} Detected ARM-aarch64 architecture"
-      # set the binary to be used
-      binary="pihole-FTL-aarch64-linux-gnu"
-    #
-    elif [[ "${lib}" == "/lib/ld-linux-armhf.so.3" ]]; then
-      #
-      if [[ "${rev}" -gt 6 ]]; then
-        echo -e "${OVER}  ${TICK} Detected ARM-hf architecture (armv7+)"
+    local str="Detecting architecture"
+    echo -ne "  ${INFO} ${str}..."
+    # If the machine is arm or aarch
+    if [[ "${machine}" == "arm"* || "${machine}" == *"aarch"* ]]; then
+        # ARM
+        #
+        local rev
+        rev=$(uname -m | sed "s/[^0-9]//g;")
+        #
+        local lib
+        lib=$(ldd /bin/ls | grep -E '^\s*/lib' | awk '{ print $1 }')
+        #
+        if [[ "${lib}" == "/lib/ld-linux-aarch64.so.1" ]]; then
+            echo -e "${OVER}  ${TICK} Detected ARM-aarch64 architecture"
+            # set the binary to be used
+            binary="pihole-FTL-aarch64-linux-gnu"
+        #
+        elif [[ "${lib}" == "/lib/ld-linux-armhf.so.3" ]]; then
+            #
+            if [[ "${rev}" -gt 6 ]]; then
+                echo -e "${OVER}  ${TICK} Detected ARM-hf architecture (armv7+)"
+                # set the binary to be used
+                binary="pihole-FTL-arm-linux-gnueabihf"
+            # Otherwise,
+            else
+                echo -e "${OVER}  ${TICK} Detected ARM-hf architecture (armv6 or lower) Using ARM binary"
+                # set the binary to be used
+                binary="pihole-FTL-arm-linux-gnueabi"
+            fi
+        else
+            echo -e "${OVER}  ${TICK} Detected ARM architecture"
+            # set the binary to be used
+            binary="pihole-FTL-arm-linux-gnueabi"
+        fi
+    elif [[ "${machine}" == "ppc" ]]; then
+        # PowerPC
+        echo -e "${OVER}  ${TICK} Detected PowerPC architecture"
         # set the binary to be used
-        binary="pihole-FTL-arm-linux-gnueabihf"
-      # Otherwise,
-      else
-        echo -e "${OVER}  ${TICK} Detected ARM-hf architecture (armv6 or lower) Using ARM binary"
-        # set the binary to be used
-        binary="pihole-FTL-arm-linux-gnueabi"
-      fi
+        binary="pihole-FTL-powerpc-linux-gnu"
+    elif [[ "${machine}" == "x86_64" ]]; then
+        # This gives the architecture of packages dpkg installs (for example, "i386")
+        local dpkgarch
+        dpkgarch=$(dpkg --print-architecture 2> /dev/null)
+
+        # Special case: This is a 32 bit OS, installed on a 64 bit machine
+        # -> change machine architecture to download the 32 bit executable
+        if [[ "${dpkgarch}" == "i386" ]]; then
+            echo -e "${OVER}  ${TICK} Detected 32bit (i686) architecture"
+            binary="pihole-FTL-linux-x86_32"
+        else
+            # 64bit
+            echo -e "${OVER}  ${TICK} Detected x86_64 architecture"
+            # set the binary to be used
+            binary="pihole-FTL-linux-x86_64"
+        fi
     else
-      echo -e "${OVER}  ${TICK} Detected ARM architecture"
-      # set the binary to be used
-      binary="pihole-FTL-arm-linux-gnueabi"
+        # Something else - we try to use 32bit executable and warn the user
+        if [[ ! "${machine}" == "i686" ]]; then
+            echo -e "${OVER}  ${CROSS} ${str}..."
+            echo -e "  ${INFO} ${COL_LIGHT_RED}Not able to detect architecture (unknown: ${machine}), trying 32bit executable${COL_NC}"
+            echo -e "  ${INFO} Contact Pi-hole Support if you experience issues (e.g: FTL not running)"
+        else
+            echo -e "${OVER}  ${TICK} Detected 32bit (i686) architecture"
+        fi
+        binary="pihole-FTL-linux-x86_32"
     fi
-  elif [[ "${machine}" == "ppc" ]]; then
-    # PowerPC
-    echo -e "${OVER}  ${TICK} Detected PowerPC architecture"
-    # set the binary to be used
-    binary="pihole-FTL-powerpc-linux-gnu"
-  elif [[ "${machine}" == "x86_64" ]]; then
-    # 64bit
-    echo -e "${OVER}  ${TICK} Detected x86_64 architecture"
-    # set the binary to be used
-    binary="pihole-FTL-linux-x86_64"
-  else
-    # Something else - we try to use 32bit executable and warn the user
-    if [[ ! "${machine}" == "i686" ]]; then
-      echo -e "${OVER}  ${CROSS} ${str}...
-      ${COL_LIGHT_RED}Not able to detect architecture (unknown: ${machine}), trying 32bit executable${COL_NC}
-      Contact Pi-hole Support if you experience issues (e.g: FTL not running)"
-    else
-      echo -e "${OVER}  ${TICK} Detected 32bit (i686) architecture"
-    fi
-    binary="pihole-FTL-linux-x86_32"
-  fi
 }
 
-FTLcheckUpdate()
-{
-  get_binary_name
+FTLcheckUpdate() {
+    get_binary_name
 
-  #In the next section we check to see if FTL is already installed (in case of pihole -r).
-  #If the installed version matches the latest version, then check the installed sha1sum of the binary vs the remote sha1sum. If they do not match, then download
-  echo -e "  ${INFO} Checking for existing FTL binary..."
+    #In the next section we check to see if FTL is already installed (in case of pihole -r).
+    #If the installed version matches the latest version, then check the installed sha1sum of the binary vs the remote sha1sum. If they do not match, then download
+    echo -e "  ${INFO} Checking for existing FTL binary..."
 
-  local ftlLoc
-  ftlLoc=$(which pihole-FTL 2>/dev/null)
+    local ftlLoc
+    ftlLoc=$(which pihole-FTL 2>/dev/null)
 
-  local ftlBranch
+    local ftlBranch
 
-  if [[ -f "/etc/pihole/ftlbranch" ]];then
-    ftlBranch=$(</etc/pihole/ftlbranch)
-  else
-    ftlBranch="master"
-  fi
-
-  local remoteSha1
-  local localSha1
-
-   # if dnsmasq exists and is running at this point, force reinstall of FTL Binary
-  if which dnsmasq > /dev/null; then
-    if check_service_active "dnsmasq";then
-      return 0
-    fi
-  fi
-
-  if [[ ! "${ftlBranch}" == "master" ]]; then
-    #Check whether or not the binary for this FTL branch actually exists. If not, then there is no update!
-    local path
-    path="${ftlBranch}/${binary}"
-    # shellcheck disable=SC1090
-    if ! check_download_exists "$path"; then
-      echo -e "  ${INFO} Branch \"${ftlBranch}\" is not available.\\n  ${INFO} Use ${COL_LIGHT_GREEN}pihole checkout ftl [branchname]${COL_NC} to switch to a valid branch."
-      return 2
-    fi
-
-    if [[ ${ftlLoc} ]]; then
-      # We already have a pihole-FTL binary downloaded.
-      # Alt branches don't have a tagged version against them, so just confirm the checksum of the local vs remote to decide whether we download or not
-      remoteSha1=$(curl -sSL --fail "https://ftl.pi-hole.net/${ftlBranch}/${binary}.sha1" | cut -d ' ' -f 1)
-      localSha1=$(sha1sum "$(which pihole-FTL)" | cut -d ' ' -f 1)
-
-      if [[ "${remoteSha1}" != "${localSha1}" ]]; then
-        echo -e "  ${INFO} Checksums do not match, downloading from ftl.pi-hole.net."
-        return 0
-      else
-        echo -e "  ${INFO} Checksum of installed binary matches remote. No need to download!"
-        return 1
-      fi
+    if [[ -f "/etc/pihole/ftlbranch" ]];then
+        ftlBranch=$(</etc/pihole/ftlbranch)
     else
-      return 0
+        ftlBranch="master"
     fi
-  else
-    if [[ ${ftlLoc} ]]; then
-      local FTLversion
-      FTLversion=$(/usr/bin/pihole-FTL tag)
-      local FTLlatesttag
-      FTLlatesttag=$(curl -sI https://github.com/pi-hole/FTL/releases/latest | grep 'Location' | awk -F '/' '{print $NF}' | tr -d '\r\n')
 
-      if [[ "${FTLversion}" != "${FTLlatesttag}" ]]; then
-        return 0
-      else
-        echo -e "  ${INFO} Latest FTL Binary already installed (${FTLlatesttag}). Confirming Checksum..."
+    local remoteSha1
+    local localSha1
 
-        remoteSha1=$(curl -sSL --fail "https://github.com/pi-hole/FTL/releases/download/${FTLversion%$'\r'}/${binary}.sha1" | cut -d ' ' -f 1)
-        localSha1=$(sha1sum "$(which pihole-FTL)" | cut -d ' ' -f 1)
-
-        if [[ "${remoteSha1}" != "${localSha1}" ]]; then
-          echo -e "  ${INFO} Corruption detected..."
-          return 0
-        else
-          echo -e "  ${INFO} Checksum correct. No need to download!"
-          return 1
+    # if dnsmasq exists and is running at this point, force reinstall of FTL Binary
+    if which dnsmasq > /dev/null; then
+        if check_service_active "dnsmasq";then
+            return 0
+        fi
+    fi
+
+    if [[ ! "${ftlBranch}" == "master" ]]; then
+        #Check whether or not the binary for this FTL branch actually exists. If not, then there is no update!
+        local path
+        path="${ftlBranch}/${binary}"
+        # shellcheck disable=SC1090
+        if ! check_download_exists "$path"; then
+            echo -e "  ${INFO} Branch \"${ftlBranch}\" is not available.\\n  ${INFO} Use ${COL_LIGHT_GREEN}pihole checkout ftl [branchname]${COL_NC} to switch to a valid branch."
+            return 2
+        fi
+
+        if [[ ${ftlLoc} ]]; then
+            # We already have a pihole-FTL binary downloaded.
+            # Alt branches don't have a tagged version against them, so just confirm the checksum of the local vs remote to decide whether we download or not
+            remoteSha1=$(curl -sSL --fail "https://ftl.pi-hole.net/${ftlBranch}/${binary}.sha1" | cut -d ' ' -f 1)
+            localSha1=$(sha1sum "$(which pihole-FTL)" | cut -d ' ' -f 1)
+
+            if [[ "${remoteSha1}" != "${localSha1}" ]]; then
+                echo -e "  ${INFO} Checksums do not match, downloading from ftl.pi-hole.net."
+                return 0
+            else
+                echo -e "  ${INFO} Checksum of installed binary matches remote. No need to download!"
+                return 1
+            fi
+        else
+            return 0
+        fi
+    else
+        if [[ ${ftlLoc} ]]; then
+            local FTLversion
+            FTLversion=$(/usr/bin/pihole-FTL tag)
+            local FTLlatesttag
+            FTLlatesttag=$(curl -sI https://github.com/pi-hole/FTL/releases/latest | grep 'Location' | awk -F '/' '{print $NF}' | tr -d '\r\n')
+
+            if [[ "${FTLversion}" != "${FTLlatesttag}" ]]; then
+                return 0
+            else
+                echo -e "  ${INFO} Latest FTL Binary already installed (${FTLlatesttag}). Confirming Checksum..."
+
+                remoteSha1=$(curl -sSL --fail "https://github.com/pi-hole/FTL/releases/download/${FTLversion%$'\r'}/${binary}.sha1" | cut -d ' ' -f 1)
+                localSha1=$(sha1sum "$(which pihole-FTL)" | cut -d ' ' -f 1)
+
+                if [[ "${remoteSha1}" != "${localSha1}" ]]; then
+                    echo -e "  ${INFO} Corruption detected..."
+                    return 0
+                else
+                    echo -e "  ${INFO} Checksum correct. No need to download!"
+                    return 1
+                fi
+            fi
+        else
+            return 0
         fi
-      fi
-    else
-      return 0
     fi
-  fi
 }
 
 # Detect suitable FTL binary platform
 FTLdetect() {
-  echo ""
-  echo -e "  ${INFO} FTL Checks..."
+    echo ""
+    echo -e "  ${INFO} FTL Checks..."
 
-  if FTLcheckUpdate ; then
-    FTLinstall "${binary}" || return 1
-  fi
+    if FTLcheckUpdate ; then
+        FTLinstall "${binary}" || return 1
+    fi
 
-  echo ""
+    echo ""
 }
 
 make_temporary_log() {
-  # Create a random temporary file for the log
-  TEMPLOG=$(mktemp /tmp/pihole_temp.XXXXXX)
-  # Open handle 3 for templog
-  # https://stackoverflow.com/questions/18460186/writing-outputs-to-log-file-and-console
-  exec 3>"$TEMPLOG"
-  # Delete templog, but allow for addressing via file handle
-  # This lets us write to the log without having a temporary file on the drive, which
-  # is meant to be a security measure so there is not a lingering file on the drive during the install process
-  rm "$TEMPLOG"
+    # Create a random temporary file for the log
+    TEMPLOG=$(mktemp /tmp/pihole_temp.XXXXXX)
+    # Open handle 3 for templog
+    # https://stackoverflow.com/questions/18460186/writing-outputs-to-log-file-and-console
+    exec 3>"$TEMPLOG"
+    # Delete templog, but allow for addressing via file handle
+    # This lets us write to the log without having a temporary file on the drive, which
+    # is meant to be a security measure so there is not a lingering file on the drive during the install process
+    rm "$TEMPLOG"
 }
 
 copy_to_install_log() {
-  # Copy the contents of file descriptor 3 into the install log
-  # Since we use color codes such as '\e[1;33m', they should be removed
-  sed 's/\[[0-9;]\{1,5\}m//g' < /proc/$$/fd/3 > "${installLogLoc}"
+    # Copy the contents of file descriptor 3 into the install log
+    # Since we use color codes such as '\e[1;33m', they should be removed
+    sed 's/\[[0-9;]\{1,5\}m//g' < /proc/$$/fd/3 > "${installLogLoc}"
 }
 
 main() {
-  ######## FIRST CHECK ########
-  # Must be root to install
-  local str="Root user check"
-  echo ""
+    ######## FIRST CHECK ########
+    # Must be root to install
+    local str="Root user check"
+    echo ""
 
-  # If the user's id is zero,
-  if [[ "${EUID}" -eq 0 ]]; then
-    # they are root and all is good
-    echo -e "  ${TICK} ${str}"
-    # Show the Pi-hole logo so people know it's genuine since the logo and name are trademarked
-    show_ascii_berry
-    make_temporary_log
-  # Otherwise,
-  else
-    # They do not have enough privileges, so let the user know
-    echo -e "  ${CROSS} ${str}
-      ${COL_LIGHT_RED}Script called with non-root privileges${COL_NC}
-      The Pi-hole requires elevated privileges to install and run
-      Please check the installer for any concerns regarding this requirement
-      Make sure to download this script from a trusted source\\n"
-    echo -ne "  ${INFO} Sudo utility check"
-
-    # If the sudo command exists,
-    if command -v sudo &> /dev/null; then
-      echo -e "${OVER}  ${TICK} Sudo utility check"
-      # Download the install script and run it with admin rights
-      exec curl -sSL https://raw.githubusercontent.com/pi-hole/pi-hole/master/automated%20install/basic-install.sh | sudo bash "$@"
-      exit $?
+    # If the user's id is zero,
+    if [[ "${EUID}" -eq 0 ]]; then
+        # they are root and all is good
+        echo -e "  ${TICK} ${str}"
+        # Show the Pi-hole logo so people know it's genuine since the logo and name are trademarked
+        show_ascii_berry
+        make_temporary_log
     # Otherwise,
     else
-      # Let them know they need to run it as root
-      echo -e "${OVER}  ${CROSS} Sudo utility check
-      Sudo is needed for the Web Interface to run pihole commands\\n
-  ${COL_LIGHT_RED}Please re-run this installer as root${COL_NC}"
-      exit 1
+        # They do not have enough privileges, so let the user know
+        echo -e "  ${CROSS} ${str}"
+        echo -e "  ${INFO} ${COL_LIGHT_RED}Script called with non-root privileges${COL_NC}"
+        echo -e "  ${INFO} The Pi-hole requires elevated privileges to install and run"
+        echo -e "  ${INFO} Please check the installer for any concerns regarding this requirement"
+        echo -e "  ${INFO} Make sure to download this script from a trusted source\\n"
+        echo -ne "  ${INFO} Sudo utility check"
+
+        # If the sudo command exists,
+        if command -v sudo &> /dev/null; then
+            echo -e "${OVER}  ${TICK} Sudo utility check"
+            # Download the install script and run it with admin rights
+            exec curl -sSL https://raw.githubusercontent.com/pi-hole/pi-hole/master/automated%20install/basic-install.sh | sudo bash "$@"
+            exit $?
+        # Otherwise,
+        else
+            # Let them know they need to run it as root
+            echo -e "${OVER}  ${CROSS} Sudo utility check"
+            echo -e "  ${INFO} Sudo is needed for the Web Interface to run pihole commands\\n"
+            echo -e "  ${INFO} ${COL_LIGHT_RED}Please re-run this installer as root${COL_NC}"
+            exit 1
+        fi
     fi
-  fi
 
-  # Check for supported distribution
-  distro_check
+    # Check for supported distribution
+    distro_check
 
-  # If the setup variable file exists,
-  if [[ -f "${setupVars}" ]]; then
-    # if it's running unattended,
-    if [[ "${runUnattended}" == true ]]; then
-      echo -e "  ${INFO} Performing unattended setup, no whiptail dialogs will be displayed"
-      # Use the setup variables
-      useUpdateVars=true
-    # Otherwise,
+    # If the setup variable file exists,
+    if [[ -f "${setupVars}" ]]; then
+        # if it's running unattended,
+        if [[ "${runUnattended}" == true ]]; then
+            echo -e "  ${INFO} Performing unattended setup, no whiptail dialogs will be displayed"
+            # Use the setup variables
+            useUpdateVars=true
+        # Otherwise,
+        else
+            # show the available options (repair/reconfigure)
+            update_dialogs
+        fi
+    fi
+
+    # Start the installer
+    # Verify there is enough disk space for the install
+    if [[ "${skipSpaceCheck}" == true ]]; then
+        echo -e "  ${INFO} Skipping free disk space verification"
     else
-      # show the available options (repair/reconfigure)
-      update_dialogs
+        verifyFreeDiskSpace
     fi
-  fi
 
-  # Start the installer
-  # Verify there is enough disk space for the install
-  if [[ "${skipSpaceCheck}" == true ]]; then
-    echo -e "  ${INFO} Skipping free disk space verification"
-  else
-    verifyFreeDiskSpace
-  fi
+    # Update package cache
+    update_package_cache || exit 1
 
-  # Update package cache
-  update_package_cache || exit 1
+    # Notify user of package availability
+    notify_package_updates_available
 
-  # Notify user of package availability
-  notify_package_updates_available
+    # Install packages used by this installation script
+    install_dependent_packages INSTALLER_DEPS[@]
 
-  # Install packages used by this installation script
-  install_dependent_packages INSTALLER_DEPS[@]
+    # Check if SELinux is Enforcing
+    checkSelinux
 
-   # Check if SELinux is Enforcing
-  checkSelinux
-
-  if [[ "${useUpdateVars}" == false ]]; then
-    # Display welcome dialogs
-    welcomeDialogs
-    # Create directory for Pi-hole storage
-    mkdir -p /etc/pihole/
-    # Determine available interfaces
-    get_available_interfaces
-    # Find interfaces and let the user choose one
-    chooseInterface
-    # Decide what upstream DNS Servers to use
-    setDNS
-    # Give the user a choice of blocklists to include in their install. Or not.
-    chooseBlocklists
-    # Let the user decide if they want to block ads over IPv4 and/or IPv6
-    use4andor6
-    # Let the user decide if they want the web interface to be installed automatically
-    setAdminFlag
-    # Let the user decide if they want query logging enabled...
-    setLogging
-  else
-    # Source ${setupVars} to use predefined user variables in the functions
-    source ${setupVars}
-  fi
-  # Clone/Update the repos
-  clone_or_update_repos
-
-  # Install the Core dependencies
-  local dep_install_list=("${PIHOLE_DEPS[@]}")
-  if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
-    # Install the Web dependencies
-    dep_install_list+=("${PIHOLE_WEB_DEPS[@]}")
-  fi
-
-  install_dependent_packages dep_install_list[@]
-  unset dep_install_list
-
-  # On some systems, lighttpd is not enabled on first install. We need to enable it here if the user
-  # has chosen to install the web interface, else the `LIGHTTPD_ENABLED` check will fail
-  if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
-    enable_service lighttpd
-  fi
-  # Determine if lighttpd is correctly enabled
-  if check_service_active "lighttpd"; then
-      LIGHTTPD_ENABLED=true
+    if [[ "${useUpdateVars}" == false ]]; then
+        # Display welcome dialogs
+        welcomeDialogs
+        # Create directory for Pi-hole storage
+        mkdir -p /etc/pihole/
+        # Determine available interfaces
+        get_available_interfaces
+        # Find interfaces and let the user choose one
+        chooseInterface
+        # Decide what upstream DNS Servers to use
+        setDNS
+        # Give the user a choice of blocklists to include in their install. Or not.
+        chooseBlocklists
+        # Let the user decide if they want to block ads over IPv4 and/or IPv6
+        use4andor6
+        # Let the user decide if they want the web interface to be installed automatically
+        setAdminFlag
+        # Let the user decide if they want query logging enabled...
+        setLogging
     else
-      LIGHTTPD_ENABLED=false
-  fi
-
-  # Install and log everything to a file
-  installPihole | tee -a /proc/$$/fd/3
-
-  # Copy the temp log file into final log location for storage
-  copy_to_install_log
-
-  if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-    # Add password to web UI if there is none
-    pw=""
-    # If no password is set,
-    if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
-        # generate a random password
-        pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
-        # shellcheck disable=SC1091
-        . /opt/pihole/webpage.sh
-        echo "WEBPASSWORD=$(HashPassword ${pw})" >> ${setupVars}
+        # Source ${setupVars} to use predefined user variables in the functions
+        source ${setupVars}
     fi
-  fi
+    # Clone/Update the repos
+    clone_or_update_repos
 
-  # Check for and disable systemd-resolved-DNSStubListener before reloading resolved
-  # DNSStubListener needs to remain in place for installer to download needed files,
-  # so this change needs to be made after installation is complete,
-  # but before starting or resarting the dnsmasq or ftl services
-  disable_resolved_stublistener
+    # Install the Core dependencies
+    local dep_install_list=("${PIHOLE_DEPS[@]}")
+    if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+        # Install the Web dependencies
+        dep_install_list+=("${PIHOLE_WEB_DEPS[@]}")
+    fi
 
-  # If the Web server was installed,
-  if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+    install_dependent_packages dep_install_list[@]
+    unset dep_install_list
 
-    if [[ "${LIGHTTPD_ENABLED}" == true ]]; then
-      start_service lighttpd
-      enable_service lighttpd
+    # On some systems, lighttpd is not enabled on first install. We need to enable it here if the user
+    # has chosen to install the web interface, else the `LIGHTTPD_ENABLED` check will fail
+    if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+        enable_service lighttpd
+    fi
+    # Determine if lighttpd is correctly enabled
+    if check_service_active "lighttpd"; then
+        LIGHTTPD_ENABLED=true
     else
-      echo -e "  ${INFO} Lighttpd is disabled, skipping service restart"
+        LIGHTTPD_ENABLED=false
     fi
-  fi
 
-  echo -e "  ${INFO} Restarting services..."
-  # Start services
+    # Install and log everything to a file
+    installPihole | tee -a /proc/$$/fd/3
 
-  # Enable FTL
-  start_service pihole-FTL
-  enable_service pihole-FTL
+    # Copy the temp log file into final log location for storage
+    copy_to_install_log
 
-  # Download and compile the aggregated block list
-  runGravity
-
-  # Force an update of the updatechecker
-  . /opt/pihole/updatecheck.sh
-  . /opt/pihole/updatecheck.sh x remote
-
-  #
-  if [[ "${useUpdateVars}" == false ]]; then
-      displayFinalMessage "${pw}"
-  fi
-
-  # If the Web interface was installed,
-  if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-    # If there is a password,
-    if (( ${#pw} > 0 )) ; then
-      # display the password
-      echo -e "  ${INFO} Web Interface password: ${COL_LIGHT_GREEN}${pw}${COL_NC}
-      This can be changed using 'pihole -a -p'\\n"
+    if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+        # Add password to web UI if there is none
+        pw=""
+        # If no password is set,
+        if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
+            # generate a random password
+            pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
+            # shellcheck disable=SC1091
+            /opt/pihole/webpage.sh
+            echo "WEBPASSWORD=$(HashPassword ${pw})" >> ${setupVars}
+        fi
+    fi
+
+    # Check for and disable systemd-resolved-DNSStubListener before reloading resolved
+    # DNSStubListener needs to remain in place for installer to download needed files,
+    # so this change needs to be made after installation is complete,
+    # but before starting or resarting the dnsmasq or ftl services
+    disable_resolved_stublistener
+
+    # If the Web server was installed,
+    if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
+
+        if [[ "${LIGHTTPD_ENABLED}" == true ]]; then
+            start_service lighttpd
+            enable_service lighttpd
+        else
+            echo -e "  ${INFO} Lighttpd is disabled, skipping service restart"
+        fi
+    fi
+
+    echo -e "  ${INFO} Restarting services..."
+    # Start services
+
+    # Enable FTL
+    start_service pihole-FTL
+    enable_service pihole-FTL
+
+    # Download and compile the aggregated block list
+    runGravity
+
+    # Force an update of the updatechecker
+    /opt/pihole/updatecheck.sh
+    /opt/pihole/updatecheck.sh x remote
+
+    #
+    if [[ "${useUpdateVars}" == false ]]; then
+        displayFinalMessage "${pw}"
     fi
-  fi
 
-  #
-  if [[ "${useUpdateVars}" == false ]]; then
     # If the Web interface was installed,
     if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
-      echo -e "  View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin"
-      echo ""
+        # If there is a password,
+        if (( ${#pw} > 0 )) ; then
+            # display the password
+            echo -e "  ${INFO} Web Interface password: ${COL_LIGHT_GREEN}${pw}${COL_NC}"
+            echo -e "  ${INFO} This can be changed using 'pihole -a -p'\\n"
+        fi
     fi
-    # Explain to the user how to use Pi-hole as their DNS server
-    echo "  You may now configure your devices to use the Pi-hole as their DNS server"
-    [[ -n "${IPV4_ADDRESS%/*}" ]] && echo -e "  ${INFO} Pi-hole DNS (IPv4): ${IPV4_ADDRESS%/*}"
-    [[ -n "${IPV6_ADDRESS}" ]] && echo -e "  ${INFO} Pi-hole DNS (IPv6): ${IPV6_ADDRESS}"
-    echo -e "  If you set a new IP address, please restart the server running the Pi-hole"
-    #
-    INSTALL_TYPE="Installation"
-  else
-    #
-    INSTALL_TYPE="Update"
-  fi
 
-  # Display where the log file is
-  echo -e "\\n  ${INFO} The install log is located at: ${installLogLoc}
-  ${COL_LIGHT_GREEN}${INSTALL_TYPE} Complete! ${COL_NC}"
+    #
+    if [[ "${useUpdateVars}" == false ]]; then
+        # If the Web interface was installed,
+        if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
+            echo -e "  ${INFO} View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin"
+            echo ""
+        fi
+        # Explain to the user how to use Pi-hole as their DNS server
+        echo -e "  ${INFO} You may now configure your devices to use the Pi-hole as their DNS server"
+        [[ -n "${IPV4_ADDRESS%/*}" ]] && echo -e "  ${INFO} Pi-hole DNS (IPv4): ${IPV4_ADDRESS%/*}"
+        [[ -n "${IPV6_ADDRESS}" ]] && echo -e "  ${INFO} Pi-hole DNS (IPv6): ${IPV6_ADDRESS}"
+        echo -e "  ${INFO} If you set a new IP address, please restart the server running the Pi-hole"
+        #
+        INSTALL_TYPE="Installation"
+    else
+        #
+        INSTALL_TYPE="Update"
+    fi
 
-  if [[ "${INSTALL_TYPE}" == "Update" ]]; then
-    echo ""
-    /usr/local/bin/pihole version --current
-  fi
+    # Display where the log file is
+    echo -e "\\n  ${INFO} The install log is located at: ${installLogLoc}
+    ${COL_LIGHT_GREEN}${INSTALL_TYPE} Complete! ${COL_NC}"
+
+    if [[ "${INSTALL_TYPE}" == "Update" ]]; then
+        echo ""
+        /usr/local/bin/pihole version --current
+    fi
 }
 
 #
 if [[ "${PH_TEST}" != true ]] ; then
-  main "$@"
+    main "$@"
 fi
diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
index 4525f42f..9322de92 100755
--- a/automated install/uninstall.sh	
+++ b/automated install/uninstall.sh	
@@ -173,7 +173,7 @@ removeNoPurge() {
 
     # If the pihole manpage exists, then delete and rebuild man-db
     if [[ -f /usr/local/share/man/man8/pihole.8 ]]; then
-        ${SUDO} rm -f /usr/local/share/man/man8/pihole.8
+        ${SUDO} rm -f /usr/local/share/man/man8/pihole.8 /usr/local/share/man/man8/pihole-FTL.8 /usr/local/share/man/man5/pihole-FTL.conf.5
         ${SUDO} mandb -q &>/dev/null
         echo -e "  ${TICK} Removed pihole man page"
     fi
diff --git a/gravity.sh b/gravity.sh
index dfcb753a..b018e2ea 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -15,6 +15,8 @@ export LC_ALL=C
 
 coltable="/opt/pihole/COL_TABLE"
 source "${coltable}"
+regexconverter="/opt/pihole/wildcard_regex_converter.sh"
+source "${regexconverter}"
 
 basename="pihole"
 PIHOLE_COMMAND="/usr/local/bin/${basename}"
@@ -26,7 +28,7 @@ adListDefault="${piholeDir}/adlists.default"
 
 whitelistFile="${piholeDir}/whitelist.txt"
 blacklistFile="${piholeDir}/blacklist.txt"
-wildcardFile="/etc/dnsmasq.d/03-pihole-wildcard.conf"
+regexFile="${piholeDir}/regex.list"
 
 adList="${piholeDir}/gravity.list"
 blackList="${piholeDir}/black.list"
@@ -218,8 +220,15 @@ gravity_DownloadBlocklistFromUrl() {
   httpCode=$(curl -s -L ${cmd_ext} ${heisenbergCompensator} -w "%{http_code}" -A "${agent}" "${url}" -o "${patternBuffer}" 2> /dev/null)
 
   case $url in
+    # Did we "download" a local file?
+    "file"*)
+        if [[ -s "${patternBuffer}" ]]; then
+          echo -e "${OVER}  ${TICK} ${str} Retrieval successful"; success=true
+        else
+          echo -e "${OVER}  ${CROSS} ${str} Not found / empty list"
+        fi;;
     # Did we "download" a remote file?
-    "http"*)
+    *)
       # Determine "Status:" output based on HTTP response
       case "${httpCode}" in
         "200") echo -e "${OVER}  ${TICK} ${str} Retrieval successful"; success=true;;
@@ -233,16 +242,8 @@ gravity_DownloadBlocklistFromUrl() {
         "504") echo -e "${OVER}  ${CROSS} ${str} Connection Timed Out (Gateway)";;
         "521") echo -e "${OVER}  ${CROSS} ${str} Web Server Is Down (Cloudflare)";;
         "522") echo -e "${OVER}  ${CROSS} ${str} Connection Timed Out (Cloudflare)";;
-        *    ) echo -e "${OVER}  ${CROSS} ${str} ${httpCode}";;
+        *    ) echo -e "${OVER}  ${CROSS} ${str} ${url} (${httpCode})";;
       esac;;
-    # Did we "download" a local file?
-    "file"*)
-        if [[ -s "${patternBuffer}" ]]; then
-          echo -e "${OVER}  ${TICK} ${str} Retrieval successful"; success=true
-        else
-          echo -e "${OVER}  ${CROSS} ${str} Not found / empty list"
-        fi;;
-    *) echo -e "${OVER}  ${CROSS} ${str} ${url} ${httpCode}";;
   esac
 
   # Determine if the blocklist was downloaded and saved correctly
@@ -453,7 +454,7 @@ gravity_Whitelist() {
   echo -e "${OVER}  ${INFO} ${str}"
 }
 
-# Output count of blacklisted domains and wildcards
+# Output count of blacklisted domains and regex filters
 gravity_ShowBlockCount() {
   local num
 
@@ -462,13 +463,9 @@ gravity_ShowBlockCount() {
     echo -e "  ${INFO} Number of blacklisted domains: ${num}"
   fi
 
-  if [[ -f "${wildcardFile}" ]]; then
-    num=$(grep -c "^" "${wildcardFile}")
-    # If IPv4 and IPv6 is used, divide total wildcard count by 2
-    if [[ -n "${IPV4_ADDRESS}" ]] && [[ -n "${IPV6_ADDRESS}" ]];then
-      num=$(( num/2 ))
-    fi
-    echo -e "  ${INFO} Number of wildcard blocked domains: ${num}"
+  if [[ -f "${regexFile}" ]]; then
+    num=$(grep -c "^(?!#)" "${regexFile}")
+    echo -e "  ${INFO} Number of regex filters: ${num}"
   fi
 }
 
@@ -646,6 +643,12 @@ if [[ "${skipDownload}" == false ]] || [[ "${listType}" == "whitelist" ]]; then
   gravity_Whitelist
 fi
 
+# Set proper permissions on the regex file
+touch "${regexFile}"
+chown pihole:www-data "${regexFile}"
+chmod 664 "${regexFile}"
+
+convert_wildcard_to_regex
 gravity_ShowBlockCount
 
 # Perform when downloading blocklists, or modifying the white/blacklist (not wildcards)
diff --git a/manpages/pihole-FTL.8 b/manpages/pihole-FTL.8
new file mode 100644
index 00000000..2928f2d8
--- /dev/null
+++ b/manpages/pihole-FTL.8
@@ -0,0 +1,112 @@
+.TH "Pihole-FTL" "8" "pihole-FTL" "Pi-hole" "June 2018"
+.SH "NAME"
+pihole-FTL - Pi-hole : The Faster-Than-Light (FTL) Engine
+.br
+.SH "SYNOPSIS"
+\fBservice pihole-FTL \fR(\fBstart\fR|\fBstop\fR|\fBrestart\fR)
+.br
+
+\fBpihole-FTL debug\fR
+.br
+\fBpihole-FTL test\fR
+.br
+\fBpihole-FTL -v\fR
+.br
+\fBpihole-FTL -t\fR
+.br
+\fBpihole-FTL -b\fR
+.br
+\fBpihole-FTL -f\fR
+.br
+\fBpihole-FTL -h\fR
+.br
+\fBpihole-FTL dnsmasq-test\fR
+.br
+\fBpihole-FTL --\fR (\fBoptions\fR)
+.br
+
+.SH "DESCRIPTION"
+Pi-hole : The Faster-Than-Light (FTL) Engine is a lightweight, purpose-built daemon used to provide statistics needed for the Pi-hole Web Interface, and its API can be easily integrated into your own projects. Although it is an optional component of the Pi-hole ecosystem, it will be installed by default to provide statistics. As the name implies, FTL does its work \fIvery\fR \fIquickly\fR!
+.br
+
+Usage
+.br
+
+\fBservice pihole-FTL start\fR
+.br
+    Start the pihole-FTL daemon
+.br
+
+\fBservice pihole-FTL stop\fR
+.br
+    Stop the pihole-FTL daemon
+.br
+
+\fBservice pihole-FTL restart\fR
+.br
+    If the pihole-FTP daemon is running, stop and then start, otherwise start.
+.br
+
+Command line arguments
+.br
+
+\fBdebug\fR
+.br
+    Don't go into daemon mode (stay in foreground) + more verbose logging
+.br
+
+\fBtest\fR
+.br
+    Start FTL and process everything, but shut down immediately afterwards
+.br
+
+\fB-v, version\fR
+.br
+    Don't start FTL, show only version
+.br
+
+\fB-t, tag\fR
+.br
+    Don't start FTL, show only git tag
+.br
+
+\fB-b, branch\fR
+.br
+    Don't start FTL, show only git branch FTL was compiled from
+.br
+
+\fB-f, no-daemon\fR
+.br
+    Don't go into background (daemon mode)
+.br
+
+\fB-h, help\fR
+.br
+    Don't start FTL, show help
+.br
+
+\fBdnsmasq-test\fR
+.br
+    Test resolver config file syntax
+.br
+
+\fB--\fR  (options)
+.br
+    Pass options to internal dnsmasq resolver
+.br
+.SH "EXAMPLE"
+Command line arguments can be arbitrarily combined, e.g:
+.br
+
+\fBpihole-FTL debug test\fR
+.br
+
+Start ftl in foreground with more verbose logging, process everything and shutdown immediately
+.br
+.SH "SEE ALSO"
+\fBpihole\fR(8), \fBpihole-FTL.conf\fR(5)
+.br
+.SH "COLOPHON"
+
+Get sucked into the latest news and community activity by entering Pi-hole's orbit. Information about Pi-hole, and the latest version of the software can be found at https://pi-hole.net
+.br
diff --git a/manpages/pihole-FTL.conf.5 b/manpages/pihole-FTL.conf.5
new file mode 100644
index 00000000..50536279
--- /dev/null
+++ b/manpages/pihole-FTL.conf.5
@@ -0,0 +1,102 @@
+.TH "pihole-FTL.conf" "5" "pihole-FTL.conf" "pihole-FTL.conf" "June 2018"
+.SH "NAME"
+
+pihole-FTL.conf - FTL's config file
+.br
+.SH "DESCRIPTION"
+
+/etc/pihole/pihole-FTL.conf will be read by \fBpihole-FTL(8)\fR on startup.
+.br
+
+\fBSOCKET_LISTENING=localonly|all\fR
+.br
+    Listen only for local socket connections or permit all connections
+.br
+
+\fBQUERY_DISPLAY=yes|no\fR
+.br
+    Display all queries? Set to no to hide query display
+.br
+
+\fBAAAA_QUERY_ANALYSIS=yes|no\fR
+.br
+    Allow FTL to analyze AAAA queries from pihole.log?
+.br
+
+\fBRESOLVE_IPV6=yes|no\fR
+.br
+    Should FTL try to resolve IPv6 addresses to host names?
+.br
+
+\fBRESOLVE_IPV4=yes|no\fR
+.br
+    Should FTL try to resolve IPv4 addresses to host names?
+.br
+
+\fBMAXDBDAYS=365\fR
+.br
+    How long should queries be stored in the database?
+.br
+    Setting this to 0 disables the database
+.br
+
+\fBDBINTERVAL=1.0\fR
+.br
+    How often do we store queries in FTL's database [minutes]?
+.br
+
+\fBDBFILE=/etc/pihole/pihole-FTL.db\fR
+.br
+    Specify path and filename of FTL's SQLite long-term database.
+.br
+    Setting this to DBFILE= disables the database altogether
+.br
+
+\fBMAXLOGAGE=24.0\fR
+.br
+    Up to how many hours of queries should be imported from the database and logs?
+.br
+    Maximum is 744 (31 days)
+.br
+
+\fBFTLPORT=4711\fR
+.br
+    On which port should FTL be listening?
+.br
+
+\fBPRIVACYLEVEL=0|1|2|3\fR
+.br
+    Which privacy level is used?
+.br
+    0 - show everything
+.br
+    1 - hide domains
+.br
+    2 - hide domains and clients
+.br
+    3 - paranoia mode (hide everything)
+.br
+
+\fBIGNORE_LOCALHOST=no|yes\fR
+.br
+    Should FTL ignore queries coming from the local machine?
+.br
+
+\fBBLOCKINGMODE=IP|IP-AAAA-NODATA|NXDOMAIN|NULL\fR
+.br
+    How should FTL reply to blocked queries?
+.br
+
+For each setting, the option shown first is the default.
+.br
+.SH "SEE ALSO"
+
+\fBpihole\fR(8), \fBpihole-FTL\fR(8)
+.br
+.SH "COLOPHON"
+
+Pi-hole : The Faster-Than-Light (FTL) Engine is a lightweight, purpose-built daemon used to provide statistics needed for the Pi-hole Web Interface, and its API can be easily integrated into your own projects. Although it is an optional component of the Pi-hole ecosystem, it will be installed by default to provide statistics. As the name implies, FTL does its work \fIvery quickly\fR!
+.br
+
+Get sucked into the latest news and community activity by entering Pi-hole's orbit. Information about Pi-hole, and the latest version of the software can be found at https://pi-hole.net
+.br
diff --git a/pihole.8 b/manpages/pihole.8
similarity index 80%
rename from pihole.8
rename to manpages/pihole.8
index 76d6b72b..c30570df 100644
--- a/pihole.8
+++ b/manpages/pihole.8
@@ -5,7 +5,7 @@ Pi-hole : A black-hole for internet advertisements
 .br
 .SH "SYNOPSIS"
 
-\fBpihole\fR (\fB-w\fR|\fB-b\fR|\fB-wild\fR) [options] domain(s)
+\fBpihole\fR (\fB-w\fR|\fB-b\fR|\fB--wild\fR|\fB--regex\fR) [options] domain(s)
 .br
 \fBpihole -a\fR \fB-p\fR password
 .br
@@ -21,13 +21,13 @@ Pi-hole : A black-hole for internet advertisements
 .br
 \fBpihole -c\fR [-j|-r|-e]
 .br
-\fBpihole\fR \fB-d\fR [-a] 
+\fBpihole\fR \fB-d\fR [-a]
 .br
 \fBpihole -f
 .br
 pihole -r
 .br
-pihole -t 
+pihole -t
 .br
 pihole -g\fR
 .br
@@ -66,9 +66,14 @@ Available commands and options:
     Adds or removes specified domain or domains to the blacklist
 .br
 
-\fB-wild, wildcard\fR [options] [<domain1> <domain2 ...>]
+\fB--wild, wildcard\fR [options] [<domain1> <domain2 ...>]
 .br
-    Add or removes specified domain, and all subdomains to the blacklist
+    Add or removes specified domain to the wildcard blacklist
+.br
+
+\fB--regex, regex\fR [options] [<regex1> <regex2 ...>]
+.br
+    Add or removes specified regex filter to the regex blacklist
 .br
 
     (Whitelist/Blacklist manipulation options):
@@ -84,9 +89,9 @@ Available commands and options:
       --nuke            Removes all entries in a list
 .br
 
-\fB-d, debug\fR [-a]	
+\fB-d, debug\fR [-a]
 .br
-    Start a debugging session 
+    Start a debugging session
 .br
 
       -a                Enable automated debugging
@@ -96,8 +101,7 @@ Available commands and options:
 .br
     Flush the Pi-hole log
 .br
-		
-.br
+
 \fB-r, reconfigure\fR
 .br
     Reconfigure or Repair Pi-hole subsystems
@@ -129,11 +133,10 @@ Available commands and options:
 .br
       -l, privacylevel  <level> Set privacy level (0 = lowest, 3 = highest)
 .br
-		
-.br
+
 \fB-c, chronometer\fR	[options]
 .br
-    Calculates stats and displays to an LCD 
+    Calculates stats and displays to an LCD
 .br
 
     (Chronometer Options):
@@ -145,12 +148,12 @@ Available commands and options:
       -e, --exit        Output stats and exit witout refreshing
 .br
 
-\fB-g, updateGravity\fR	
+\fB-g, updateGravity\fR
 .br
     Update the list of ad-serving domains
 .br
 
-\fB-q, query\fR [option]	
+\fB-q, query\fR [option]
 .br
     Query the adlists for a specified domain
 .br
@@ -164,39 +167,38 @@ Available commands and options:
       -all              Return all query matches within a block list
 .br
 
-\fB-h, --help, help\fR	
+\fB-h, --help, help\fR
 .br
     Show a help dialog
 .br
 
-\fB-l, logging\fR [on|off|off noflush]	
+\fB-l, logging\fR [on|off|off noflush]
 .br
-    Specify whether the Pi-hole log should be used 
+    Specify whether the Pi-hole log should be used
 .br
 
 	(Logging options):
 .br
       on                Enable the Pi-hole log at /var/log/pihole.log
 .br
-      off 		        Disable and flush the Pi-hole log at /var/log/pihole.log
+      off               Disable and flush the Pi-hole log at /var/log/pihole.log
 .br
       off noflush       Disable the Pi-hole log at /var/log/pihole.log
 .br
-	
+
+\fB-up, updatePihole\fR [--check-only]
 .br
-\fB-up, updat\fBe\fR\fR\fBPihole\fR [--check-only]	
-.br
-    Update Pi-hole subsystems 
+    Update Pi-hole subsystems
 .br
 
       --check-only      Exit script before update is performed.
 .br
 
-\fB-v, version\fR [repo] [options]	
+\fB-v, version\fR [repo] [options]
 .br
     Show installed versions of Pi-hole, Web Interface &amp; FTL
 .br
- 
+
 .br
     (repo options):
 .br
@@ -234,9 +236,8 @@ Available commands and options:
 .br
     Disable Pi-hole subsystems, optionally for a set duration
 .br
-		
-.br
-    (time options):	
+
+    (time options):
 .br
       #s                Disable Pi-hole functionality for # second(s)
 .br
@@ -248,7 +249,7 @@ Available commands and options:
     Restart Pi-hole subsystems
 .br
 
-\fBcheckout\fR [repo] [branch]	
+\fBcheckout\fR [repo] [branch]
 .br
     Switch Pi-hole subsystems to a different Github branch
 .br
@@ -277,54 +278,51 @@ Some usage examples
     Whitelist/blacklist manipulation
 .br
 
-    \fBpihole -w iloveads.example.com\fR  Add "iloveads.example.com" to whitelist
+    \fBpihole -w iloveads.example.com\fR       Add "iloveads.example.com" to whitelist
 .br
-    \fBpihole -b -d noads.example.com\fR  Remove "noads.example.com" from blacklist 
+    \fBpihole -b -d noads.example.com\fR       Remove "noads.example.com" from blacklist
 .br
-    \fBpihole -wild example.com\fR            Add "example.com" as wildcard - would block ads.example.com, www.example.com etc.
+    \fBpihole --wild example.com\fR             Add example.com as a wildcard - would
+    block all subdomains of example.com, including example.com itself.
+.br
+    \fBpihole --regex "ad.*\.example\.com$"\fR  Add "ad.*\.example\.com$" to the regex
+    blacklist - would block all subdomains of example.com which start with "ad"
 .br
 
-    Changing the web ui password
-.br
-	
+    Changing the Web Interface password
 .br
+
     \fBpihole -a -p ExamplePassword\fR    Change the password to "ExamplePassword"
 .br
 
     Updating lists from internet sources
 .br
-	
-.br
+
     \fBpihole -g\fR                       Update the list of ad-serving domains
 .br
 
     Displaying version information
 .br
-	
-.br
+
     \fBpihole -v -a -c\fR                 Display the current version of AdminLTE
 .br
-	
-.br
+
     Temporarily disabling Pi-hole
 .br
-	
-.br
+
     \fBpihole disable 5m\fR               Disable Pi-hole functionality for five minutes
 .br
-	
-.br
+
     Switching Pi-hole subsystem branches
 .br
-	
-.br
+
     \fBpihole checkout master\fR          Switch to master branch
 .br
     \fBpihole checkout core dev\fR        Switch to core development branch
 .br
 .SH "SEE ALSO"
 
-dnsmasq(8), lighttpd(8)
+\fBlighttpd\fR(8), \fBpihole-FTL\fR(8)
 .br
 .SH "COLOPHON"
 
diff --git a/pihole b/pihole
index b3f532af..8be03f79 100755
--- a/pihole
+++ b/pihole
@@ -33,17 +33,7 @@ webpageFunc() {
   exit 0
 }
 
-whitelistFunc() {
- "${PI_HOLE_SCRIPT_DIR}"/list.sh "$@"
-  exit 0
-}
-
-blacklistFunc() {
-  "${PI_HOLE_SCRIPT_DIR}"/list.sh "$@"
-  exit 0
-}
-
-wildcardFunc() {
+listFunc() {
   "${PI_HOLE_SCRIPT_DIR}"/list.sh "$@"
   exit 0
 }
@@ -86,230 +76,9 @@ updateGravityFunc() {
   exit 0
 }
 
-# Scan an array of files for matching strings
-scanList(){
-  # Escape full stops
-  local domain="${1//./\\.}" lists="${2}" type="${3:-}"
-
-  # Prevent grep from printing file path
-  cd "/etc/pihole" || exit 1
-
-  # Prevent grep -i matching slowly: http://bit.ly/2xFXtUX
-  export LC_CTYPE=C
-
-  # /dev/null forces filename to be printed when only one list has been generated
-  # shellcheck disable=SC2086
-  case "${type}" in
-    "exact" ) grep -i -E -l "(^|\\s)${domain}($|\\s|#)" ${lists} /dev/null;;
-    "wc"    ) grep -i -o -m 1 "/${domain}/" ${lists};;
-    *       ) grep -i "${domain}" ${lists} /dev/null;;
-  esac
-}
-
-# Print each subdomain
-# e.g: foo.bar.baz.com = "foo.bar.baz.com bar.baz.com baz.com com"
-processWildcards() {
-  IFS="." read -r -a array <<< "${1}"
-  for (( i=${#array[@]}-1; i>=0; i-- )); do
-    ar=""
-    for (( j=${#array[@]}-1; j>${#array[@]}-i-2; j-- )); do
-      if [[ $j == $((${#array[@]}-1)) ]]; then
-        ar="${array[$j]}"
-      else
-        ar="${array[$j]}.${ar}"
-      fi
-    done
-    echo "${ar}"
-  done
-}
-
 queryFunc() {
   shift
-  local options="$*" adlist="" all="" exact="" blockpage="" matchType="match"
-
-  if [[ "${options}" == "-h" ]] || [[ "${options}" == "--help" ]]; then
-    echo "Usage: pihole -q [option] <domain>
-Example: 'pihole -q -exact domain.com'
-Query the adlists for a specified domain
-
-Options:
-  -adlist             Print the name of the block list URL
-  -exact              Search the block lists for exact domain matches
-  -all                Return all query matches within a block list
-  -h, --help          Show this help dialog"
-    exit 0
-  fi
-
-  if [[ ! -e "/etc/pihole/adlists.list" ]]; then
-    echo -e "${COL_LIGHT_RED}The file '/etc/pihole/adlists.list' was not found${COL_NC}"
-    exit 1
-  fi
-
-  # Handle valid options
-  if [[ "${options}" == *"-bp"* ]]; then
-    exact="exact"; blockpage=true
-  else
-    [[ "${options}" == *"-adlist"* ]] && adlist=true
-    [[ "${options}" == *"-all"* ]] && all=true
-    if [[ "${options}" == *"-exact"* ]]; then
-      exact="exact"; matchType="exact ${matchType}"
-    fi
-  fi
-
-  # Strip valid options, leaving only the domain and invalid options
-  # This allows users to place the options before or after the domain
-  options=$(sed -E 's/ ?-(bp|adlists?|all|exact) ?//g' <<< "${options}")
-
-  # Handle remaining options
-  # If $options contain non ASCII characters, convert to punycode
-  case "${options}" in
-    ""             ) str="No domain specified";;
-    *" "*          ) str="Unknown query option specified";;
-    *[![:ascii:]]* ) domainQuery=$(idn2 "${options}");;
-    *              ) domainQuery="${options}";;
-  esac
-
-  if [[ -n "${str:-}" ]]; then
-    echo -e "${str}${COL_NC}\\nTry 'pihole -q --help' for more information."
-    exit 1
-  fi
-
-  # Scan Whitelist and Blacklist
-  lists="whitelist.txt blacklist.txt"
-  mapfile -t results <<< "$(scanList "${domainQuery}" "${lists}" "${exact}")"
-
-  if [[ -n "${results[*]}" ]]; then
-    wbMatch=true
-
-    # Loop through each result in order to print unique file title once
-    for result in "${results[@]}"; do
-      fileName="${result%%.*}"
-
-      if [[ -n "${blockpage}" ]]; then
-        echo "π ${result}"
-        exit 0
-      elif [[ -n "${exact}" ]]; then
-        echo " ${matchType^} found in ${COL_BOLD}${fileName^}${COL_NC}"
-      else
-        # Only print filename title once per file
-        if [[ ! "${fileName}" == "${fileName_prev:-}" ]]; then
-          echo " ${matchType^} found in ${COL_BOLD}${fileName^}${COL_NC}"
-          fileName_prev="${fileName}"
-        fi
-        echo "   ${result#*:}"
-      fi
-    done
-  fi
-
-  # Scan Wildcards
-  if [[ -e "${wildcardlist}" ]]; then
-    # Determine all subdomains, domain and TLDs
-    mapfile -t wildcards <<< "$(processWildcards "${domainQuery}")"
-
-    for match in "${wildcards[@]}"; do
-      # Search wildcard list for matches
-      mapfile -t results <<< "$(scanList "${match}" "${wildcardlist}" "wc")"
-
-      if [[ -n "${results[*]}" ]]; then
-        if [[ -z "${wcMatch:-}" ]] && [[ -z "${blockpage}" ]]; then
-          wcMatch=true
-          echo " ${matchType^} found in ${COL_BOLD}Wildcards${COL_NC}:"
-        fi
-
-        case "${blockpage}" in
-          true ) echo "π ${wildcardlist##*/}"; exit 0;;
-          *    ) echo "   *.${match}";;
-        esac
-      fi
-    done
-  fi
-
-  # Get version sorted *.domains filenames (without dir path)
-  lists=("$(cd "/etc/pihole" || exit 0; printf "%s\\n" -- *.domains | sort -V)")
-
-  # Query blocklists for occurences of domain
-  mapfile -t results <<< "$(scanList "${domainQuery}" "${lists[*]}" "${exact}")"
-
-  # Handle notices
-  if [[ -z "${wbMatch:-}" ]] && [[ -z "${wcMatch:-}" ]] && [[ -z "${results[*]}" ]]; then
-    echo -e "  ${INFO} No ${exact/t/t }results found for ${COL_BOLD}${domainQuery}${COL_NC} within the block lists"
-    exit 0
-  elif [[ -z "${results[*]}" ]]; then
-    # Result found in WL/BL/Wildcards
-    exit 0
-  elif [[ -z "${all}" ]] && [[ "${#results[*]}" -ge 100 ]]; then
-    echo -e "  ${INFO} Over 100 ${exact/t/t }results found for ${COL_BOLD}${domainQuery}${COL_NC}
-      This can be overridden using the -all option"
-    exit 0
-  fi
-
-  # Remove unwanted content from non-exact $results
-  if [[ -z "${exact}" ]]; then
-    # Delete lines starting with #
-    # Remove comments after domain
-    # Remove hosts format IP address
-    mapfile -t results <<< "$(IFS=$'\n'; sed \
-      -e "/:#/d" \
-      -e "s/[ \\t]#.*//g" \
-      -e "s/:.*[ \\t]/:/g" \
-    <<< "${results[*]}")"
-
-    # Exit if result was in a comment
-    [[ -z "${results[*]}" ]] && exit 0
-  fi
-
-  # Get adlist file content as array
-  if [[ -n "${adlist}" ]] || [[ -n "${blockpage}" ]]; then
-    for adlistUrl in $(< "/etc/pihole/adlists.list"); do
-      if [[ "${adlistUrl:0:4}" =~ (http|www.) ]]; then
-        adlists+=("${adlistUrl}")
-      fi
-    done
-  fi
-
-  # Print "Exact matches for" title
-  if [[ -n "${exact}" ]] && [[ -z "${blockpage}" ]]; then
-    plural=""; [[ "${#results[*]}" -gt 1 ]] && plural="es"
-    echo " ${matchType^}${plural} for ${COL_BOLD}${domainQuery}${COL_NC} found in:"
-  fi
-
-  for result in "${results[@]}"; do
-    fileName="${result/:*/}"
-
-    # Determine *.domains URL using filename's number
-    if [[ -n "${adlist}" ]] || [[ -n "${blockpage}" ]]; then
-      fileNum="${fileName/list./}"; fileNum="${fileNum%%.*}"
-      fileName="${adlists[$fileNum]}"
-
-      # Discrepency occurs when adlists has been modified, but Gravity has not been run
-      if [[ -z "${fileName}" ]]; then
-        fileName="${COL_LIGHT_RED}(no associated adlists URL found)${COL_NC}"
-      fi
-    fi
-
-    if [[ -n "${blockpage}" ]]; then
-      echo "${fileNum} ${fileName}"
-    elif [[ -n "${exact}" ]]; then
-      echo "   ${fileName}"
-    else
-      if [[ ! "${fileName}" == "${fileName_prev:-}" ]]; then
-        count=""
-        echo " ${matchType^} found in ${COL_BOLD}${fileName}${COL_NC}:"
-        fileName_prev="${fileName}"
-      fi
-      : $((count++))
-
-      # Print matching domain if $max_count has not been reached
-      [[ -z "${all}" ]] && max_count="50"
-      if [[ -z "${all}" ]] && [[ "${count}" -ge "${max_count}" ]]; then
-        [[ "${count}" -gt "${max_count}" ]] && continue
-        echo "   ${COL_GRAY}Over ${count} results found, skipping rest of file${COL_NC}"
-      else
-        echo "   ${result#*:}"
-      fi
-    fi
-  done
-
+  "${PI_HOLE_SCRIPT_DIR}"/query.sh "$@"
   exit 0
 }
 
@@ -516,6 +285,13 @@ statusFunc() {
 }
 
 tailFunc() {
+  # Warn user if Pi-hole's logging is disabled
+  local logging_enabled=$(grep -c "^log-queries" /etc/dnsmasq.d/01-pihole.conf)
+  if [[ "${logging_enabled}" == "0" ]]; then
+    # No "log-queries" lines are found.
+    # Commented out lines (such as "#log-queries") are ignored
+    echo "  ${CROSS} Warning: Query logging is disabled"
+  fi
   echo -e "  ${INFO} Press Ctrl-C to exit"
 
   # Retrieve IPv4/6 addresses
@@ -541,12 +317,13 @@ Switch Pi-hole subsystems to a different Github branch
 
 Repositories:
   core [branch]       Change the branch of Pi-hole's core subsystem
-  web [branch]        Change the branch of Admin Console subsystem
+  web [branch]        Change the branch of Web Interface subsystem
   ftl [branch]        Change the branch of Pi-hole's FTL subsystem
 
 Branches:
   master              Update subsystems to the latest stable release
-  dev                 Update subsystems to the latest development release"
+  dev                 Update subsystems to the latest development release
+  branchname          Update subsystems to the specified branchname"
     exit 0
   fi
 
@@ -599,7 +376,8 @@ Add '-h' after specific commands for more information on usage
 Whitelist/Blacklist Options:
   -w, whitelist       Whitelist domain(s)
   -b, blacklist       Blacklist domain(s)
-  -wild, wildcard     Blacklist domain(s), and all its subdomains
+  --wild, wildcard     Wildcard blacklist domain(s)
+  --regex, regex       Regex blacklist domains(s)
                         Add '-h' for more info on whitelist/blacklist usage
 
 Debugging Options:
@@ -610,8 +388,8 @@ Debugging Options:
   -t, tail            View the live output of the Pi-hole log
 
 Options:
-  -a, admin           Admin Console options
-                        Add '-h' for more info on admin console usage
+  -a, admin           Web interface options
+                        Add '-h' for more info on Web Interface usage
   -c, chronometer     Calculates stats and displays to an LCD
                         Add '-h' for more info on chronometer usage
   -g, updateGravity   Update the list of ad-serving domains
@@ -622,7 +400,7 @@ Options:
                         Add '-h' for more info on query usage
   -up, updatePihole   Update Pi-hole subsystems
                         Add '--check-only' to exit script before update is performed.
-  -v, version         Show installed versions of Pi-hole, Admin Console & FTL
+  -v, version         Show installed versions of Pi-hole, Web Interface & FTL
                         Add '-h' for more info on version usage
   uninstall           Uninstall Pi-hole from your system
   status              Display the running status of Pi-hole subsystems
@@ -641,9 +419,10 @@ fi
 
 # Handle redirecting to specific functions based on arguments
 case "${1}" in
-  "-w" | "whitelist"            ) whitelistFunc "$@";;
-  "-b" | "blacklist"            ) blacklistFunc "$@";;
-  "-wild" | "wildcard"          ) wildcardFunc "$@";;
+  "-w" | "whitelist"            ) listFunc "$@";;
+  "-b" | "blacklist"            ) listFunc "$@";;
+  "--wild" | "wildcard"          ) listFunc "$@";;
+  "--regex" | "regex"            ) listFunc "$@";;
   "-d" | "debug"                ) debugFunc "$@";;
   "-f" | "flush"                ) flushFunc "$@";;
   "-up" | "updatePihole"        ) updatePiholeFunc "$@";;
diff --git a/requirements.txt b/requirements.txt
index 53737ca5..f2c61e42 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@ pytest
 pytest-xdist
 pytest-cov
 testinfra
+tox
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..0e393bc1
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,6 @@
+from setuptools import setup
+
+setup(
+    setup_requires=['pytest-runner'],
+    tests_require=['pytest'],
+)
diff --git a/test/README.md b/test/README.md
new file mode 100644
index 00000000..f5a9b5e8
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,25 @@
+# Recommended way to run tests
+
+Make sure you have Docker and Python w/pip package manager.
+
+From command line all you need to do is:
+
+- `pip install tox`
+- `tox`
+
+Tox handles setting up a virtual environment for python dependancies, installing dependancies, building the docker images used by tests, and finally running tests.  It's an easy way to have travis-ci like build behavior locally.
+
+## Alternative py.test method of running tests
+
+You're responsible for setting up your virtual env and dependancies in this situation.
+
+```
+py.test -vv -n auto -m "build_stage"
+py.test -vv -n auto -m "not build_stage"
+```
+
+The build_stage tests have to run first to create the docker images, followed by the actual tests which utilize said images.  Unless you're changing your dockerfiles you shouldn't have to run the build_stage every time - but it's a good idea to rebuild at least once a day in case the base Docker images or packages change.
+
+# How do I debug python?
+
+Highly recommended: Setup PyCharm on a **Docker enabled** machine.  Having a python debugger like PyCharm changes your life if you've never used it :)
diff --git a/test/conftest.py b/test/conftest.py
index 5960cc24..58530d38 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -1,14 +1,30 @@
 import pytest
 import testinfra
+from textwrap import dedent
 
 check_output = testinfra.get_backend(
     "local://"
 ).get_module("Command").check_output
 
+SETUPVARS = {
+    'PIHOLE_INTERFACE': 'eth99',
+    'IPV4_ADDRESS': '1.1.1.1',
+    'IPV6_ADDRESS': 'FE80::240:D0FF:FE48:4672',
+    'PIHOLE_DNS_1': '4.2.2.1',
+    'PIHOLE_DNS_2': '4.2.2.2'
+}
+
+tick_box = "[\x1b[1;32m\xe2\x9c\x93\x1b[0m]".decode("utf-8")
+cross_box = "[\x1b[1;31m\xe2\x9c\x97\x1b[0m]".decode("utf-8")
+info_box = "[i]".decode("utf-8")
+
+
 @pytest.fixture
 def Pihole(Docker):
-    ''' used to contain some script stubbing, now pretty much an alias.
-    Also provides bash as the default run function shell '''
+    '''
+    used to contain some script stubbing, now pretty much an alias.
+    Also provides bash as the default run function shell
+    '''
     def run_bash(self, command, *args, **kwargs):
         cmd = self.get_command(command, *args)
         if self.user is not None:
@@ -22,12 +38,18 @@ def Pihole(Docker):
         return out
 
     funcType = type(Docker.run)
-    Docker.run = funcType(run_bash, Docker, testinfra.backend.docker.DockerBackend)
+    Docker.run = funcType(run_bash,
+                          Docker,
+                          testinfra.backend.docker.DockerBackend)
     return Docker
 
+
 @pytest.fixture
 def Docker(request, args, image, cmd):
-    ''' combine our fixtures into a docker run command and setup finalizer to cleanup '''
+    '''
+    combine our fixtures into a docker run command and setup finalizer to
+    cleanup
+    '''
     assert 'docker' in check_output('id'), "Are you in the docker group?"
     docker_run = "docker run {} {} {}".format(args, image, cmd)
     docker_id = check_output(docker_run)
@@ -40,22 +62,95 @@ def Docker(request, args, image, cmd):
     docker_container.id = docker_id
     return docker_container
 
+
 @pytest.fixture
 def args(request):
-    ''' -t became required when tput began being used '''
+    '''
+    -t became required when tput began being used
+    '''
     return '-t -d'
 
-@pytest.fixture(params=['debian', 'centos'])
+
+@pytest.fixture(params=['debian', 'centos', 'fedora'])
 def tag(request):
-    ''' consumed by image to make the test matrix '''
+    '''
+    consumed by image to make the test matrix
+    '''
     return request.param
 
+
 @pytest.fixture()
 def image(request, tag):
-    ''' built by test_000_build_containers.py '''
+    '''
+    built by test_000_build_containers.py
+    '''
     return 'pytest_pihole:{}'.format(tag)
 
+
 @pytest.fixture()
 def cmd(request):
-    ''' default to doing nothing by tailing null, but don't exit '''
+    '''
+    default to doing nothing by tailing null, but don't exit
+    '''
     return 'tail -f /dev/null'
+
+
+# Helper functions
+def mock_command(script, args, container):
+    '''
+    Allows for setup of commands we don't really want to have to run for real
+    in unit tests
+    '''
+    full_script_path = '/usr/local/bin/{}'.format(script)
+    mock_script = dedent('''\
+    #!/bin/bash -e
+    echo "\$0 \$@" >> /var/log/{script}
+    case "\$1" in'''.format(script=script))
+    for k, v in args.iteritems():
+        case = dedent('''
+        {arg})
+        echo {res}
+        exit {retcode}
+        ;;'''.format(arg=k, res=v[0], retcode=v[1]))
+        mock_script += case
+    mock_script += dedent('''
+    esac''')
+    container.run('''
+    cat <<EOF> {script}\n{content}\nEOF
+    chmod +x {script}
+    rm -f /var/log/{scriptlog}'''.format(script=full_script_path,
+                                         content=mock_script,
+                                         scriptlog=script))
+
+
+def mock_command_2(script, args, container):
+    '''
+    Allows for setup of commands we don't really want to have to run for real
+    in unit tests
+    '''
+    full_script_path = '/usr/local/bin/{}'.format(script)
+    mock_script = dedent('''\
+    #!/bin/bash -e
+    echo "\$0 \$@" >> /var/log/{script}
+    case "\$1 \$2" in'''.format(script=script))
+    for k, v in args.iteritems():
+        case = dedent('''
+        \"{arg}\")
+        echo \"{res}\"
+        exit {retcode}
+        ;;'''.format(arg=k, res=v[0], retcode=v[1]))
+        mock_script += case
+    mock_script += dedent('''
+    esac''')
+    container.run('''
+    cat <<EOF> {script}\n{content}\nEOF
+    chmod +x {script}
+    rm -f /var/log/{scriptlog}'''.format(script=full_script_path,
+                                         content=mock_script,
+                                         scriptlog=script))
+
+
+def run_script(Pihole, script):
+    result = Pihole.run(script)
+    assert result.rc == 0
+    return result
diff --git a/test/fedora.Dockerfile b/test/fedora.Dockerfile
new file mode 100644
index 00000000..c4834388
--- /dev/null
+++ b/test/fedora.Dockerfile
@@ -0,0 +1,16 @@
+FROM fedora:latest
+
+ENV GITDIR /etc/.pihole
+ENV SCRIPTDIR /opt/pihole
+
+RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
+ADD . $GITDIR
+RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+
+RUN true && \
+    chmod +x $SCRIPTDIR/*
+
+ENV PH_TEST true
+
+#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
diff --git a/test/test_000_build_containers.py b/test/test_000_build_containers.py
index c617f3ae..e9e9e7db 100644
--- a/test/test_000_build_containers.py
+++ b/test/test_000_build_containers.py
@@ -6,10 +6,15 @@ run_local = testinfra.get_backend(
     "local://"
 ).get_module("Command").run
 
+
 @pytest.mark.parametrize("image,tag", [
-    ( 'test/debian.Dockerfile', 'pytest_pihole:debian' ),
-    ( 'test/centos.Dockerfile', 'pytest_pihole:centos' ),
+    ('test/debian.Dockerfile', 'pytest_pihole:debian'),
+    ('test/centos.Dockerfile', 'pytest_pihole:centos'),
+    ('test/fedora.Dockerfile', 'pytest_pihole:fedora'),
 ])
+# mark as 'build_stage' so we can ensure images are build first when tests
+# are executed in parallel. (not required when tests are executed serially)
+@pytest.mark.build_stage
 def test_build_pihole_image(image, tag):
     build_cmd = run_local('docker build -f {} -t {} .'.format(image, tag))
     if build_cmd.rc != 0:
diff --git a/test/test_automated_install.py b/test/test_automated_install.py
index 2c65c660..876b06eb 100644
--- a/test/test_automated_install.py
+++ b/test/test_automated_install.py
@@ -1,24 +1,40 @@
-import pytest
 from textwrap import dedent
+import re
+from conftest import (
+    SETUPVARS,
+    tick_box,
+    info_box,
+    cross_box,
+    mock_command,
+    mock_command_2,
+    run_script
+)
 
-SETUPVARS = {
-    'PIHOLE_INTERFACE' : 'eth99',
-    'IPV4_ADDRESS' : '1.1.1.1',
-    'IPV6_ADDRESS' : 'FE80::240:D0FF:FE48:4672',
-    'PIHOLE_DNS_1' : '4.2.2.1',
-    'PIHOLE_DNS_2' : '4.2.2.2'
-}
 
-tick_box="[\x1b[1;32m\xe2\x9c\x93\x1b[0m]".decode("utf-8")
-cross_box="[\x1b[1;31m\xe2\x9c\x97\x1b[0m]".decode("utf-8")
-info_box="[i]".decode("utf-8")
+def test_supported_operating_system(Pihole):
+    '''
+    confirm installer exists on unsupported distribution
+    '''
+    # break supported package managers to emulate an unsupported distribution
+    Pihole.run('rm -rf /usr/bin/apt-get')
+    Pihole.run('rm -rf /usr/bin/rpm')
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = cross_box + ' OS distribution not supported'
+    assert expected_stdout in distro_check.stdout
+    # assert distro_check.rc == 1
+
 
 def test_setupVars_are_sourced_to_global_scope(Pihole):
-    ''' currently update_dialogs sources setupVars with a dot,
+    '''
+    currently update_dialogs sources setupVars with a dot,
     then various other functions use the variables.
-    This confirms the sourced variables are in scope between functions '''
+    This confirms the sourced variables are in scope between functions
+    '''
     setup_var_file = 'cat <<EOF> /etc/pihole/setupVars.conf\n'
-    for k,v in SETUPVARS.iteritems():
+    for k, v in SETUPVARS.iteritems():
         setup_var_file += "{}={}\n".format(k, v)
     setup_var_file += "EOF\n"
     Pihole.run(setup_var_file)
@@ -43,13 +59,17 @@ def test_setupVars_are_sourced_to_global_scope(Pihole):
 
     output = run_script(Pihole, script).stdout
 
-    for k,v in SETUPVARS.iteritems():
+    for k, v in SETUPVARS.iteritems():
         assert "{}={}".format(k, v) in output
 
+
 def test_setupVars_saved_to_file(Pihole):
-    ''' confirm saved settings are written to a file for future updates to re-use '''
-    set_setup_vars = '\n'  # dedent works better with this and padding matching script below
-    for k,v in SETUPVARS.iteritems():
+    '''
+    confirm saved settings are written to a file for future updates to re-use
+    '''
+    # dedent works better with this and padding matching script below
+    set_setup_vars = '\n'
+    for k, v in SETUPVARS.iteritems():
         set_setup_vars += "    {}={}\n".format(k, v)
     Pihole.run(set_setup_vars).stdout
 
@@ -67,15 +87,18 @@ def test_setupVars_saved_to_file(Pihole):
 
     output = run_script(Pihole, script).stdout
 
-    for k,v in SETUPVARS.iteritems():
+    for k, v in SETUPVARS.iteritems():
         assert "{}={}".format(k, v) in output
 
+
 def test_configureFirewall_firewalld_running_no_errors(Pihole):
-    ''' confirms firewalld rules are applied when firewallD is running '''
+    '''
+    confirms firewalld rules are applied when firewallD is running
+    '''
     # firewallD returns 'running' as status
-    mock_command('firewall-cmd', {'*':('running', 0)}, Pihole)
+    mock_command('firewall-cmd', {'*': ('running', 0)}, Pihole)
     # Whiptail dialog returns Ok for user prompt
-    mock_command('whiptail', {'*':('', 0)}, Pihole)
+    mock_command('whiptail', {'*': ('', 0)}, Pihole)
     configureFirewall = Pihole.run('''
     source /opt/pihole/basic-install.sh
     configureFirewall
@@ -84,26 +107,37 @@ def test_configureFirewall_firewalld_running_no_errors(Pihole):
     assert expected_stdout in configureFirewall.stdout
     firewall_calls = Pihole.run('cat /var/log/firewall-cmd').stdout
     assert 'firewall-cmd --state' in firewall_calls
-    assert 'firewall-cmd --permanent --add-service=http --add-service=dns' in firewall_calls
+    assert ('firewall-cmd '
+            '--permanent '
+            '--add-service=http '
+            '--add-service=dns') in firewall_calls
     assert 'firewall-cmd --reload' in firewall_calls
 
+
 def test_configureFirewall_firewalld_disabled_no_errors(Pihole):
-    ''' confirms firewalld rules are not applied when firewallD is not running '''
+    '''
+    confirms firewalld rules are not applied when firewallD is not running
+    '''
     # firewallD returns non-running status
-    mock_command('firewall-cmd', {'*':('not running', '1')}, Pihole)
+    mock_command('firewall-cmd', {'*': ('not running', '1')}, Pihole)
     configureFirewall = Pihole.run('''
     source /opt/pihole/basic-install.sh
     configureFirewall
     ''')
-    expected_stdout = 'No active firewall detected.. skipping firewall configuration'
+    expected_stdout = ('No active firewall detected.. '
+                       'skipping firewall configuration')
     assert expected_stdout in configureFirewall.stdout
 
+
 def test_configureFirewall_firewalld_enabled_declined_no_errors(Pihole):
-    ''' confirms firewalld rules are not applied when firewallD is running, user declines ruleset '''
+    '''
+    confirms firewalld rules are not applied when firewallD is running, user
+    declines ruleset
+    '''
     # firewallD returns running status
-    mock_command('firewall-cmd', {'*':('running', 0)}, Pihole)
+    mock_command('firewall-cmd', {'*': ('running', 0)}, Pihole)
     # Whiptail dialog returns Cancel for user prompt
-    mock_command('whiptail', {'*':('', 1)}, Pihole)
+    mock_command('whiptail', {'*': ('', 1)}, Pihole)
     configureFirewall = Pihole.run('''
     source /opt/pihole/basic-install.sh
     configureFirewall
@@ -111,6 +145,7 @@ def test_configureFirewall_firewalld_enabled_declined_no_errors(Pihole):
     expected_stdout = 'Not installing firewall rulesets.'
     assert expected_stdout in configureFirewall.stdout
 
+
 def test_configureFirewall_no_firewall(Pihole):
     ''' confirms firewall skipped no daemon is running '''
     configureFirewall = Pihole.run('''
@@ -120,14 +155,18 @@ def test_configureFirewall_no_firewall(Pihole):
     expected_stdout = 'No active firewall detected'
     assert expected_stdout in configureFirewall.stdout
 
+
 def test_configureFirewall_IPTables_enabled_declined_no_errors(Pihole):
-    ''' confirms IPTables rules are not applied when IPTables is running, user declines ruleset '''
+    '''
+    confirms IPTables rules are not applied when IPTables is running, user
+    declines ruleset
+    '''
     # iptables command exists
-    mock_command('iptables', {'*':('', '0')}, Pihole)
+    mock_command('iptables', {'*': ('', '0')}, Pihole)
     # modinfo returns always true (ip_tables module check)
-    mock_command('modinfo', {'*':('', '0')}, Pihole)
+    mock_command('modinfo', {'*': ('', '0')}, Pihole)
     # Whiptail dialog returns Cancel for user prompt
-    mock_command('whiptail', {'*':('', '1')}, Pihole)
+    mock_command('whiptail', {'*': ('', '1')}, Pihole)
     configureFirewall = Pihole.run('''
     source /opt/pihole/basic-install.sh
     configureFirewall
@@ -135,14 +174,19 @@ def test_configureFirewall_IPTables_enabled_declined_no_errors(Pihole):
     expected_stdout = 'Not installing firewall rulesets.'
     assert expected_stdout in configureFirewall.stdout
 
+
 def test_configureFirewall_IPTables_enabled_rules_exist_no_errors(Pihole):
-    ''' confirms IPTables rules are not applied when IPTables is running and rules exist '''
-    # iptables command exists and returns 0 on calls (should return 0 on iptables -C)
-    mock_command('iptables', {'-S':('-P INPUT DENY', '0')}, Pihole)
+    '''
+    confirms IPTables rules are not applied when IPTables is running and rules
+    exist
+    '''
+    # iptables command exists and returns 0 on calls
+    # (should return 0 on iptables -C)
+    mock_command('iptables', {'-S': ('-P INPUT DENY', '0')}, Pihole)
     # modinfo returns always true (ip_tables module check)
-    mock_command('modinfo', {'*':('', '0')}, Pihole)
+    mock_command('modinfo', {'*': ('', '0')}, Pihole)
     # Whiptail dialog returns Cancel for user prompt
-    mock_command('whiptail', {'*':('', '0')}, Pihole)
+    mock_command('whiptail', {'*': ('', '0')}, Pihole)
     configureFirewall = Pihole.run('''
     source /opt/pihole/basic-install.sh
     configureFirewall
@@ -150,18 +194,46 @@ def test_configureFirewall_IPTables_enabled_rules_exist_no_errors(Pihole):
     expected_stdout = 'Installing new IPTables firewall rulesets'
     assert expected_stdout in configureFirewall.stdout
     firewall_calls = Pihole.run('cat /var/log/iptables').stdout
-    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT' not in firewall_calls
-    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT' not in firewall_calls
-    assert 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT' not in firewall_calls
+    # General call type occurances
+    assert len(re.findall(r'iptables -S', firewall_calls)) == 1
+    assert len(re.findall(r'iptables -C', firewall_calls)) == 4
+    assert len(re.findall(r'iptables -I', firewall_calls)) == 0
+
+    # Specific port call occurances
+    assert len(re.findall(r'tcp --dport 80', firewall_calls)) == 1
+    assert len(re.findall(r'tcp --dport 53', firewall_calls)) == 1
+    assert len(re.findall(r'udp --dport 53', firewall_calls)) == 1
+    assert len(re.findall(r'tcp --dport 4711:4720', firewall_calls)) == 1
+
 
 def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
-    ''' confirms IPTables rules are applied when IPTables is running and rules do not exist '''
+    '''
+    confirms IPTables rules are applied when IPTables is running and rules do
+    not exist
+    '''
     # iptables command and returns 0 on calls (should return 1 on iptables -C)
-    mock_command('iptables', {'-S':('-P INPUT DENY', '0'), '-C':('', 1), '-I':('', 0)}, Pihole)
+    mock_command(
+        'iptables',
+        {
+            '-S': (
+                '-P INPUT DENY',
+                '0'
+            ),
+            '-C': (
+                '',
+                1
+            ),
+            '-I': (
+                '',
+                0
+            )
+        },
+        Pihole
+    )
     # modinfo returns always true (ip_tables module check)
-    mock_command('modinfo', {'*':('', '0')}, Pihole)
+    mock_command('modinfo', {'*': ('', '0')}, Pihole)
     # Whiptail dialog returns Cancel for user prompt
-    mock_command('whiptail', {'*':('', '0')}, Pihole)
+    mock_command('whiptail', {'*': ('', '0')}, Pihole)
     configureFirewall = Pihole.run('''
     source /opt/pihole/basic-install.sh
     configureFirewall
@@ -169,52 +241,160 @@ def test_configureFirewall_IPTables_enabled_not_exist_no_errors(Pihole):
     expected_stdout = 'Installing new IPTables firewall rulesets'
     assert expected_stdout in configureFirewall.stdout
     firewall_calls = Pihole.run('cat /var/log/iptables').stdout
-    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT' in firewall_calls
-    assert 'iptables -I INPUT 1 -p tcp -m tcp --dport 53 -j ACCEPT' in firewall_calls
-    assert 'iptables -I INPUT 1 -p udp -m udp --dport 53 -j ACCEPT' in firewall_calls
+    # General call type occurances
+    assert len(re.findall(r'iptables -S', firewall_calls)) == 1
+    assert len(re.findall(r'iptables -C', firewall_calls)) == 4
+    assert len(re.findall(r'iptables -I', firewall_calls)) == 4
+
+    # Specific port call occurances
+    assert len(re.findall(r'tcp --dport 80', firewall_calls)) == 2
+    assert len(re.findall(r'tcp --dport 53', firewall_calls)) == 2
+    assert len(re.findall(r'udp --dport 53', firewall_calls)) == 2
+    assert len(re.findall(r'tcp --dport 4711:4720', firewall_calls)) == 2
+
+
+def test_selinux_enforcing_default_exit(Pihole):
+    '''
+    confirms installer prompts to exit when SELinux is Enforcing by default
+    '''
+    # getenforce returns the running state of SELinux
+    mock_command('getenforce', {'*': ('Enforcing', '0')}, Pihole)
+    # Whiptail dialog returns Cancel for user prompt
+    mock_command('whiptail', {'*': ('', '1')}, Pihole)
+    check_selinux = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    checkSelinux
+    ''')
+    expected_stdout = info_box + ' SELinux mode detected: Enforcing'
+    assert expected_stdout in check_selinux.stdout
+    expected_stdout = 'SELinux Enforcing detected, exiting installer'
+    assert expected_stdout in check_selinux.stdout
+    assert check_selinux.rc == 1
+
+
+def test_selinux_enforcing_continue(Pihole):
+    '''
+    confirms installer prompts to continue with custom policy warning
+    '''
+    # getenforce returns the running state of SELinux
+    mock_command('getenforce', {'*': ('Enforcing', '0')}, Pihole)
+    # Whiptail dialog returns Continue for user prompt
+    mock_command('whiptail', {'*': ('', '0')}, Pihole)
+    check_selinux = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    checkSelinux
+    ''')
+    expected_stdout = info_box + ' SELinux mode detected: Enforcing'
+    assert expected_stdout in check_selinux.stdout
+    expected_stdout = info_box + (' Continuing installation with SELinux '
+                                  'Enforcing')
+    assert expected_stdout in check_selinux.stdout
+    expected_stdout = info_box + (' Please refer to official SELinux '
+                                  'documentation to create a custom policy')
+    assert expected_stdout in check_selinux.stdout
+    assert check_selinux.rc == 0
+
+
+def test_selinux_permissive(Pihole):
+    '''
+    confirms installer continues when SELinux is Permissive
+    '''
+    # getenforce returns the running state of SELinux
+    mock_command('getenforce', {'*': ('Permissive', '0')}, Pihole)
+    check_selinux = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    checkSelinux
+    ''')
+    expected_stdout = info_box + ' SELinux mode detected: Permissive'
+    assert expected_stdout in check_selinux.stdout
+    assert check_selinux.rc == 0
+
+
+def test_selinux_disabled(Pihole):
+    '''
+    confirms installer continues when SELinux is Disabled
+    '''
+    mock_command('getenforce', {'*': ('Disabled', '0')}, Pihole)
+    check_selinux = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    checkSelinux
+    ''')
+    expected_stdout = info_box + ' SELinux mode detected: Disabled'
+    assert expected_stdout in check_selinux.stdout
+    assert check_selinux.rc == 0
+
 
 def test_installPiholeWeb_fresh_install_no_errors(Pihole):
-    ''' confirms all web page assets from Core repo are installed on a fresh build '''
+    '''
+    confirms all web page assets from Core repo are installed on a fresh build
+    '''
     installWeb = Pihole.run('''
     source /opt/pihole/basic-install.sh
     installPiholeWeb
     ''')
-    assert info_box + ' Installing blocking page...' in installWeb.stdout
-    assert tick_box + ' Creating directory for blocking page, and copying files' in installWeb.stdout
-    assert cross_box + ' Backing up index.lighttpd.html' in installWeb.stdout
-    assert 'No default index.lighttpd.html file found... not backing up' in installWeb.stdout
-    assert tick_box + ' Installing sudoer file' in installWeb.stdout
+    expected_stdout = info_box + ' Installing blocking page...'
+    assert expected_stdout in installWeb.stdout
+    expected_stdout = tick_box + (' Creating directory for blocking page, '
+                                  'and copying files')
+    assert expected_stdout in installWeb.stdout
+    expected_stdout = cross_box + ' Backing up index.lighttpd.html'
+    assert expected_stdout in installWeb.stdout
+    expected_stdout = ('No default index.lighttpd.html file found... '
+                       'not backing up')
+    assert expected_stdout in installWeb.stdout
+    expected_stdout = tick_box + ' Installing sudoer file'
+    assert expected_stdout in installWeb.stdout
     web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout
     assert 'index.php' in web_directory
     assert 'blockingpage.css' in web_directory
 
+
 def test_update_package_cache_success_no_errors(Pihole):
-    ''' confirms package cache was updated without any errors'''
+    '''
+    confirms package cache was updated without any errors
+    '''
     updateCache = Pihole.run('''
     source /opt/pihole/basic-install.sh
     distro_check
     update_package_cache
     ''')
-    assert tick_box + ' Update local cache of available packages' in updateCache.stdout
-    assert 'Error: Unable to update package cache.' not in updateCache.stdout
+    expected_stdout = tick_box + ' Update local cache of available packages'
+    assert expected_stdout in updateCache.stdout
+    assert 'error' not in updateCache.stdout.lower()
+
 
 def test_update_package_cache_failure_no_errors(Pihole):
-    ''' confirms package cache was not updated'''
-    mock_command('apt-get', {'update':('', '1')}, Pihole)
+    '''
+    confirms package cache was not updated
+    '''
+    mock_command('apt-get', {'update': ('', '1')}, Pihole)
     updateCache = Pihole.run('''
     source /opt/pihole/basic-install.sh
     distro_check
     update_package_cache
     ''')
-    assert cross_box + ' Update local cache of available packages' in updateCache.stdout
+    expected_stdout = cross_box + ' Update local cache of available packages'
+    assert expected_stdout in updateCache.stdout
     assert 'Error: Unable to update package cache.' in updateCache.stdout
 
+
 def test_FTL_detect_aarch64_no_errors(Pihole):
-    ''' confirms only aarch64 package is downloaded for FTL engine '''
+    '''
+    confirms only aarch64 package is downloaded for FTL engine
+    '''
     # mock uname to return aarch64 platform
-    mock_command('uname', {'-m':('aarch64', '0')}, Pihole)
+    mock_command('uname', {'-m': ('aarch64', '0')}, Pihole)
     # mock ldd to respond with aarch64 shared library
-    mock_command('ldd', {'/bin/ls':('/lib/ld-linux-aarch64.so.1', '0')}, Pihole)
+    mock_command(
+        'ldd',
+        {
+            '/bin/ls': (
+                '/lib/ld-linux-aarch64.so.1',
+                '0'
+            )
+        },
+        Pihole
+    )
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     FTLdetect
@@ -226,29 +406,36 @@ def test_FTL_detect_aarch64_no_errors(Pihole):
     expected_stdout = tick_box + ' Downloading and Installing FTL'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_FTL_detect_armv6l_no_errors(Pihole):
-    ''' confirms only armv6l package is downloaded for FTL engine '''
+    '''
+    confirms only armv6l package is downloaded for FTL engine
+    '''
     # mock uname to return armv6l platform
-    mock_command('uname', {'-m':('armv6l', '0')}, Pihole)
+    mock_command('uname', {'-m': ('armv6l', '0')}, Pihole)
     # mock ldd to respond with aarch64 shared library
-    mock_command('ldd', {'/bin/ls':('/lib/ld-linux-armhf.so.3', '0')}, Pihole)
+    mock_command('ldd', {'/bin/ls': ('/lib/ld-linux-armhf.so.3', '0')}, Pihole)
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     FTLdetect
     ''')
     expected_stdout = info_box + ' FTL Checks...'
     assert expected_stdout in detectPlatform.stdout
-    expected_stdout = tick_box + ' Detected ARM-hf architecture (armv6 or lower)'
+    expected_stdout = tick_box + (' Detected ARM-hf architecture '
+                                  '(armv6 or lower)')
     assert expected_stdout in detectPlatform.stdout
     expected_stdout = tick_box + ' Downloading and Installing FTL'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_FTL_detect_armv7l_no_errors(Pihole):
-    ''' confirms only armv7l package is downloaded for FTL engine '''
+    '''
+    confirms only armv7l package is downloaded for FTL engine
+    '''
     # mock uname to return armv7l platform
-    mock_command('uname', {'-m':('armv7l', '0')}, Pihole)
+    mock_command('uname', {'-m': ('armv7l', '0')}, Pihole)
     # mock ldd to respond with aarch64 shared library
-    mock_command('ldd', {'/bin/ls':('/lib/ld-linux-armhf.so.3', '0')}, Pihole)
+    mock_command('ldd', {'/bin/ls': ('/lib/ld-linux-armhf.so.3', '0')}, Pihole)
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     FTLdetect
@@ -260,8 +447,11 @@ def test_FTL_detect_armv7l_no_errors(Pihole):
     expected_stdout = tick_box + ' Downloading and Installing FTL'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_FTL_detect_x86_64_no_errors(Pihole):
-    ''' confirms only x86_64 package is downloaded for FTL engine '''
+    '''
+    confirms only x86_64 package is downloaded for FTL engine
+    '''
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     FTLdetect
@@ -273,10 +463,11 @@ def test_FTL_detect_x86_64_no_errors(Pihole):
     expected_stdout = tick_box + ' Downloading and Installing FTL'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_FTL_detect_unknown_no_errors(Pihole):
     ''' confirms only generic package is downloaded for FTL engine '''
     # mock uname to return generic platform
-    mock_command('uname', {'-m':('mips', '0')}, Pihole)
+    mock_command('uname', {'-m': ('mips', '0')}, Pihole)
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     FTLdetect
@@ -284,8 +475,11 @@ def test_FTL_detect_unknown_no_errors(Pihole):
     expected_stdout = 'Not able to detect architecture (unknown: mips)'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_FTL_download_aarch64_no_errors(Pihole):
-    ''' confirms only aarch64 package is downloaded for FTL engine '''
+    '''
+    confirms only aarch64 package is downloaded for FTL engine
+    '''
     # mock uname to return generic platform
     download_binary = Pihole.run('''
     source /opt/pihole/basic-install.sh
@@ -293,13 +487,13 @@ def test_FTL_download_aarch64_no_errors(Pihole):
     ''')
     expected_stdout = tick_box + ' Downloading and Installing FTL'
     assert expected_stdout in download_binary.stdout
-    error = 'Error: Download of binary from Github failed'
-    assert error not in download_binary.stdout
-    error = 'Error: URL not found'
-    assert error not in download_binary.stdout
+    assert 'error' not in download_binary.stdout.lower()
+
 
 def test_FTL_download_unknown_fails_no_errors(Pihole):
-    ''' confirms unknown binary is not downloaded for FTL engine '''
+    '''
+    confirms unknown binary is not downloaded for FTL engine
+    '''
     # mock uname to return generic platform
     download_binary = Pihole.run('''
     source /opt/pihole/basic-install.sh
@@ -310,8 +504,11 @@ def test_FTL_download_unknown_fails_no_errors(Pihole):
     error = 'Error: URL not found'
     assert error in download_binary.stdout
 
+
 def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
-    ''' confirms FTL binary is copied and functional in installed location '''
+    '''
+    confirms FTL binary is copied and functional in installed location
+    '''
     installed_binary = Pihole.run('''
     source /opt/pihole/basic-install.sh
     FTLdetect
@@ -320,8 +517,11 @@ def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
     expected_stdout = 'v'
     assert expected_stdout in installed_binary.stdout
 
+
 # def test_FTL_support_files_installed(Pihole):
-#     ''' confirms FTL support files are installed '''
+#     '''
+#     confirms FTL support files are installed
+#     '''
 #     support_files = Pihole.run('''
 #     source /opt/pihole/basic-install.sh
 #     FTLdetect
@@ -334,21 +534,46 @@ def test_FTL_binary_installed_and_responsive_no_errors(Pihole):
 #     assert '644 /run/pihole-FTL.pid' in support_files.stdout
 #     assert '644 /var/log/pihole-FTL.log' in support_files.stdout
 
+
 def test_IPv6_only_link_local(Pihole):
-    ''' confirms IPv6 blocking is disabled for Link-local address '''
+    '''
+    confirms IPv6 blocking is disabled for Link-local address
+    '''
     # mock ip -6 address to return Link-local address
-    mock_command_2('ip', {'-6 address':('inet6 fe80::d210:52fa:fe00:7ad7/64 scope link', '0')}, Pihole)
+    mock_command_2(
+        'ip',
+        {
+            '-6 address': (
+                'inet6 fe80::d210:52fa:fe00:7ad7/64 scope link',
+                '0'
+            )
+        },
+        Pihole
+    )
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     useIPv6dialog
     ''')
-    expected_stdout = 'Unable to find IPv6 ULA/GUA address, IPv6 adblocking will not be enabled'
+    expected_stdout = ('Unable to find IPv6 ULA/GUA address, '
+                       'IPv6 adblocking will not be enabled')
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_IPv6_only_ULA(Pihole):
-    ''' confirms IPv6 blocking is enabled for ULA addresses '''
+    '''
+    confirms IPv6 blocking is enabled for ULA addresses
+    '''
     # mock ip -6 address to return ULA address
-    mock_command_2('ip', {'-6 address':('inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
+    mock_command_2(
+        'ip',
+        {
+            '-6 address': (
+                'inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global',
+                '0'
+            )
+        },
+        Pihole
+    )
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     useIPv6dialog
@@ -356,10 +581,22 @@ def test_IPv6_only_ULA(Pihole):
     expected_stdout = 'Found IPv6 ULA address, using it for blocking IPv6 ads'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_IPv6_only_GUA(Pihole):
-    ''' confirms IPv6 blocking is enabled for GUA addresses '''
+    '''
+    confirms IPv6 blocking is enabled for GUA addresses
+    '''
     # mock ip -6 address to return GUA address
-    mock_command_2('ip', {'-6 address':('inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
+    mock_command_2(
+        'ip',
+        {
+            '-6 address': (
+                'inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global',
+                '0'
+            )
+        },
+        Pihole
+    )
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     useIPv6dialog
@@ -367,10 +604,23 @@ def test_IPv6_only_GUA(Pihole):
     expected_stdout = 'Found IPv6 GUA address, using it for blocking IPv6 ads'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_IPv6_GUA_ULA_test(Pihole):
-    ''' confirms IPv6 blocking is enabled for GUA and ULA addresses '''
+    '''
+    confirms IPv6 blocking is enabled for GUA and ULA addresses
+    '''
     # mock ip -6 address to return GUA and ULA addresses
-    mock_command_2('ip', {'-6 address':('inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global\ninet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
+    mock_command_2(
+        'ip',
+        {
+            '-6 address': (
+                'inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global\n'
+                'inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global',
+                '0'
+            )
+        },
+        Pihole
+    )
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     useIPv6dialog
@@ -378,61 +628,26 @@ def test_IPv6_GUA_ULA_test(Pihole):
     expected_stdout = 'Found IPv6 ULA address, using it for blocking IPv6 ads'
     assert expected_stdout in detectPlatform.stdout
 
+
 def test_IPv6_ULA_GUA_test(Pihole):
-    ''' confirms IPv6 blocking is enabled for GUA and ULA addresses '''
+    '''
+    confirms IPv6 blocking is enabled for GUA and ULA addresses
+    '''
     # mock ip -6 address to return ULA and GUA addresses
-    mock_command_2('ip', {'-6 address':('inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global\ninet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global', '0')}, Pihole)
+    mock_command_2(
+        'ip',
+        {
+            '-6 address': (
+                'inet6 fda2:2001:5555:0:d210:52fa:fe00:7ad7/64 scope global\n'
+                'inet6 2003:12:1e43:301:d210:52fa:fe00:7ad7/64 scope global',
+                '0'
+            )
+        },
+        Pihole
+    )
     detectPlatform = Pihole.run('''
     source /opt/pihole/basic-install.sh
     useIPv6dialog
     ''')
     expected_stdout = 'Found IPv6 ULA address, using it for blocking IPv6 ads'
     assert expected_stdout in detectPlatform.stdout
-
-# Helper functions
-def mock_command(script, args, container):
-    ''' Allows for setup of commands we don't really want to have to run for real in unit tests '''
-    full_script_path = '/usr/local/bin/{}'.format(script)
-    mock_script = dedent('''\
-    #!/bin/bash -e
-    echo "\$0 \$@" >> /var/log/{script}
-    case "\$1" in'''.format(script=script))
-    for k, v in args.iteritems():
-        case = dedent('''
-        {arg})
-        echo {res}
-        exit {retcode}
-        ;;'''.format(arg=k, res=v[0], retcode=v[1]))
-        mock_script += case
-    mock_script += dedent('''
-    esac''')
-    container.run('''
-    cat <<EOF> {script}\n{content}\nEOF
-    chmod +x {script}
-    rm -f /var/log/{scriptlog}'''.format(script=full_script_path, content=mock_script, scriptlog=script))
-
-def mock_command_2(script, args, container):
-    ''' Allows for setup of commands we don't really want to have to run for real in unit tests '''
-    full_script_path = '/usr/local/bin/{}'.format(script)
-    mock_script = dedent('''\
-    #!/bin/bash -e
-    echo "\$0 \$@" >> /var/log/{script}
-    case "\$1 \$2" in'''.format(script=script))
-    for k, v in args.iteritems():
-        case = dedent('''
-        \"{arg}\")
-        echo \"{res}\"
-        exit {retcode}
-        ;;'''.format(arg=k, res=v[0], retcode=v[1]))
-        mock_script += case
-    mock_script += dedent('''
-    esac''')
-    container.run('''
-    cat <<EOF> {script}\n{content}\nEOF
-    chmod +x {script}
-    rm -f /var/log/{scriptlog}'''.format(script=full_script_path, content=mock_script, scriptlog=script))
-
-def run_script(Pihole, script):
-    result = Pihole.run(script)
-    assert result.rc == 0
-    return result
diff --git a/test/test_centos_fedora_support.py b/test/test_centos_fedora_support.py
new file mode 100644
index 00000000..8318e44a
--- /dev/null
+++ b/test/test_centos_fedora_support.py
@@ -0,0 +1,209 @@
+import pytest
+from conftest import (
+    tick_box,
+    info_box,
+    cross_box,
+    mock_command,
+    mock_command_2,
+)
+
+
+@pytest.mark.parametrize("tag", [('fedora'), ])
+def test_epel_and_remi_not_installed_fedora(Pihole):
+    '''
+    confirms installer does not attempt to install EPEL/REMI repositories
+    on Fedora
+    '''
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    assert distro_check.stdout == ''
+
+    epel_package = Pihole.package('epel-release')
+    assert not epel_package.is_installed
+    remi_package = Pihole.package('remi-release')
+    assert not remi_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_release_supported_version_check_centos(Pihole):
+    '''
+    confirms installer exits on unsupported releases of CentOS
+    '''
+    # mock CentOS release < 7 (unsupported)
+    mock_command_2(
+        'rpm',
+        {"-q --queryformat '%{VERSION}' centos-release'": (
+            '5',
+            '0'
+        )},
+        Pihole
+    )
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = cross_box + (' CentOS  is not suported.')
+    assert expected_stdout in distro_check.stdout
+    expected_stdout = 'Please update to CentOS release 7 or later'
+    assert expected_stdout in distro_check.stdout
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_enable_epel_repository_centos(Pihole):
+    '''
+    confirms the EPEL package repository is enabled when installed on CentOS
+    '''
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = info_box + (' Enabling EPEL package repository '
+                                  '(https://fedoraproject.org/wiki/EPEL)')
+    assert expected_stdout in distro_check.stdout
+    expected_stdout = tick_box + ' Installed epel-release'
+    assert expected_stdout in distro_check.stdout
+    epel_package = Pihole.package('epel-release')
+    assert epel_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_php_upgrade_default_optout_centos(Pihole):
+    '''
+    confirms the default behavior to opt-out of installing PHP7 from REMI
+    '''
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
+                                  'Deprecated PHP may be in use.')
+    assert expected_stdout in distro_check.stdout
+    remi_package = Pihole.package('remi-release')
+    assert not remi_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_php_upgrade_user_optout_centos(Pihole):
+    '''
+    confirms installer behavior when user opt-out of installing PHP7 from REMI
+    (php not currently installed)
+    '''
+    # Whiptail dialog returns Cancel for user prompt
+    mock_command('whiptail', {'*': ('', '1')}, Pihole)
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
+                                  'Deprecated PHP may be in use.')
+    assert expected_stdout in distro_check.stdout
+    remi_package = Pihole.package('remi-release')
+    assert not remi_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_php_upgrade_user_optin_centos(Pihole):
+    '''
+    confirms installer behavior when user opt-in to installing PHP7 from REMI
+    (php not currently installed)
+    '''
+    # Whiptail dialog returns Continue for user prompt
+    mock_command('whiptail', {'*': ('', '0')}, Pihole)
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    assert 'opt-out' not in distro_check.stdout
+    expected_stdout = info_box + (' Enabling Remi\'s RPM repository '
+                                  '(https://rpms.remirepo.net)')
+    assert expected_stdout in distro_check.stdout
+    expected_stdout = tick_box + (' Remi\'s RPM repository has '
+                                  'been enabled for PHP7')
+    assert expected_stdout in distro_check.stdout
+    remi_package = Pihole.package('remi-release')
+    assert remi_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_php_version_lt_7_detected_upgrade_default_optout_centos(Pihole):
+    '''
+    confirms the default behavior to opt-out of upgrading to PHP7 from REMI
+    '''
+    # first we will install the default php version to test installer behavior
+    php_install = Pihole.run('yum install -y php')
+    assert php_install.rc == 0
+    php_package = Pihole.package('php')
+    default_centos_php_version = php_package.version.split('.')[0]
+    if int(default_centos_php_version) >= 7:  # PHP7 is supported/recommended
+        pytest.skip("Test deprecated . Detected default PHP version >= 7")
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
+                                  'Deprecated PHP may be in use.')
+    assert expected_stdout in distro_check.stdout
+    remi_package = Pihole.package('remi-release')
+    assert not remi_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_php_version_lt_7_detected_upgrade_user_optout_centos(Pihole):
+    '''
+    confirms installer behavior when user opt-out to upgrade to PHP7 via REMI
+    '''
+    # first we will install the default php version to test installer behavior
+    php_install = Pihole.run('yum install -y php')
+    assert php_install.rc == 0
+    php_package = Pihole.package('php')
+    default_centos_php_version = php_package.version.split('.')[0]
+    if int(default_centos_php_version) >= 7:  # PHP7 is supported/recommended
+        pytest.skip("Test deprecated . Detected default PHP version >= 7")
+    # Whiptail dialog returns Cancel for user prompt
+    mock_command('whiptail', {'*': ('', '1')}, Pihole)
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    ''')
+    expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
+                                  'Deprecated PHP may be in use.')
+    assert expected_stdout in distro_check.stdout
+    remi_package = Pihole.package('remi-release')
+    assert not remi_package.is_installed
+
+
+@pytest.mark.parametrize("tag", [('centos'), ])
+def test_php_version_lt_7_detected_upgrade_user_optin_centos(Pihole):
+    '''
+    confirms installer behavior when user opt-in to upgrade to PHP7 via REMI
+    '''
+    # first we will install the default php version to test installer behavior
+    php_install = Pihole.run('yum install -y php')
+    assert php_install.rc == 0
+    php_package = Pihole.package('php')
+    default_centos_php_version = php_package.version.split('.')[0]
+    if int(default_centos_php_version) >= 7:  # PHP7 is supported/recommended
+        pytest.skip("Test deprecated . Detected default PHP version >= 7")
+    # Whiptail dialog returns Continue for user prompt
+    mock_command('whiptail', {'*': ('', '0')}, Pihole)
+    distro_check = Pihole.run('''
+    source /opt/pihole/basic-install.sh
+    distro_check
+    install_dependent_packages PIHOLE_WEB_DEPS[@]
+    ''')
+    expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
+                                  'Deprecated PHP may be in use.')
+    assert expected_stdout not in distro_check.stdout
+    expected_stdout = info_box + (' Enabling Remi\'s RPM repository '
+                                  '(https://rpms.remirepo.net)')
+    assert expected_stdout in distro_check.stdout
+    expected_stdout = tick_box + (' Remi\'s RPM repository has '
+                                  'been enabled for PHP7')
+    assert expected_stdout in distro_check.stdout
+    remi_package = Pihole.package('remi-release')
+    assert remi_package.is_installed
+    updated_php_package = Pihole.package('php')
+    updated_php_version = updated_php_package.version.split('.')[0]
+    assert int(updated_php_version) == 7
diff --git a/test/test_shellcheck.py b/test/test_shellcheck.py
index 5b1a8961..43e8ad6f 100644
--- a/test/test_shellcheck.py
+++ b/test/test_shellcheck.py
@@ -1,13 +1,18 @@
-import pytest
 import testinfra
 
 run_local = testinfra.get_backend(
     "local://"
 ).get_module("Command").run
 
+
 def test_scripts_pass_shellcheck():
-    ''' Make sure shellcheck does not find anything wrong with our shell scripts '''
-    shellcheck = "find . -type f -name 'update.sh' | while read file; do shellcheck -x \"$file\" -e SC1090,SC1091; done;"
+    '''
+    Make sure shellcheck does not find anything wrong with our shell scripts
+    '''
+    shellcheck = ("find . -type f -name 'update.sh' "
+                  "| while read file; do "
+                  "shellcheck -x \"$file\" -e SC1090,SC1091; "
+                  "done;")
     results = run_local(shellcheck)
     print results.stdout
     assert '' == results.stdout
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..e7916e04
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = py27
+
+[testenv]
+whitelist_externals = docker
+deps = -rrequirements.txt
+commands = docker build -f test/debian.Dockerfile -t pytest_pihole:debian .
+           docker build -f test/centos.Dockerfile -t pytest_pihole:centos .
+           docker build -f test/fedora.Dockerfile -t pytest_pihole:fedora .
+           pytest {posargs:-vv -n auto} -m "not build_stage" ./test/