diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 07fc4352..c985b972 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -6,16 +6,7 @@
 
 **How familiar are you with the codebase?:**
 
-- [] 1 (very unfamiliar)
-- [] 2
-- [] 3
-- [] 4
-- [] 5
-- [] 6
-- [] 7
-- [] 8
-- [] 9
-- [] 10 (very familiar)
+_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_
 
 ---
 **[FEATURE REQUEST | QUESTION | OTHER]:**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9d6310d0..424bbc78 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,16 +10,7 @@
 
 **How familiar are you with the codebase?:**
 
-- [] 1 (very unfamiliar)
-- [] 2
-- [] 3
-- [] 4
-- [] 5
-- [] 6
-- [] 7
-- [] 8
-- [] 9
-- [] 10 (very familiar)
+_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_
 
 ---
 _{replace this line with your pull request content}_
diff --git a/README.md b/README.md
index c982354c..311c8704 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 ## The multi-platform, network-wide ad blocker
 
-Block ads for **all** your devices _without_ the need to install client-side software.  The Pi-hole blocks ads the DNS-level, so all your devices are protected.
+Block ads for **all** your devices _without_ the need to install client-side software.  The Pi-hole blocks ads at the DNS-level, so all your devices are protected.
 
 - Web Browsers
 - Cell Phones
@@ -53,7 +53,7 @@ wget -O basic-install.sh https://install.pi-hole.net
 bash basic-install.sh
 ```
 
-Once installed, [configure your router to have **DHCP clients use the Pi as their DNS server**](http://pi-hole.net/faq/can-i-set-the-pi-hole-to-be-the-dns-server-at-my-router-so-i-dont-have-to-change-settings-for-my-devices/) and then any device that connects to your network will have ads blocked without any further configuration. Alternatively, you can manually set each device to [use the Raspberry Pi as its DNS server](http://pi-hole.net/faq/how-do-i-use-the-pi-hole-as-my-dns-server/).
+Once installed, [configure your router to have **DHCP clients use the Pi as their DNS server**](https://discourse.pi-hole.net/t/how-do-i-configure-my-devices-to-use-pi-hole-as-their-dns-server/245) and then any device that connects to your network will have ads blocked without any further configuration. Alternatively, you can manually set each device to [use the Raspberry Pi as its DNS server](http://pi-hole.net/faq/how-do-i-use-the-pi-hole-as-my-dns-server/).
 
 ## Installing the Pi-hole (Click to Watch!)
 <p align="center">
diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index c4b3d865..a28bb868 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -15,8 +15,6 @@
 piLog="/var/log/pihole.log"
 gravity="/etc/pihole/gravity.list"
 
-today=$(date "+%b %e")
-
 . /etc/pihole/setupVars.conf
 
 CalcBlockedDomains() {
@@ -35,7 +33,7 @@ CalcBlockedDomains() {
 
 CalcQueriesToday() {
 	if [ -e "${piLog}" ]; then
-		queriesToday=$(cat "${piLog}" | grep "${today}" | awk '/query/ {print $6}' | wc -l)
+		queriesToday=$(awk '/query\[/ {print $6}' < "${piLog}" | wc -l)
 	else
 		queriesToday="Err."
 	fi
@@ -43,7 +41,7 @@ CalcQueriesToday() {
 
 CalcblockedToday() {
 	if [ -e "${piLog}" ] && [ -e "${gravity}" ];then
-		blockedToday=$(cat ${piLog} | awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' | wc -l)
+		blockedToday=$(awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' < "${piLog}" | wc -l)
 	else
 		blockedToday="Err."
 	fi
@@ -104,7 +102,7 @@ normalChrono() {
 
 		echo "Blocking:      ${blockedDomainsTotal}"
 		echo "Queries:       ${queriesToday}" #same total calculation as dashboard
-	  echo "Pi-holed:      ${blockedToday} (${percentBlockedToday}%)"
+		echo "Pi-holed:      ${blockedToday} (${percentBlockedToday}%)"
 
 		sleep 5
 	done
diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh
old mode 100644
new mode 100755
index 10728cd8..a2a5e8dc
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -22,9 +22,15 @@ readonly PI_HOLE_FILES_DIR="/etc/.pihole"
 is_repo() {
   # Use git to check if directory is currently under VCS, return the value
   local directory="${1}"
+  local curdir
+  local rc
 
-  git -C "${directory}" status --short &> /dev/null
-  return
+  curdir="${PWD}"
+  cd "${directory}" &> /dev/null || return 1
+  git status --short &> /dev/null
+  rc=$?
+  cd "${curdir}" &> /dev/null || return 1
+  return "${rc}"
 }
 
 prep_repo() {
@@ -40,22 +46,24 @@ make_repo() {
   local remoteRepo="${2}"
   local directory="${1}"
 
-  (prep_repo "${directory}" && git clone -q --depth 1 "${remoteRepo}" "${directory}" > /dev/null)
+  (prep_repo "${directory}" && git clone -q --depth 1 "${remoteRepo}" "${directory}")
      return
 }
 
 update_repo() {
   local directory="${1}"
-  local retVal=0
-  # Pull the latest commits
+  local curdir
 
+  curdir="${PWD}"
+  cd "${directory}" &> /dev/null || return 1
+  # Pull the latest commits
   # Stash all files not tracked for later retrieval
-  git -C "${directory}" stash --all --quiet &> /dev/null || ${retVal}=1
+  git stash --all --quiet
   # Force a clean working directory for cloning
-  git -C "${directory}" clean --force -d &> /dev/null || ${retVal}=1
+  git clean --force -d
   # Fetch latest changes and apply
-  git -C "${directory}" pull --quiet &> /dev/null || ${retVal}=1
-  return ${retVal}
+  git pull --quiet
+  cd "${curdir}" &> /dev/null || return 1
 }
 
 getGitFiles() {
@@ -76,33 +84,59 @@ getGitFiles() {
   fi
 }
 
+GitCheckUpdateAvail() {
+  local directory="${1}"
+  curdir=$PWD;
+  cd "${directory}"
+
+  # Fetch latest changes in this repo
+  git fetch --quiet origin
+  status="$(git status -sb)"
+
+  # Change back to original directory
+  cd "${curdir}"
+
+  if [[ $status == *"behind"* ]]; then
+    # Local branch is behind remote branch -> Update
+    return 0
+  else
+    # Local branch is up-to-date or in a situation
+    # where this updater cannot be used (like on a
+    # branch that exists only locally)
+    return 1
+  fi
+}
+
 main() {
   local pihole_version_current
-  local pihole_version_latest
   local web_version_current
-  local web_version_latest
 
-  if ! is_repo "${PI_HOLE_FILES_DIR}" || ! is_repo "${ADMIN_INTERFACE_DIR}" ; then #This is unlikely
+  #This is unlikely
+  if ! is_repo "${PI_HOLE_FILES_DIR}" || ! is_repo "${ADMIN_INTERFACE_DIR}" ; then
     echo "::: Critical Error: One or more Pi-Hole repos are missing from system!"
     echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
     exit 1;
   fi
 
   echo "::: Checking for updates..."
-  # Checks Pi-hole version string in format vX.X.X
-  pihole_version_current="$(/usr/local/bin/pihole version --pihole --current)"
-  pihole_version_latest="$(/usr/local/bin/pihole version --pihole --latest)"
-  web_version_current="$(/usr/local/bin/pihole version --admin --current)"
-  web_version_latest="$(/usr/local/bin/pihole version --admin --latest)"
 
-  if [[ "${pihole_version_latest}" == "-1" || "${web_version_latest}" == "-1" ]]; then
-    echo "*** Unable to contact GitHub for latest version. Please try again later, contact support if this continues."
-    exit 1
+  if GitCheckUpdateAvail "${PI_HOLE_FILES_DIR}" ; then
+    core_update=true
+    echo "::: Pi-hole Core:   update available"
+  else
+    core_update=false
+    echo "::: Pi-hole Core:   up to date"
+  fi
+
+  if GitCheckUpdateAvail "${ADMIN_INTERFACE_DIR}" ; then
+    web_update=true
+    echo "::: Web Interface:  update available"
+  else
+    web_update=false
+    echo "::: Web Interface:  up to date"
   fi
 
   # Logic
-  # If latest versions are blank - we've probably hit Github rate limit (stop running `pihole -up so often!):
-  #            Update anyway
   # If Core up to date AND web up to date:
   #            Do nothing
   # If Core up to date AND web NOT up to date:
@@ -112,46 +146,40 @@ main() {
   # if Core NOT up to date AND web NOT up to date:
   #            pull pihole repo run install --unattended
 
-  if [[ "${pihole_version_current}" == "${pihole_version_latest}" ]] && [[ "${web_version_current}" == "${web_version_latest}" ]]; then
-    echo ":::"
-    echo "::: Pi-hole version is $pihole_version_current"
-    echo "::: Web Admin version is $web_version_current"
+  if ! ${core_update} && ! ${web_update} ; then
     echo ":::"
     echo "::: Everything is up to date!"
     exit 0
 
-  elif [[ "${pihole_version_current}" == "${pihole_version_latest}" ]] && [[ "${web_version_current}" < "${web_version_latest}" ]]; then
+  elif ! ${core_update} && ${web_update} ; then
     echo ":::"
     echo "::: Pi-hole Web Admin files out of date"
     getGitFiles "${ADMIN_INTERFACE_DIR}" "${ADMIN_INTERFACE_GIT_URL}"
 
-    web_updated=true
-
-  elif [[ "${pihole_version_current}" < "${pihole_version_latest}" ]] && [[ "${web_version_current}" == "${web_version_latest}" ]]; then
+  elif ${core_update} && ! ${web_update} ; then
+    echo ":::"
     echo "::: Pi-hole core files out of date"
     getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
     /etc/.pihole/automated\ install/basic-install.sh --reconfigure --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
-    core_updated=true
 
-  elif [[ "${pihole_version_current}" < "${pihole_version_latest}" ]] && [[ "${web_version_current}" < "${web_version_latest}" ]]; then
+  elif ${core_update} && ${web_update} ; then
+    echo ":::"
     echo "::: Updating Everything"
     getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
     /etc/.pihole/automated\ install/basic-install.sh --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
-    web_updated=true
-    core_updated=true
   else
     echo "*** Update script has malfunctioned, fallthrough reached. Please contact support"
     exit 1
   fi
 
-  if [[ "${web_updated}" == true ]]; then
+  if [[ "${web_update}" == true ]]; then
     web_version_current="$(/usr/local/bin/pihole version --admin --current)"
     echo ":::"
     echo "::: Web Admin version is now at ${web_version_current}"
     echo "::: If you had made any changes in '/var/www/html/admin/', they have been stashed using 'git stash'"
   fi
 
-  if [[ "${core_updated}" == true ]]; then
+  if [[ "${core_update}" == true ]]; then
     pihole_version_current="$(/usr/local/bin/pihole version --pihole --current)"
     echo ":::"
     echo "::: Pi-hole version is now at ${pihole_version_current}"
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 135861df..d87def14 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -19,8 +19,9 @@ helpFunc() {
 :::
 ::: Options:
 :::  -p, password		Set web interface password, an empty input will remove any previously set password
-:::  -c, celsius		Set Celcius temperature unit
+:::  -c, celsius		Set Celsius temperature unit
 :::  -f, fahrenheit		Set Fahrenheit temperature unit
+:::  -k, kelvin			Set Kelvin temperature unit
 :::  -h, --help			Show this help dialog
 EOM
 	exit 0
@@ -31,11 +32,7 @@ SetTemperatureUnit(){
 	# Remove setting from file (create backup setupVars.conf.bak)
 	sed -i.bak '/TEMPERATUREUNIT/d' /etc/pihole/setupVars.conf
 	# Save setting to file
-	if [[ $unit == "F" ]] ; then
-		echo "TEMPERATUREUNIT=F" >> /etc/pihole/setupVars.conf
-	else
-		echo "TEMPERATUREUNIT=C" >> /etc/pihole/setupVars.conf
-	fi
+	echo "TEMPERATUREUNIT=${unit}" >> /etc/pihole/setupVars.conf
 
 }
 
@@ -64,6 +61,7 @@ SetWebPassword(){
 		echo "WEBPASSWORD=${hash}" >> /etc/pihole/setupVars.conf
 		echo "New password set"
 	else
+		echo "WEBPASSWORD=" >> /etc/pihole/setupVars.conf
 		echo "Password removed"
 	fi
 
@@ -72,15 +70,21 @@ SetWebPassword(){
 SetDNSServers(){
 
 	# Remove setting from file (create backup setupVars.conf.bak)
-	sed -i.bak '/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/DNS_FQDN_REQUIRED/d;' /etc/pihole/setupVars.conf
+	sed -i.bak '/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/DNS_FQDN_REQUIRED/d;/DNS_BOGUS_PRIV/d;' /etc/pihole/setupVars.conf
 	# Save setting to file
 	echo "PIHOLE_DNS_1=${args[2]}" >> /etc/pihole/setupVars.conf
-	echo "PIHOLE_DNS_2=${args[3]}" >> /etc/pihole/setupVars.conf
+	if [[ "${args[3]}" != "none" ]]; then
+		echo "PIHOLE_DNS_2=${args[3]}" >> /etc/pihole/setupVars.conf
+	else
+		echo "PIHOLE_DNS_2=" >> /etc/pihole/setupVars.conf
+	fi
 
 	# Replace within actual dnsmasq config file
 	sed -i '/server=/d;' /etc/dnsmasq.d/01-pihole.conf
 	echo "server=${args[2]}" >> /etc/dnsmasq.d/01-pihole.conf
-	echo "server=${args[3]}" >> /etc/dnsmasq.d/01-pihole.conf
+	if [[ "${args[3]}" != "none" ]]; then
+		echo "server=${args[3]}" >> /etc/dnsmasq.d/01-pihole.conf
+	fi
 
 	# Remove domain-needed entry
 	sed -i '/domain-needed/d;' /etc/dnsmasq.d/01-pihole.conf
@@ -222,13 +226,27 @@ SetPrivacyMode(){
 	else
 		echo "API_PRIVACY_MODE=false" >> /etc/pihole/setupVars.conf
 	fi
+}
 
+ResolutionSettings() {
+
+	typ=${args[2]}
+	state=${args[3]}
+
+	if [[ "${typ}" == "forward" ]]; then
+		sed -i.bak '/API_GET_UPSTREAM_DNS_HOSTNAME/d;' /etc/pihole/setupVars.conf
+		echo "API_GET_UPSTREAM_DNS_HOSTNAME=${state}" >> /etc/pihole/setupVars.conf
+	elif [[ "${typ}" == "clients" ]]; then
+		sed -i.bak '/API_GET_CLIENT_HOSTNAME/d;' /etc/pihole/setupVars.conf
+		echo "API_GET_CLIENT_HOSTNAME=${state}" >> /etc/pihole/setupVars.conf
+	fi
 }
 
 case "${args[1]}" in
 	"-p" | "password"   ) SetWebPassword;;
 	"-c" | "celsius"    ) unit="C"; SetTemperatureUnit;;
 	"-f" | "fahrenheit" ) unit="F"; SetTemperatureUnit;;
+	"-k" | "kelvin"     ) unit="K"; SetTemperatureUnit;;
 	"setdns"            ) SetDNSServers;;
 	"setexcludedomains" ) SetExcludeDomains;;
 	"setexcludeclients" ) SetExcludeClients;;
@@ -241,6 +259,7 @@ case "${args[1]}" in
 	"-h" | "--help"     ) helpFunc;;
 	"domainname"        ) SetDNSDomainName;;
 	"privacymode"       ) SetPrivacyMode;;
+	"resolve"           ) ResolutionSettings;;
 	*                   ) helpFunc;;
 esac
 
diff --git a/advanced/blockingpage.css b/advanced/blockingpage.css
new file mode 100644
index 00000000..1fdb5f19
--- /dev/null
+++ b/advanced/blockingpage.css
@@ -0,0 +1,133 @@
+/* CSS Reset */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; }
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; }
+body { line-height: 1; }
+ol, ul { list-style: none; }
+blockquote, q { quotes: none; }
+blockquote:before, blockquote:after, q:before, q:after { content: ''; content: none; }
+table { border-collapse: collapse; border-spacing: 0; }
+html { height: 100%; overflow-x: hidden; }
+
+/* General Style */
+a	{ color: rgba(0,60,120,0.95); text-decoration: none; } /* 1E3C5A */
+a:hover { color: rgba(210,120,0,0.95); transition-duration: .2s; } /* 255, 128, 0 */
+divs a		{ border-bottom: 1px dashed rgba(30,60,90,0.3); }
+b	{ font-weight: bold; }
+i	{ font-style: italic; }
+
+footer, pre, td { font-family: monospace; padding-left: 15px; }
+/*body, header { background: #E1E1E1; }*/
+
+body {
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,0.95), rgba(190,190,190,0.95));
+	background-image: linear-gradient(to bottom, rgba(240,240,240,0.95), rgba(190,190,190,0.95));
+	background-attachment: fixed;
+	color: rgba(64,64,64,0.95);
+	font: 14px, sans-serif;
+	line-height: 1em;
+}
+
+header {
+	min-width: 320px;
+	width: 100%;
+	text-shadow: 0 1px rgba(255,255,255,0.6);
+	display: table;
+	table-layout: fixed;
+	border: 1px solid rgba(0,0,0,0.25);
+	border-top-color: rgba(255,255,255,0.85);
+	border-style: solid none;
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,0.95), rgba(220,220,220,0.95));
+	background-image: linear-gradient(to bottom, rgba(240,240,240,0.95), rgba(220,220,220,0.95));
+	box-shadow:  0 0 1px 1px rgba(0,0,0,0.04);
+}
+
+header h1, header div {
+	display: table-cell;
+	color: inherit;
+	font-weight: bold;
+	vertical-align: middle;
+	white-space: nowrap;
+	overflow: hidden;
+	box-sizing: border-box;
+}
+
+header h1 {
+	font-size: 22px;
+	font-weight: bold;
+	width: 100%;
+	padding: 8px 0;
+	text-indent: 32px;
+	background: url("http://pi.hole/admin/img/logo.svg") left no-repeat;
+	background-size: 30px 22px;
+}
+
+header h1 a, h1 a:hover { color: inherit; }
+header .alt { width: 85px; font-size: 0.8em; padding-right: 4px; text-align: right; line-height: 1.25em; }
+.active { color: green; }
+.inactive { color: red; }
+
+main {
+	display: block;
+	width: 80%;
+	padding: 10px;
+	font-size: 1em;
+	background-color: rgba(255,255,255,0.85);
+	margin: 8px auto;
+	box-sizing: border-box;
+	border: 1px solid rgba(0,0,0,0.25);
+	box-shadow:  4px 4px rgba(0,0,0,0.1);
+	line-height: 1.2em;
+	border-radius: 8px;
+}
+
+h2 { /* Rgba is shared with .transparent th */
+	font: 1.15em sans-serif;
+	background-color: rgba(255,0,0,0.4);
+	text-shadow: none;
+	line-height: 1.1em;
+	padding-bottom: 1px;
+	margin-top: 8px;
+	margin-bottom: 4px;
+	background: -webkit-linear-gradient(left, rgba(0,0,0,0.25), transparent 80%) no-repeat;
+	background: linear-gradient(to right, rgba(0,0,0,0.25), transparent 80%) no-repeat;
+	background-size: 100% 1px;
+	background-position: 0 17px;
+}
+
+h2:first-child { margin-top: 0; }
+h2 ~ *:not(h2) { margin-left: 4px; }
+li { padding: 2px 0; }
+li::before { content: "\00BB\00a0"; }
+li a { position: relative; top: 1px; } /* Center bullet-point arrows */
+
+/* Button Style */
+.buttons a, input, .transparent th a { /* Swapped rgba is shared with input[type='url'] */
+	display: inline-block;
+	color: rgba(32,32,32,0.9);
+	font-weight: bold;
+	text-align: center;
+	cursor: pointer;
+	text-shadow: 0 1px rgba(255,255,255,0.2);
+	line-height: 0.86em;
+	font-size: 1em;
+	padding: 4px 8px;
+	background: #FAFAFA;
+	background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.05), rgba(0,0,0,0.05));
+	background-image: linear-gradient(to bottom, rgba(255,255,255,0.05), rgba(0,0,0,0.05));
+	border: 1px solid rgba(0,0,0,0.25);
+	border-radius: 4px;
+	box-shadow: 0 1px 0 rgba(0,0,0,0.04);
+}
+
+.buttons { white-space: nowrap; width: 100%; display: table; }
+.mini a { width: 50%; }
+a.safe { background-color: rgba(0,220,0,0.5); }
+a.warn { background-color: rgba(220,0,0,0.5); }
+
+.blocked a, .mini a { display: table-cell; }
+.blocked a.safe { width: 100%; }
+
+/* Types of text */
+.msg { white-space: pre; overflow: auto; -webkit-overflow-scrolling: touch; display: block; line-height: 1.2em; font-weight: bold; font-size: 1.15em; margin: 4px 8px 8px 8px; white-space: pre-line; }
+
+footer { font-size: 0.8em; text-align: center; width: 87%; margin: 4px auto; }
diff --git a/advanced/index.html b/advanced/index.html
deleted file mode 100644
index 3a4abe1f..00000000
--- a/advanced/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-<script>window.close();</script>
-</head>
-<body>
-</body>
-</html>
diff --git a/advanced/index.php b/advanced/index.php
new file mode 100644
index 00000000..46073867
--- /dev/null
+++ b/advanced/index.php
@@ -0,0 +1,103 @@
+<?php
+/* Detailed Pi-Hole Block Page: Show "Website Blocked" if user browses to site, but not to image/file requests based on the work of WaLLy3K for DietPi & Pi-Hole */
+
+$uri = escapeshellcmd($_SERVER['REQUEST_URI']);
+$serverName = escapeshellcmd($_SERVER['SERVER_NAME']);
+
+// Retrieve server URI extension (EG: jpg, exe, php)
+$uriExt = pathinfo($uri, PATHINFO_EXTENSION);
+
+// Define which URL extensions get rendered as "Website Blocked"
+$webExt = array('asp', 'htm', 'html', 'php', 'rss', 'xml');
+
+if(in_array($uriExt, $webExt) || empty($uriExt))
+{
+	// Requested resource has an extension listed in $webExt
+	// or no extension (index access to some folder incl. the root dir)
+	$showPage = true;
+}
+else
+{
+	// Something else
+	$showPage = false;
+}
+
+// Handle incoming URI types
+if (!$showPage)
+{
+?>
+<html>
+<head>
+<script>window.close();</script></head>
+<body>
+<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7">
+</body>
+</html>
+<?php
+	die();
+}
+
+// Get Pi-Hole version
+$piHoleVersion = exec('cd /etc/.pihole/ && git describe --tags --abbrev=0');
+
+// Don't show the URI if it is the root directory
+if($uri == "/")
+{
+	$uri = "";
+}
+
+?>
+<!DOCTYPE html>
+<head>
+	<meta charset='UTF-8'/>
+	<title>Website Blocked</title>
+	<link rel='stylesheet' href='http://<?php echo $_SERVER['SERVER_ADDR']; ?>/admin/blockingpage.css'/>
+	<link rel='shortcut icon' href='http://<?php echo $_SERVER['SERVER_ADDR']; ?>/admin/img/favicon.png' type='image/png'/>
+	<meta name='viewport' content='width=device-width,initial-scale=1.0,maximum-scale=1.0, user-scalable=no'/>
+	<meta name='robots' content='noindex,nofollow'/>
+</head>
+<body id="body">
+<header>
+	<h1><a href='/'>Website Blocked</a></h1>
+</header>
+<main>
+	<div>Access to the following site has been blocked:<br/>
+	<span class='pre msg'><?php echo $serverName.$uri; ?></span></div>
+	<div>If you have an ongoing use for this website, please ask the owner of the Pi-hole in your network to have it whitelisted.</div>
+	<input id="domain" type="hidden" value="<?php echo $serverName; ?>">
+	<input id="quiet" type="hidden" value="yes">
+	<button id="btnSearch" class="buttons blocked" type="button" style="visibility: hidden;"></button>
+	This page is blocked because it is explicitly contained within the following block list(s):
+	<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre><br/>
+	<div class='buttons blocked'><a class='safe' href='javascript:history.back()'>Go back</a>
+</main>
+<footer>Generated <?php echo date('D g:i A, M d'); ?> by Pi-hole <?php echo $piHoleVersion; ?></footer>
+<script src="http://<?php echo $_SERVER['SERVER_ADDR']; ?>/admin/js/other/jquery.min.js"></script>
+<script src="http://<?php echo $_SERVER['SERVER_ADDR']; ?>/admin/js/pihole/queryads.js"></script>
+<script>
+	function inIframe () {
+		try {
+			return window.self !== window.top;
+		} catch (e) {
+			return true;
+		}
+	}
+
+	// Try to detect if page is loaded within iframe
+	if(inIframe())
+	{
+		// Within iframe
+		// hide content of page
+		$('#body').hide();
+		// remove background
+		document.body.style.backgroundImage = "none";
+	}
+	else
+	{
+		// Query adlists
+		$( "#btnSearch" ).click();
+	}
+// }
+</script>
+</body>
+</html>
diff --git a/advanced/lighttpd.conf.debian b/advanced/lighttpd.conf.debian
index 15821bc7..01f52a85 100644
--- a/advanced/lighttpd.conf.debian
+++ b/advanced/lighttpd.conf.debian
@@ -21,7 +21,7 @@ server.modules = (
 )
 
 server.document-root        = "/var/www/html"
-server.error-handler-404	= "pihole/index.html"
+server.error-handler-404	= "pihole/index.php"
 server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
 server.errorlog             = "/var/log/lighttpd/error.log"
 server.pid-file             = "/var/run/lighttpd.pid"
diff --git a/advanced/lighttpd.conf.fedora b/advanced/lighttpd.conf.fedora
index 96e1311e..d2af5bd4 100644
--- a/advanced/lighttpd.conf.fedora
+++ b/advanced/lighttpd.conf.fedora
@@ -22,7 +22,7 @@ server.modules = (
 )
 
 server.document-root        = "/var/www/html"
-server.error-handler-404	= "pihole/index.html"
+server.error-handler-404	= "pihole/index.php"
 server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
 server.errorlog             = "/var/log/lighttpd/error.log"
 server.pid-file             = "/var/run/lighttpd.pid"
diff --git a/advanced/pihole.sudo b/advanced/pihole.sudo
index ef06249a..702bc7a5 100644
--- a/advanced/pihole.sudo
+++ b/advanced/pihole.sudo
@@ -9,4 +9,3 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
-www-data ALL=NOPASSWD: /usr/local/bin/pihole
diff --git a/advanced/selinux/pihole.te b/advanced/selinux/pihole.te
deleted file mode 100644
index 595755dd..00000000
--- a/advanced/selinux/pihole.te
+++ /dev/null
@@ -1,87 +0,0 @@
-module pihole 1.0;
-
-require {
-        type var_log_t;
-        type unconfined_t;
-        type init_t;
-        type auditd_t;
-        type syslogd_t;
-        type NetworkManager_t;
-        type mdadm_t;
-        type tuned_t;
-        type avahi_t;
-        type irqbalance_t;
-        type system_dbusd_t;
-        type kernel_t;
-        type httpd_sys_script_t;
-        type systemd_logind_t;
-        type httpd_t;
-        type policykit_t;
-        type dnsmasq_t;
-        type udev_t;
-        type postfix_pickup_t;
-        type sshd_t;
-        type crond_t;
-        type getty_t;
-        type lvm_t;
-        type postfix_qmgr_t;
-        type postfix_master_t;
-        class dir { getattr search };
-        class file { read open setattr };
-}
-
-#============= dnsmasq_t ==============
-allow dnsmasq_t var_log_t:file { open setattr };
-
-#============= httpd_t ==============
-allow httpd_t var_log_t:file { read open };
-
-#============= httpd_sys_script_t (class: dir) ==============
-allow httpd_sys_script_t NetworkManager_t:dir { getattr search };
-allow httpd_sys_script_t auditd_t:dir { getattr search };
-allow httpd_sys_script_t avahi_t:dir { getattr search };
-allow httpd_sys_script_t crond_t:dir { getattr search };
-allow httpd_sys_script_t dnsmasq_t:dir { getattr search };
-allow httpd_sys_script_t getty_t:dir { getattr search };
-allow httpd_sys_script_t httpd_t:dir { getattr search };
-allow httpd_sys_script_t init_t:dir { getattr search };
-allow httpd_sys_script_t irqbalance_t:dir { getattr search };
-allow httpd_sys_script_t kernel_t:dir { getattr search };
-allow httpd_sys_script_t lvm_t:dir { getattr search };
-allow httpd_sys_script_t mdadm_t:dir { getattr search };
-allow httpd_sys_script_t policykit_t:dir { getattr search };
-allow httpd_sys_script_t postfix_master_t:dir { getattr search };
-allow httpd_sys_script_t postfix_pickup_t:dir { getattr search };
-allow httpd_sys_script_t postfix_qmgr_t:dir { getattr search };
-allow httpd_sys_script_t sshd_t:dir { getattr search };
-allow httpd_sys_script_t syslogd_t:dir { getattr search };
-allow httpd_sys_script_t system_dbusd_t:dir { getattr search };
-allow httpd_sys_script_t systemd_logind_t:dir { getattr search };
-allow httpd_sys_script_t tuned_t:dir { getattr search };
-allow httpd_sys_script_t udev_t:dir { getattr search };
-allow httpd_sys_script_t unconfined_t:dir { getattr search };
-
-#============= httpd_sys_script_t (class: file) ==============
-allow httpd_sys_script_t NetworkManager_t:file { read open };
-allow httpd_sys_script_t auditd_t:file { read open };
-allow httpd_sys_script_t avahi_t:file { read open };
-allow httpd_sys_script_t crond_t:file { read open };
-allow httpd_sys_script_t dnsmasq_t:file { read open };
-allow httpd_sys_script_t getty_t:file { read open };
-allow httpd_sys_script_t httpd_t:file { read open };
-allow httpd_sys_script_t init_t:file { read open };
-allow httpd_sys_script_t irqbalance_t:file { read open };
-allow httpd_sys_script_t kernel_t:file { read open };
-allow httpd_sys_script_t lvm_t:file { read open };
-allow httpd_sys_script_t mdadm_t:file { read open };
-allow httpd_sys_script_t policykit_t:file { read open };
-allow httpd_sys_script_t postfix_master_t:file { read open };
-allow httpd_sys_script_t postfix_pickup_t:file { read open };
-allow httpd_sys_script_t postfix_qmgr_t:file { read open };
-allow httpd_sys_script_t sshd_t:file { read open };
-allow httpd_sys_script_t syslogd_t:file { read open };
-allow httpd_sys_script_t system_dbusd_t:file { read open };
-allow httpd_sys_script_t systemd_logind_t:file { read open };
-allow httpd_sys_script_t tuned_t:file { read open };
-allow httpd_sys_script_t udev_t:file { read open };
-allow httpd_sys_script_t unconfined_t:file { read open };
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 8abf9af8..1638829d 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -21,6 +21,7 @@ set -e
 tmpLog=/tmp/pihole-install.log
 instalLogLoc=/etc/pihole/install.log
 setupVars=/etc/pihole/setupVars.conf
+lighttpdConfig=/etc/lighttpd/lighttpd.conf
 
 webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
 webInterfaceDir="/var/www/html/admin"
@@ -78,10 +79,8 @@ if [[ $(command -v apt-get) ]]; then
   #Debian Family
   #############################################
   PKG_MANAGER="apt-get"
-  PKG_CACHE="/var/lib/apt/lists/"
   UPDATE_PKG_CACHE="${PKG_MANAGER} update"
-  PKG_UPDATE="${PKG_MANAGER} upgrade"
-  PKG_INSTALL="${PKG_MANAGER} --yes --fix-missing install"
+  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"
   # #########################################
@@ -91,8 +90,8 @@ if [[ $(command -v apt-get) ]]; then
   # Prefer the php metapackage if it's there, fall back on the php5 pacakges
   ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1 && phpVer="php" || phpVer="php5"
   # #########################################
-  INSTALLER_DEPS=( apt-utils whiptail git dhcpcd5)
-  PIHOLE_DEPS=( iputils-ping lsof dnsutils bc dnsmasq lighttpd ${phpVer}-common ${phpVer}-cgi curl unzip wget sudo netcat cron ${IPROUTE_PKG} )
+  INSTALLER_DEPS=(apt-utils debconf dhcpcd5 git whiptail)
+  PIHOLE_DEPS=(bc cron curl dnsmasq dnsutils ${IPROUTE_PKG} iputils-ping lighttpd lsof netcat ${phpVer}-common ${phpVer}-cgi sudo unzip wget)
   LIGHTTPD_USER="www-data"
   LIGHTTPD_GROUP="www-data"
   LIGHTTPD_CFG="lighttpd.conf.debian"
@@ -108,13 +107,12 @@ elif [ $(command -v rpm) ]; then
   else
     PKG_MANAGER="yum"
   fi
-  PKG_CACHE="/var/cache/${PKG_MANAGER}"
-  UPDATE_PKG_CACHE="${PKG_MANAGER} check-update"
-  PKG_UPDATE="${PKG_MANAGER} update -y"
+  # 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=( iproute net-tools procps-ng newt git )
-  PIHOLE_DEPS=( epel-release bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php curl unzip wget findutils cronie sudo nmap-ncat )
+  INSTALLER_DEPS=(git iproute net-tools newt procps-ng)
+  PIHOLE_DEPS=(bc bind-utils cronie curl dnsmasq epel-release findutils lighttpd lighttpd-fastcgi nmap-ncat php php-common php-cli sudo unzip wget)
 
   if grep -q 'Fedora' /etc/redhat-release; then
     remove_deps=(epel-release);
@@ -134,417 +132,414 @@ else
 fi
 
 ####### FUNCTIONS ##########
-spinner() {
-  local pid=$1
-  local delay=0.50
-  local spinstr='/-\|'
-
-  while [ "$(ps a | awk '{print $1}' | grep "${pid}")" ]; do
-    local temp=${spinstr#?}
-    printf " [%c]  " "${spinstr}"
-    local spinstr=${temp}${spinstr%"$temp"}
-    sleep ${delay}
-    printf "\b\b\b\b\b\b"
-  done
-  printf "    \b\b\b\b"
-}
-
 is_repo() {
   # Use git to check if directory is currently under VCS, return the value
   local directory="${1}"
-  git -C "${directory}" status --short &> /dev/null
-  return
+  if [ -d $directory ]; then
+    # git -C is not used here to support git versions older than 1.8.4
+    curdir=$PWD; cd $directory; git status --short &> /dev/null; rc=$?; cd $curdir
+    return $rc
+  else
+    # non-zero return code if directory does not exist OR is not a valid git repository
+    return 1
+  fi
 }
 
 make_repo() {
   local directory="${1}"
-	local remoteRepo="${2}"
-	# Remove the non-repod interface and clone the interface
-	echo -n ":::    Cloning $remoteRepo into $directory..."
-	rm -rf "${directory}"
-	git clone -q --depth 1 "${remoteRepo}" "${directory}" > /dev/null & spinner $!
-	echo " done!"
+  local remoteRepo="${2}"
+  # Remove the non-repod interface and clone the interface
+  echo -n ":::    Cloning $remoteRepo into $directory..."
+  rm -rf "${directory}"
+  git clone -q --depth 1 "${remoteRepo}" "${directory}" &> /dev/null
+  echo " done!"
 }
 
 update_repo() {
-	local directory="${1}"
-	# Pull the latest commits
-	echo -n ":::     Updating repo in $1..."
-	cd "${directory}" || exit 1
-	git stash -q > /dev/null & spinner $!
-	git pull -q > /dev/null & spinner $!
-	echo " done!"
+  local directory="${1}"
+  # Pull the latest commits
+  echo -n ":::    Updating repo in $1..."
+  cd "${directory}" || exit 1
+  git stash -q &> /dev/null
+  git pull -q &> /dev/null
+  echo " done!"
 }
 
 getGitFiles() {
-	# Setup git repos for directory and repository passed
-	# as arguments 1 and 2
-	local directory="${1}"
-	local remoteRepo="${2}"
-	echo ":::"
-	echo "::: Checking for existing repository..."
-	if is_repo "${directory}"; then
-	  update_repo "${directory}"
-	else
-	  make_repo "${directory}" "${remoteRepo}"
-	fi
+  # Setup git repos for directory and repository passed
+  # as arguments 1 and 2
+  local directory="${1}"
+  local remoteRepo="${2}"
+  echo ":::"
+  echo "::: Checking for existing repository..."
+  if is_repo "${directory}"; then
+    update_repo "${directory}"
+  else
+    make_repo "${directory}" "${remoteRepo}"
+  fi
 }
 
 find_IPv4_information() {
-	# Find IP used to route to outside world
-	IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
-	IPV4_ADDRESS=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}')
-	IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
+  # Find IP used to route to outside world
+  IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+  IPV4_ADDRESS=$(ip route get 8.8.8.8| awk '{print $7}')
+  IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
 }
 
 get_available_interfaces() {
-	# Get available interfaces. Consider only getting UP interfaces in the future, and leaving DOWN interfaces out of list.
-	availableInterfaces=$(ip -o link | awk '{print $2}' | grep -v "lo" | cut -d':' -f1 | cut -d'@' -f1)
+  # Get available UP interfaces.
+  availableInterfaces=$(ip -o link | grep "state UP" | awk '{print $2}' | cut -d':' -f1 | cut -d'@' -f1)
 }
 
 welcomeDialogs() {
-	# Display the welcome dialog
-	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
+  whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "\n\nThis installer will transform your device into a network-wide ad blocker!" ${r} ${c}
 
-	# Support for a part-time dev
-	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}
+  # Support for a part-time dev
+  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}
 }
 
 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.
-	echo "::: Verifying free disk space..."
-	local required_free_kilobytes=51200
-	local 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.
+  echo "::: Verifying free disk space..."
+  local required_free_kilobytes=51200
+  local existing_free_kilobytes=$(df -Pk | grep -m1 '\/$' | awk '{print $4}')
 
-	# - Unknown free disk space , not a integer
-	if ! [[ "${existing_free_kilobytes}" =~ ^([0-9])+$ ]]; then
-		echo "::: Unknown free disk space!"
-		echo "::: We were unable to determine available free disk space on this system."
-		echo "::: You may override this check and force the installation, however, it is not recommended"
-		echo "::: To do so, pass the argument '--i_do_not_follow_recommendations' to the install script"
-		echo "::: eg. curl -L https://install.pi-hole.net | bash /dev/stdin --i_do_not_follow_recommendations"
-		exit 1
-	# - Insufficient free disk space
-	elif [[ ${existing_free_kilobytes} -lt ${required_free_kilobytes} ]]; then
-		echo "::: Insufficient Disk Space!"
-		echo "::: Your system appears to be low on disk space. pi-hole recommends a minimum of $required_free_kilobytes KiloBytes."
-		echo "::: You only have ${existing_free_kilobytes} KiloBytes free."
-		echo "::: If this is a new install you may need to expand your disk."
-		echo "::: Try running 'sudo raspi-config', and choose the 'expand file system option'"
-		echo "::: After rebooting, run this installation again. (curl -L https://install.pi-hole.net | bash)"
-
-		echo "Insufficient free space, exiting..."
-		exit 1
-
-	fi
+  # - Unknown free disk space , not a integer
+  if ! [[ "${existing_free_kilobytes}" =~ ^([0-9])+$ ]]; then
+    echo "::: Unknown free disk space!"
+    echo "::: We were unable to determine available free disk space on this system."
+    echo "::: You may override this check and force the installation, however, it is not recommended"
+    echo "::: To do so, pass the argument '--i_do_not_follow_recommendations' to the install script"
+    echo "::: eg. curl -L https://install.pi-hole.net | bash /dev/stdin --i_do_not_follow_recommendations"
+    exit 1
+  # - Insufficient free disk space
+  elif [[ ${existing_free_kilobytes} -lt ${required_free_kilobytes} ]]; then
+    echo "::: Insufficient Disk Space!"
+    echo "::: Your system appears to be low on disk space. pi-hole recommends a minimum of $required_free_kilobytes KiloBytes."
+    echo "::: You only have ${existing_free_kilobytes} KiloBytes free."
+    echo "::: If this is a new install you may need to expand your disk."
+    echo "::: Try running 'sudo raspi-config', and choose the 'expand file system option'"
+    echo "::: After rebooting, run this installation again. (curl -L https://install.pi-hole.net | bash)"
 
+    echo "Insufficient free space, exiting..."
+    exit 1
+  fi
 }
 
 
 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
 
-	while read -r line; do
-		mode="OFF"
-		if [[ ${firstLoop} -eq 1 ]]; then
-			firstLoop=0
-			mode="ON"
-		fi
-		interfacesArray+=("${line}" "available" "${mode}")
-	done <<< "${availableInterfaces}"
+  if [[ $(echo ${availableInterfaces} | wc -l) -eq 1 ]]; then
+      PIHOLE_INTERFACE=${availableInterfaces}
+      return
+  fi
 
-	# Find out how many interfaces are available to choose from
-	interfaceCount=$(echo "${availableInterfaces}" | wc -l)
-	chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface (press space to select)" ${r} ${c} ${interfaceCount})
-	chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty)
-	if [[ $? = 0 ]]; then
-		for desiredInterface in ${chooseInterfaceOptions}; do
-			PIHOLE_INTERFACE=${desiredInterface}
-			echo "::: Using interface: $PIHOLE_INTERFACE"
-		done
-	else
-		echo "::: Cancel selected, exiting...."
-		exit 1
-	fi
+  while read -r line; do
+    mode="OFF"
+    if [[ ${firstLoop} -eq 1 ]]; then
+      firstLoop=0
+      mode="ON"
+    fi
+    interfacesArray+=("${line}" "available" "${mode}")
+  done <<< "${availableInterfaces}"
+
+  # Find out how many interfaces are available to choose from
+  interfaceCount=$(echo "${availableInterfaces}" | wc -l)
+  chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface (press space to select)" ${r} ${c} ${interfaceCount})
+  chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty)
+  if [[ $? = 0 ]]; then
+    for desiredInterface in ${chooseInterfaceOptions}; do
+      PIHOLE_INTERFACE=${desiredInterface}
+      echo "::: Using interface: $PIHOLE_INTERFACE"
+    done
+  else
+    echo "::: Cancel selected, exiting...."
+    exit 1
+  fi
 }
 
 useIPv6dialog() {
-	# Show the IPv6 address used for blocking
-	IPV6_ADDRESS=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
-	whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$IPV6_ADDRESS will be used to block ads." ${r} ${c}
+  # Show the IPv6 address used for blocking
+  IPV6_ADDRESS=$(ip -6 route get 2001:4860:4860::8888 | grep -v "unreachable" | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+
+  if [[ ! -z "${IPV6_ADDRESS}" ]]; then
+    whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$IPV6_ADDRESS will be used to block ads." ${r} ${c}
+  fi
 }
 
 
 use4andor6() {
-	local useIPv4
-	local useIPv6
-	# Let use select IPv4 and/or IPv6
-	cmd=(whiptail --separate-output --checklist "Select Protocols (press space to select)" ${r} ${c} 2)
-	options=(IPv4 "Block ads over IPv4" on
-	IPv6 "Block ads over IPv6" on)
-	choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
-	if [[ $? = 0 ]];then
-		for choice in ${choices}
-		do
-			case ${choice} in
-			IPv4  )   useIPv4=true;;
-			IPv6  )   useIPv6=true;;
-			esac
-		done
-		if [[ ${useIPv4} ]]; then
-			find_IPv4_information
-			getStaticIPv4Settings
-			setStaticIPv4
-		fi
-		if [[ ${useIPv6} ]]; then
-			useIPv6dialog
-		fi
-			echo "::: IPv4 address: ${IPV4_ADDRESS}"
-			echo "::: IPv6 address: ${IPV6_ADDRESS}"
-		if [ ! ${useIPv4} ] && [ ! ${useIPv6} ]; then
-			echo "::: Cannot continue, neither IPv4 or IPv6 selected"
-			echo "::: Exiting"
-			exit 1
-		fi
-	else
-		echo "::: Cancel selected. Exiting..."
-		exit 1
-	fi
+  local useIPv4
+  local useIPv6
+  # Let use select IPv4 and/or IPv6
+  cmd=(whiptail --separate-output --checklist "Select Protocols (press space to select)" ${r} ${c} 2)
+  options=(IPv4 "Block ads over IPv4" on
+  IPv6 "Block ads over IPv6" on)
+  choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
+  if [[ $? = 0 ]];then
+    for choice in ${choices}
+    do
+      case ${choice} in
+      IPv4  )   useIPv4=true;;
+      IPv6  )   useIPv6=true;;
+      esac
+    done
+    if [[ ${useIPv4} ]]; then
+      find_IPv4_information
+      getStaticIPv4Settings
+      setStaticIPv4
+    fi
+    if [[ ${useIPv6} ]]; then
+      useIPv6dialog
+    fi
+      echo "::: IPv4 address: ${IPV4_ADDRESS}"
+      echo "::: IPv6 address: ${IPV6_ADDRESS}"
+    if [ ! ${useIPv4} ] && [ ! ${useIPv6} ]; then
+      echo "::: Cannot continue, neither IPv4 or IPv6 selected"
+      echo "::: Exiting"
+      exit 1
+    fi
+  else
+    echo "::: Cancel selected. Exiting..."
+    exit 1
+  fi
 }
 
 getStaticIPv4Settings() {
-	# Ask if the user wants to use DHCP settings as their static IP
-	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.
+  # Ask if the user wants to use DHCP settings as their static IP
+  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 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
-		# 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)
-			if [[ $? = 0 ]]; then
-			echo "::: 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)
-			if [[ $? = 0 ]]; then
-				echo "::: 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
-				else
-					# If the settings are wrong, the loop continues
-					ipSettingsCorrect=False
-				fi
-			else
-				# Cancelling gateway settings window
-				ipSettingsCorrect=False
-				echo "::: Cancel selected. Exiting..."
-				exit 1
-			fi
-		else
-			# Cancelling IPv4 settings window
-			ipSettingsCorrect=False
-			echo "::: Cancel selected. Exiting..."
-			exit 1
-		fi
-		done
-		# End the if statement for DHCP vs. static
-	fi
+    # 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)
+      if [[ $? = 0 ]]; then
+      echo "::: 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)
+      if [[ $? = 0 ]]; then
+        echo "::: 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
+        else
+          # If the settings are wrong, the loop continues
+          ipSettingsCorrect=False
+        fi
+      else
+        # Cancelling gateway settings window
+        ipSettingsCorrect=False
+        echo "::: Cancel selected. Exiting..."
+        exit 1
+      fi
+    else
+      # Cancelling IPv4 settings window
+      ipSettingsCorrect=False
+      echo "::: Cancel selected. Exiting..."
+      exit 1
+    fi
+    done
+    # End the if statement for DHCP vs. static
+  fi
 }
 
 setDHCPCD() {
-	# 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=${IPv4gw}" | tee -a /etc/dhcpcd.conf >/dev/null
+  # 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=${IPv4gw}" | tee -a /etc/dhcpcd.conf >/dev/null
 }
 
 setStaticIPv4() {
-	local IFCFG_FILE
-	local IPADDR
-	local CIDR
-	if [[ -f /etc/dhcpcd.conf ]]; then
-		# Debian Family
-		if grep -q "${IPV4_ADDRESS}" /etc/dhcpcd.conf; then
-			echo "::: Static IP already configured"
-		else
-			setDHCPCD
-			ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
-			echo ":::"
-			echo "::: Setting IP to ${IPV4_ADDRESS}.  You may need to restart after the install is complete."
-			echo ":::"
-		fi
-	elif [[ -f /etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE} ]];then
-		# Fedora Family
-		IFCFG_FILE=/etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE}
-		if grep -q "${IPV4_ADDRESS}" "${IFCFG_FILE}"; then
-			echo "::: Static IP already configured"
-		else
-			IPADDR=$(echo "${IPV4_ADDRESS}" | cut -f1 -d/)
-			CIDR=$(echo "${IPV4_ADDRESS}" | cut -f2 -d/)
-			# Backup existing interface configuration:
-			cp "${IFCFG_FILE}" "${IFCFG_FILE}".pihole.orig
-			# Build Interface configuration file:
-			{
-				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}"
-			ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
-			if [ -x "$(command -v nmcli)" ];then
-				# Tell NetworkManager to read our new sysconfig file
-				nmcli con load "${IFCFG_FILE}" > /dev/null
-			fi
-			echo ":::"
-			echo "::: Setting IP to ${IPV4_ADDRESS}.  You may need to restart after the install is complete."
-			echo ":::"
-		fi
-	else
-		echo "::: Warning: Unable to locate configuration file to set static IPv4 address!"
-		exit 1
-	fi
+  local IFCFG_FILE
+  local IPADDR
+  local CIDR
+  if [[ -f /etc/dhcpcd.conf ]]; then
+    # Debian Family
+    if grep -q "${IPV4_ADDRESS}" /etc/dhcpcd.conf; then
+      echo "::: Static IP already configured"
+    else
+      setDHCPCD
+      ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
+      echo ":::"
+      echo "::: Setting IP to ${IPV4_ADDRESS}.  You may need to restart after the install is complete."
+      echo ":::"
+    fi
+  elif [[ -f /etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE} ]];then
+    # Fedora Family
+    IFCFG_FILE=/etc/sysconfig/network-scripts/ifcfg-${PIHOLE_INTERFACE}
+    if grep -q "${IPV4_ADDRESS}" "${IFCFG_FILE}"; then
+      echo "::: Static IP already configured"
+    else
+      IPADDR=$(echo "${IPV4_ADDRESS}" | cut -f1 -d/)
+      CIDR=$(echo "${IPV4_ADDRESS}" | cut -f2 -d/)
+      # Backup existing interface configuration:
+      cp "${IFCFG_FILE}" "${IFCFG_FILE}".pihole.orig
+      # Build Interface configuration file:
+      {
+        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}"
+      ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}"
+      if [ -x "$(command -v nmcli)" ];then
+        # Tell NetworkManager to read our new sysconfig file
+        nmcli con load "${IFCFG_FILE}" > /dev/null
+      fi
+      echo ":::"
+      echo "::: Setting IP to ${IPV4_ADDRESS}.  You may need to restart after the install is complete."
+      echo ":::"
+    fi
+  else
+    echo "::: Warning: Unable to locate configuration file to set static IPv4 address!"
+    exit 1
+  fi
 }
 
 valid_ip() {
-	local ip=${1}
-	local stat=1
+  local ip=${1}
+  local stat=1
 
-	if [[ ${ip} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-		OIFS=$IFS
-		IFS='.'
-		ip=(${ip})
-		IFS=${OIFS}
-		[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
-		&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
-		stat=$?
-	fi
-	return ${stat}
+  if [[ ${ip} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+    OIFS=$IFS
+    IFS='.'
+    ip=(${ip})
+    IFS=${OIFS}
+    [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
+    && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
+    stat=$?
+  fi
+  return ${stat}
 }
 
 setDNS() {
-	DNSChooseCmd=(whiptail --separate-output --radiolist "Select Upstream DNS Provider. To use your own, select Custom." ${r} ${c} 6)
-	DNSChooseOptions=(Google "" on
-			OpenDNS "" off
-			Level3 "" off
-			Norton "" off
-			Comodo "" off
-			Custom "" off)
-	DNSchoices=$("${DNSChooseCmd[@]}" "${DNSChooseOptions[@]}" 2>&1 >/dev/tty)
-	if [[ $? = 0 ]];then
-		case ${DNSchoices} in
-			Google)
-				echo "::: Using Google DNS servers."
-				PIHOLE_DNS_1="8.8.8.8"
-				PIHOLE_DNS_2="8.8.4.4"
-				;;
-			OpenDNS)
-				echo "::: Using OpenDNS servers."
-				PIHOLE_DNS_1="208.67.222.222"
-				PIHOLE_DNS_2="208.67.220.220"
-				;;
-			Level3)
-				echo "::: Using Level3 servers."
-				PIHOLE_DNS_1="4.2.2.1"
-				PIHOLE_DNS_2="4.2.2.2"
-				;;
-			Norton)
-				echo "::: Using Norton ConnectSafe servers."
-				PIHOLE_DNS_1="199.85.126.10"
-				PIHOLE_DNS_2="199.85.127.10"
-				;;
-			Comodo)
-				echo "::: Using Comodo Secure servers."
-				PIHOLE_DNS_1="8.26.56.26"
-				PIHOLE_DNS_2="8.20.247.20"
-				;;
-			Custom)
-				until [[ ${DNSSettingsCorrect} = True ]]; do
-				strInvalid="Invalid"
-				if [ ! ${PIHOLE_DNS_1} ]; then
-					if [ ! ${PIHOLE_DNS_2} ]; then
-						prePopulate=""
-					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
+  DNSChooseCmd=(whiptail --separate-output --radiolist "Select Upstream DNS Provider. To use your own, select Custom." ${r} ${c} 6)
+  DNSChooseOptions=(Google "" on
+      OpenDNS "" off
+      Level3 "" off
+      Norton "" off
+      Comodo "" off
+      Custom "" off)
+  DNSchoices=$("${DNSChooseCmd[@]}" "${DNSChooseOptions[@]}" 2>&1 >/dev/tty)
+  if [[ $? = 0 ]];then
+    case ${DNSchoices} in
+      Google)
+        echo "::: Using Google DNS servers."
+        PIHOLE_DNS_1="8.8.8.8"
+        PIHOLE_DNS_2="8.8.4.4"
+        ;;
+      OpenDNS)
+        echo "::: Using OpenDNS servers."
+        PIHOLE_DNS_1="208.67.222.222"
+        PIHOLE_DNS_2="208.67.220.220"
+        ;;
+      Level3)
+        echo "::: Using Level3 servers."
+        PIHOLE_DNS_1="4.2.2.1"
+        PIHOLE_DNS_2="4.2.2.2"
+        ;;
+      Norton)
+        echo "::: Using Norton ConnectSafe servers."
+        PIHOLE_DNS_1="199.85.126.10"
+        PIHOLE_DNS_2="199.85.127.10"
+        ;;
+      Comodo)
+        echo "::: Using Comodo Secure servers."
+        PIHOLE_DNS_1="8.26.56.26"
+        PIHOLE_DNS_2="8.20.247.20"
+        ;;
+      Custom)
+        until [[ ${DNSSettingsCorrect} = True ]]; do
+        strInvalid="Invalid"
+        if [ ! ${PIHOLE_DNS_1} ]; then
+          if [ ! ${PIHOLE_DNS_2} ]; then
+            prePopulate=""
+          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
 
-				piholeDNS=$(whiptail --backtitle "Specify Upstream DNS Provider(s)"  --inputbox "Enter your desired upstream DNS provider(s), seperated by a comma.\n\nFor example '8.8.8.8, 8.8.4.4'" ${r} ${c} "${prePopulate}" 3>&1 1>&2 2>&3)
+        piholeDNS=$(whiptail --backtitle "Specify Upstream DNS Provider(s)"  --inputbox "Enter your desired upstream DNS provider(s), seperated by a comma.\n\nFor example '8.8.8.8, 8.8.4.4'" ${r} ${c} "${prePopulate}" 3>&1 1>&2 2>&3)
 
-				if [[ $? = 0 ]]; then
-					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 ! valid_ip "${PIHOLE_DNS_1}" || [ ! "${PIHOLE_DNS_1}" ]; then
-						PIHOLE_DNS_1=${strInvalid}
-					fi
-					if ! valid_ip "${PIHOLE_DNS_2}" && [ "${PIHOLE_DNS_2}" ]; then
-						PIHOLE_DNS_2=${strInvalid}
-					fi
-				else
-					echo "::: Cancel selected, exiting...."
-					exit 1
-				fi
-				if [[ ${PIHOLE_DNS_1} == "${strInvalid}" ]] || [[ ${PIHOLE_DNS_2} == "${strInvalid}" ]]; then
-					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}
-					if [[ ${PIHOLE_DNS_1} == "${strInvalid}" ]]; then
-						PIHOLE_DNS_1=""
-					fi
-					if [[ ${PIHOLE_DNS_2} == "${strInvalid}" ]]; then
-						PIHOLE_DNS_2=""
-					fi
-					DNSSettingsCorrect=False
-				else
-					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
-					DNSSettingsCorrect=True
-				else
-				# If the settings are wrong, the loop continues
-					DNSSettingsCorrect=False
-					fi
-				fi
-				done
-				;;
-		esac
-	else
-		echo "::: Cancel selected. Exiting..."
-		exit 1
-	fi
+        if [[ $? = 0 ]]; then
+          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 ! valid_ip "${PIHOLE_DNS_1}" || [ ! "${PIHOLE_DNS_1}" ]; then
+            PIHOLE_DNS_1=${strInvalid}
+          fi
+          if ! valid_ip "${PIHOLE_DNS_2}" && [ "${PIHOLE_DNS_2}" ]; then
+            PIHOLE_DNS_2=${strInvalid}
+          fi
+        else
+          echo "::: Cancel selected, exiting...."
+          exit 1
+        fi
+        if [[ ${PIHOLE_DNS_1} == "${strInvalid}" ]] || [[ ${PIHOLE_DNS_2} == "${strInvalid}" ]]; then
+          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}
+          if [[ ${PIHOLE_DNS_1} == "${strInvalid}" ]]; then
+            PIHOLE_DNS_1=""
+          fi
+          if [[ ${PIHOLE_DNS_2} == "${strInvalid}" ]]; then
+            PIHOLE_DNS_2=""
+          fi
+          DNSSettingsCorrect=False
+        else
+          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
+          DNSSettingsCorrect=True
+        else
+        # If the settings are wrong, the loop continues
+          DNSSettingsCorrect=False
+          fi
+        fi
+        done
+        ;;
+    esac
+  else
+    echo "::: Cancel selected. Exiting..."
+    exit 1
+  fi
 }
 
 setLogging() {
@@ -552,69 +547,69 @@ setLogging() {
   local LogChooseOptions
   local LogChoices
 
-	LogToggleCommand=(whiptail --separate-output --radiolist "Do you want to log queries?\n (Disabling will render graphs on the Admin page useless):" ${r} ${c} 6)
-	LogChooseOptions=("On (Reccomended)" "" on
-			Off "" off)
-	LogChoices=$("${LogToggleCommand[@]}" "${LogChooseOptions[@]}" 2>&1 >/dev/tty) || (echo "::: Cancel selected. Exiting..." && exit 1)
-		case ${LogChoices} in
-			"On (Recommended)")
-				echo "::: Logging On."
-				QUERY_LOGGING=true
-				;;
-			Off)
-				echo "::: Logging Off."
-				QUERY_LOGGING=false
-				;;
-		esac
+  LogToggleCommand=(whiptail --separate-output --radiolist "Do you want to log queries?\n (Disabling will render graphs on the Admin page useless):" ${r} ${c} 6)
+  LogChooseOptions=("On (Reccomended)" "" on
+      Off "" off)
+  LogChoices=$("${LogToggleCommand[@]}" "${LogChooseOptions[@]}" 2>&1 >/dev/tty) || (echo "::: Cancel selected. Exiting..." && exit 1)
+    case ${LogChoices} in
+      "On (Recommended)")
+        echo "::: Logging On."
+        QUERY_LOGGING=true
+        ;;
+      Off)
+        echo "::: Logging Off."
+        QUERY_LOGGING=false
+        ;;
+    esac
 }
 
 
 version_check_dnsmasq() {
-	# Check if /etc/dnsmasq.conf is from pihole.  If so replace with an original and install new in .d directory
-	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="/etc/.pihole/advanced/dnsmasq.conf.original"
-	local dnsmasq_pihole_01_snippet="/etc/.pihole/advanced/01-pihole.conf"
-	local dnsmasq_pihole_01_location="/etc/dnsmasq.d/01-pihole.conf"
+  # Check if /etc/dnsmasq.conf is from pihole.  If so replace with an original and install new in .d directory
+  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="/etc/.pihole/advanced/dnsmasq.conf.original"
+  local dnsmasq_pihole_01_snippet="/etc/.pihole/advanced/01-pihole.conf"
+  local dnsmasq_pihole_01_location="/etc/dnsmasq.d/01-pihole.conf"
 
-	if [ -f ${dnsmasq_conf} ]; then
-		echo -n ":::    Existing dnsmasq.conf found..."
-		if grep -q ${dnsmasq_pihole_id_string} ${dnsmasq_conf}; then
-			echo " it is from a previous pi-hole install."
-			echo -n ":::    Backing up dnsmasq.conf to dnsmasq.conf.orig..."
-			mv -f ${dnsmasq_conf} ${dnsmasq_conf_orig}
-			echo " done."
-			echo -n ":::    Restoring default dnsmasq.conf..."
-			cp ${dnsmasq_original_config} ${dnsmasq_conf}
-			echo " done."
-		else
-			echo " it is not a pi-hole file, leaving alone!"
-		fi
-	else
-		echo -n ":::    No dnsmasq.conf found.. restoring default dnsmasq.conf..."
-		cp ${dnsmasq_original_config} ${dnsmasq_conf}
-		echo " done."
-	fi
+  if [ -f ${dnsmasq_conf} ]; then
+    echo -n ":::    Existing dnsmasq.conf found..."
+    if grep -q ${dnsmasq_pihole_id_string} ${dnsmasq_conf}; then
+      echo " it is from a previous pi-hole install."
+      echo -n ":::    Backing up dnsmasq.conf to dnsmasq.conf.orig..."
+      mv -f ${dnsmasq_conf} ${dnsmasq_conf_orig}
+      echo " done."
+      echo -n ":::    Restoring default dnsmasq.conf..."
+      cp ${dnsmasq_original_config} ${dnsmasq_conf}
+      echo " done."
+    else
+      echo " it is not a pi-hole file, leaving alone!"
+    fi
+  else
+    echo -n ":::    No dnsmasq.conf found.. restoring default dnsmasq.conf..."
+    cp ${dnsmasq_original_config} ${dnsmasq_conf}
+    echo " done."
+  fi
 
-	echo -n ":::    Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf..."
-	cp ${dnsmasq_pihole_01_snippet} ${dnsmasq_pihole_01_location}
-	echo " done."
-	sed -i "s/@INT@/$PIHOLE_INTERFACE/" ${dnsmasq_pihole_01_location}
-	if [[ "${PIHOLE_DNS_1}" != "" ]]; then
-		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
-		sed -i "s/@DNS2@/$PIHOLE_DNS_2/" ${dnsmasq_pihole_01_location}
-	else
-		sed -i '/^server=@DNS2@/d' ${dnsmasq_pihole_01_location}
-	fi
+  echo -n ":::    Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf..."
+  cp ${dnsmasq_pihole_01_snippet} ${dnsmasq_pihole_01_location}
+  echo " done."
+  sed -i "s/@INT@/$PIHOLE_INTERFACE/" ${dnsmasq_pihole_01_location}
+  if [[ "${PIHOLE_DNS_1}" != "" ]]; then
+    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
+    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 [[ "${QUERY_LOGGING}" == false ]] ; then
+  if [[ "${QUERY_LOGGING}" == false ]] ; then
         #Disable Logging
         sed -i 's/^log-queries/#log-queries/' ${dnsmasq_pihole_01_location}
     else
@@ -623,47 +618,37 @@ version_check_dnsmasq() {
     fi
 }
 
-remove_legacy_scripts() {
-	#Tidy up /usr/local/bin directory if installing over previous install.
-	oldFiles=( gravity chronometer whitelist blacklist piholeLogFlush updateDashboard uninstall setupLCD piholeDebug)
-	for i in "${oldFiles[@]}"; do
-		if [ -f "/usr/local/bin/$i.sh" ]; then
-			rm /usr/local/bin/"$i".sh
-		fi
-	done
-}
-
 clean_existing() {
   # Clean an exiting installation to prepare for upgrade/reinstall
   # ${1} Directory to clean; ${2} Array of files to remove
   local clean_directory="${1}"
   local old_files=${2}
 
-	for script in "${old_files[@]}"; do
-		rm -f "${clean_directory}${script}.sh"
-	done
-
+  for script in "${old_files[@]}"; do
+    rm -f "${clean_directory}${script}.sh"
+  done
 }
 
 installScripts() {
   # Install the scripts from repository to their various locations
   readonly install_dir="/opt/pihole/"
 
-	echo ":::"
-	echo -n "::: Installing scripts from ${PI_HOLE_LOCAL_REPO}..."
+  echo ":::"
+  echo -n "::: Installing scripts from ${PI_HOLE_LOCAL_REPO}..."
 
-	# Clear out script files from Pi-hole scripts directory.
-	clean_existing "${install_dir}" "${PI_HOLE_FILES}"
+  # Clear out script files from Pi-hole scripts directory.
+  clean_existing "${install_dir}" "${PI_HOLE_FILES}"
 
   # Install files from local core repository
   if is_repo "${PI_HOLE_LOCAL_REPO}"; then
     cd "${PI_HOLE_LOCAL_REPO}"
+    install -o "${USER}" -Dm755 -d /opt/pihole
     install -o "${USER}" -Dm755 -t /opt/pihole/ gravity.sh
     install -o "${USER}" -Dm755 -t /opt/pihole/ ./advanced/Scripts/*.sh
     install -o "${USER}" -Dm755 -t /opt/pihole/ ./automated\ install/uninstall.sh
     install -o "${USER}" -Dm755 -t /usr/local/bin/ pihole
     install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
-	  echo " done."
+    echo " done."
   else
     echo " *** ERROR: Local repo ${core_repo} not found, exiting."
     exit 1
@@ -671,259 +656,276 @@ installScripts() {
 }
 
 installConfigs() {
-	# Install the configs from /etc/.pihole to their various locations
-	echo ":::"
-	echo "::: Installing configs..."
-	version_check_dnsmasq
-	if [ ! -d "/etc/lighttpd" ]; then
-		mkdir /etc/lighttpd
-		chown "${USER}":root /etc/lighttpd
-	elif [ -f "/etc/lighttpd/lighttpd.conf" ]; then
-		mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-	fi
-	cp /etc/.pihole/advanced/${LIGHTTPD_CFG} /etc/lighttpd/lighttpd.conf
-	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
+  # Install the configs from /etc/.pihole to their various locations
+  echo ":::"
+  echo "::: Installing configs..."
+  version_check_dnsmasq
+  if [ ! -d "/etc/lighttpd" ]; then
+    mkdir /etc/lighttpd
+    chown "${USER}":root /etc/lighttpd
+  elif [ -f "/etc/lighttpd/lighttpd.conf" ]; then
+    mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+  fi
+  cp /etc/.pihole/advanced/${LIGHTTPD_CFG} /etc/lighttpd/lighttpd.conf
+  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
 }
 
 stop_service() {
-	# Stop service passed in as argument.
-	# Can softfail, as process may not be installed when this is called
-	echo ":::"
-	echo -n "::: Stopping ${1} service..."
-	if [ -x "$(command -v systemctl)" ]; then
-		systemctl stop "${1}" &> /dev/null & spinner $! || true
-	else
-		service "${1}" stop &> /dev/null & spinner $! || true
-	fi
-	echo " done."
+  # Stop service passed in as argument.
+  # Can softfail, as process may not be installed when this is called
+  echo ":::"
+  echo -n "::: Stopping ${1} service..."
+  if [ -x "$(command -v systemctl)" ]; then
+    systemctl stop "${1}" &> /dev/null || true
+  else
+    service "${1}" stop &> /dev/null || true
+  fi
+  echo " done."
 }
 
 start_service() {
-	# Start/Restart service passed in as argument
-	# This should not fail, it's an error if it does
-	echo ":::"
-	echo -n "::: Starting ${1} service..."
-	if [ -x "$(command -v systemctl)" ]; then
-		systemctl restart "${1}" &> /dev/null & spinner $!
-	else
-		service "${1}" restart &> /dev/null  & spinner $!
-	fi
-	echo " done."
+  # Start/Restart service passed in as argument
+  # This should not fail, it's an error if it does
+  echo ":::"
+  echo -n "::: Starting ${1} service..."
+  if [ -x "$(command -v systemctl)" ]; then
+    systemctl restart "${1}" &> /dev/null
+  else
+    service "${1}" restart &> /dev/null
+  fi
+  echo " done."
 }
 
 enable_service() {
-	# Enable service so that it will start with next reboot
-	echo ":::"
-	echo -n "::: Enabling ${1} service to start on reboot..."
-	if [ -x "$(command -v systemctl)" ]; then
-		systemctl enable "${1}" &> /dev/null & spinner $!
-	else
-		update-rc.d "${1}" defaults &> /dev/null  & spinner $!
-	fi
-	echo " done."
+  # Enable service so that it will start with next reboot
+  echo ":::"
+  echo -n "::: Enabling ${1} service to start on reboot..."
+  if [ -x "$(command -v systemctl)" ]; then
+    systemctl enable "${1}" &> /dev/null
+  else
+    update-rc.d "${1}" defaults &> /dev/null
+  fi
+  echo " done."
 }
 
 update_pacakge_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)
 
-	#Check to see if apt-get update has already been run today
-	#it needs to have been run at least once on new installs!
-	timestamp=$(stat -c %Y ${PKG_CACHE})
-	timestampAsDate=$(date -d @"${timestamp}" "+%b %e")
-	today=$(date "+%b %e")
+  #Update package cache on apt based OSes. Do this every time since
+  #it's quick and packages can be updated at any time.
 
-	if [ ! "${today}" == "${timestampAsDate}" ]; then
-		#update package lists
-		echo ":::"
-		echo -n "::: ${PKG_MANAGER} update has not been run today. Running now..."
-		${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
-		echo " done!"
-	fi
+  echo ":::"
+  echo -n "::: Updating local cache of available packages..."
+  ${UPDATE_PKG_CACHE} &> /dev/null
+  echo " done!"
 }
 
 notify_package_updates_available() {
   # Let user know if they have outdated packages on their system and
   # advise them to run a package update at soonest possible.
-	echo ":::"
-	echo -n "::: Checking ${PKG_MANAGER} for upgraded packages...."
-	updatesToInstall=$(eval "${PKG_COUNT}")
-	echo " done!"
-	echo ":::"
-	if [[ ${updatesToInstall} -eq "0" ]]; then
-		echo "::: Your system is up to date! Continuing with Pi-hole installation..."
-	else
-		echo "::: There are ${updatesToInstall} updates available for your system!"
-		echo "::: We recommend you run '${PKG_UPDATE}' after installing Pi-Hole! "
-		echo ":::"
-	fi
+  echo ":::"
+  echo -n "::: Checking ${PKG_MANAGER} for upgraded packages...."
+  updatesToInstall=$(eval "${PKG_COUNT}")
+  echo " done!"
+  echo ":::"
+  if [[ ${updatesToInstall} -eq "0" ]]; then
+    echo "::: Your system is up to date! Continuing with Pi-hole installation..."
+  else
+    echo "::: There are ${updatesToInstall} updates available for your system!"
+    echo "::: We recommend you update your OS after installing Pi-Hole! "
+    echo ":::"
+  fi
 }
 
 install_dependent_packages() {
-	# Install packages passed in via argument array
-	# No spinner - conflicts with set -e
-	declare -a argArray1=("${!1}")
+  # Install packages passed in via argument array
+  # No spinner - conflicts with set -e
+  declare -a argArray1=("${!1}")
 
-	for i in "${argArray1[@]}"; do
-		echo -n ":::    Checking for $i..."
-		package_check_install "${i}" &> /dev/null
-		echo " installed!"
-	done
+  if command -v debconf-apt-progress &> /dev/null; then
+    debconf-apt-progress -- ${PKG_INSTALL} "${argArray1[@]}"
+  else
+    for i in "${argArray1[@]}"; do
+      echo -n ":::    Checking for $i..."
+      package_check_install "${i}" &> /dev/null
+      echo " installed!"
+    done
+  fi
 }
 
 CreateLogFile() {
-	# Create logfiles if necessary
-	echo ":::"
-	echo -n "::: Creating log file and changing owner to dnsmasq..."
-	if [ ! -f /var/log/pihole.log ]; then
-		touch /var/log/pihole.log
-		chmod 644 /var/log/pihole.log
-		chown "${DNSMASQ_USER}":root /var/log/pihole.log
-		echo " done!"
-	else
-		echo " already exists!"
-	fi
+  # Create logfiles if necessary
+  echo ":::"
+  echo -n "::: Creating log file and changing owner to dnsmasq..."
+  if [ ! -f /var/log/pihole.log ]; then
+    touch /var/log/pihole.log
+    chmod 644 /var/log/pihole.log
+    chown "${DNSMASQ_USER}":root /var/log/pihole.log
+    echo " done!"
+  else
+    echo " already exists!"
+  fi
 }
 
 installPiholeWeb() {
-	# Install the web interface
-	echo ":::"
-	echo "::: Installing pihole custom index page..."
-	if [ -d "/var/www/html/pihole" ]; then
-	  if [ -f "/var/www/html/pihole/index.html" ]; then
-	    echo ":::     Existing index.html detected, not overwriting"
-	  else
-	    echo -n ":::     index.html missing, replacing... "
-	    cp /etc/.pihole/advanced/index.html /var/www/html/pihole/
-	    echo " done!"
-	  fi
+  # Install the web interface
+  echo ":::"
+  echo "::: Installing pihole custom index page..."
+  if [ -d "/var/www/html/pihole" ]; then
+    if [ -f "/var/www/html/pihole/index.php" ]; then
+      echo ":::     Existing index.php detected, not overwriting"
+    else
+      echo -n ":::     index.php missing, replacing... "
+      cp /etc/.pihole/advanced/index.php /var/www/html/pihole/
+      echo " done!"
+    fi
 
-	  if [ -f "/var/www/html/pihole/index.js" ]; then
-	    echo ":::     Existing index.js detected, not overwriting"
-	  else
-	    echo -n ":::     index.js missing, replacing... "
-	    cp /etc/.pihole/advanced/index.js /var/www/html/pihole/
-	    echo " done!"
-	  fi
+    if [ -f "/var/www/html/pihole/index.js" ]; then
+      echo ":::     Existing index.js detected, not overwriting"
+    else
+      echo -n ":::     index.js missing, replacing... "
+      cp /etc/.pihole/advanced/index.js /var/www/html/pihole/
+      echo " done!"
+    fi
 
-	else
-		mkdir /var/www/html/pihole
-		if [ -f /var/www/html/index.lighttpd.html ]; then
-			mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
-		else
-			printf "\n:::\tNo default index.lighttpd.html file found... not backing up"
-		fi
-		cp /etc/.pihole/advanced/index.* /var/www/html/pihole/.
-		echo " done!"
-	fi
-	# Install Sudoer file
-	echo ":::"
-	echo -n "::: Installing sudoer file..."
-	mkdir -p /etc/sudoers.d/
-	cp /etc/.pihole/advanced/pihole.sudo /etc/sudoers.d/pihole
-	chmod 0440 /etc/sudoers.d/pihole
-	echo " done!"
+    if [ -f "/var/www/html/admin/blockingpage.css" ]; then
+      echo ":::     Existing blockingpage.css detected, not overwriting"
+    else
+      echo -n ":::     index.css missing, replacing... "
+      cp /etc/.pihole/advanced/blockingpage.css /var/www/html/admin
+      echo " done!"
+    fi
+
+  else
+    mkdir /var/www/html/pihole
+    if [ -f /var/www/html/index.lighttpd.html ]; then
+      mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
+    else
+      printf "\n:::\tNo default index.lighttpd.html file found... not backing up"
+    fi
+    cp /etc/.pihole/advanced/index.* /var/www/html/pihole/.
+    echo " done!"
+  fi
+  # Install Sudoer file
+  echo ":::"
+  echo -n "::: Installing sudoer file..."
+  mkdir -p /etc/sudoers.d/
+  cp /etc/.pihole/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 [[ "$LIGHTTPD_USER" == "lighttpd" ]]; then
+    # Allow executing pihole via sudo with Fedora
+    # Usually /usr/local/bin is not permitted as directory for sudoable programms
+    echo "Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin" >> /etc/sudoers.d/pihole
+  fi
+
+  chmod 0440 /etc/sudoers.d/pihole
+  echo " done!"
 }
 
 installCron() {
-	# Install the cron job
-	echo ":::"
-	echo -n "::: Installing latest Cron script..."
-	cp /etc/.pihole/advanced/pihole.cron /etc/cron.d/pihole
-	echo " done!"
+  # Install the cron job
+  echo ":::"
+  echo -n "::: Installing latest Cron script..."
+  cp /etc/.pihole/advanced/pihole.cron /etc/cron.d/pihole
+  echo " done!"
 }
 
 runGravity() {
-	# Run gravity.sh to build blacklists
-	echo ":::"
-	echo "::: Preparing to run gravity.sh to refresh hosts..."
-	if ls /etc/pihole/list* 1> /dev/null 2>&1; then
-		echo "::: Cleaning up previous install (preserving whitelist/blacklist)"
-		rm /etc/pihole/list.*
-	fi
-	echo "::: Running gravity.sh"
-	/opt/pihole/gravity.sh
+  # Run gravity.sh to build blacklists
+  echo ":::"
+  echo "::: Preparing to run gravity.sh to refresh hosts..."
+  if ls /etc/pihole/list* 1> /dev/null 2>&1; then
+    echo "::: Cleaning up previous install (preserving whitelist/blacklist)"
+    rm /etc/pihole/list.*
+  fi
+  # Test if /etc/pihole/adlists.default exists
+  if [[ ! -e /etc/pihole/adlists.default ]]; then
+    cp /etc/.pihole/adlists.default /etc/pihole/adlists.default
+  fi
+  echo "::: Running gravity.sh"
+  { /opt/pihole/gravity.sh; }
 }
 
 create_pihole_user() {
-	# Check if user pihole exists and create if not
-	echo "::: Checking if user 'pihole' exists..."
-	id -u pihole &> /dev/null && echo "::: User 'pihole' already exists" || (echo "::: User 'pihole' doesn't exist. Creating..." && useradd -r -s /usr/sbin/nologin pihole)
+  # Check if user pihole exists and create if not
+  echo "::: Checking if user 'pihole' exists..."
+  id -u pihole &> /dev/null && echo "::: User 'pihole' already exists" || (echo "::: User 'pihole' doesn't exist. Creating..." && useradd -r -s /usr/sbin/nologin pihole)
 }
 
 configureFirewall() {
-	# Allow HTTP and DNS traffic
-	if [ -x "$(command -v firewall-cmd)" ]; then
-		firewall-cmd --state &> /dev/null && ( echo "::: Configuring firewalld for httpd and dnsmasq.." && firewall-cmd --permanent --add-port=80/tcp && firewall-cmd --permanent --add-port=53/tcp \
-		&& firewall-cmd --permanent --add-port=53/udp && firewall-cmd --reload) || echo "::: FirewallD not enabled"
-	elif [ -x "$(command -v iptables)" ]; then
-		echo "::: Configuring iptables for httpd and dnsmasq.."
-		iptables -A INPUT -p tcp -m tcp --dport 80 -j ACCEPT
-		iptables -A INPUT -p tcp -m tcp --dport 53 -j ACCEPT
-		iptables -A INPUT -p udp -m udp --dport 53 -j ACCEPT
-	else
-		echo "::: No firewall detected.. skipping firewall configuration."
-	fi
+  # Allow HTTP and DNS traffic
+  if [ -x "$(command -v firewall-cmd)" ]; then
+    firewall-cmd --state &> /dev/null && ( echo "::: Configuring firewalld for httpd and dnsmasq.." && firewall-cmd --permanent --add-port=80/tcp && firewall-cmd --permanent --add-port=53/tcp \
+    && firewall-cmd --permanent --add-port=53/udp && firewall-cmd --reload) || echo "::: FirewallD not enabled"
+  elif [ -x "$(command -v iptables)" ]; then
+    echo "::: Configuring iptables for httpd and dnsmasq.."
+    iptables -A INPUT -p tcp -m tcp --dport 80 -j ACCEPT
+    iptables -A INPUT -p tcp -m tcp --dport 53 -j ACCEPT
+    iptables -A INPUT -p udp -m udp --dport 53 -j ACCEPT
+  else
+    echo "::: No firewall detected.. skipping firewall configuration."
+  fi
 }
 
 finalExports() {
-	# Update variables in setupVars.conf file
-	if [ -e "${setupVars}" ]; then
-		sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}"
-	fi
+  # Update variables in setupVars.conf file
+  if [ -e "${setupVars}" ]; then
+    sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}"
+  fi
     {
-	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 "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}"
     }>> "${setupVars}"
 }
 
 installPihole() {
-	# Install base files and web interface
-	create_pihole_user
-	if [ ! -d "/var/www/html" ]; then
-		mkdir -p /var/www/html
-	fi
-	chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/www/html
-	chmod 775 /var/www/html
-	usermod -a -G ${LIGHTTPD_GROUP} pihole
-	if [ -x "$(command -v lighty-enable-mod)" ]; then
-		lighty-enable-mod fastcgi fastcgi-php > /dev/null || true
-	else
-		printf "\n:::\tWarning: 'lighty-enable-mod' utility not found. Please ensure fastcgi is enabled if you experience issues.\n"
-	fi
-	installScripts
-	installConfigs
-	CreateLogFile
-	configureSelinux
-	installPiholeWeb
-	installCron
-	configureFirewall
-	finalExports
-	runGravity
+  # Install base files and web interface
+  create_pihole_user
+  if [ ! -d "/var/www/html" ]; then
+    mkdir -p /var/www/html
+  fi
+  chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/www/html
+  chmod 775 /var/www/html
+  usermod -a -G ${LIGHTTPD_GROUP} pihole
+  if [ -x "$(command -v lighty-enable-mod)" ]; then
+    lighty-enable-mod fastcgi fastcgi-php > /dev/null || true
+  else
+    printf "\n:::\tWarning: 'lighty-enable-mod' utility not found. Please ensure fastcgi is enabled if you experience issues.\n"
+  fi
+  installScripts
+  installConfigs
+  CreateLogFile
+  installPiholeWeb
+  installCron
+  configureFirewall
+  finalExports
+  runGravity
 }
 
 accountForRefactor() {
-    # At some point in the future this list can be pruned, for now we'll need it to ensure updates don't break.
+  # 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.
-	sed -i 's/IPv4addr/IPv4_address/g' ${setupVars}
-	sed -i 's/piholeIPv6/IPv6_address/g' ${setupVars}
+  # Refactoring of install script has changed the name of a couple of variables. Sort them out here.
 
-	# Account for renaming of global variables.
-	sed -i 's/piholeInterface/PIHOLE_INTERFACE/g' ${setupVars}
-	sed -i 's/IPv4_address/IPV4_ADDRESS/g' ${setupVars}
-	sed -i 's/IPv6_address/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/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}
 
 }
 
@@ -935,7 +937,6 @@ updatePihole() {
   installScripts
   installConfigs
   CreateLogFile
-  configureSelinux
   installPiholeWeb
   installCron
   configureFirewall
@@ -943,30 +944,32 @@ updatePihole() {
   runGravity
 }
 
-configureSelinux() {
-	if [ -x "$(command -v getenforce)" ]; then
-		printf "\n::: SELinux Detected\n"
-		printf ":::\tChecking for SELinux policy development packages..."
-		package_check_install "selinux-policy-devel" > /dev/null
-		echo " installed!"
-		printf ":::\tEnabling httpd server side includes (SSI).. "
-		setsebool -P httpd_ssi_exec on &> /dev/null && echo "Success" || echo "SELinux not enabled"
-		printf "\n:::\tCompiling Pi-Hole SELinux policy..\n"
-		if ! [ -x "$(command -v systemctl)" ]; then
-			sed -i.bak '/systemd/d' /etc/.pihole/advanced/selinux/pihole.te
-		fi
-		checkmodule -M -m -o /etc/pihole/pihole.mod /etc/.pihole/advanced/selinux/pihole.te
-		semodule_package -o /etc/pihole/pihole.pp -m /etc/pihole/pihole.mod
-		semodule -i /etc/pihole/pihole.pp
-		rm -f /etc/pihole/pihole.mod
-		semodule -l | grep pihole &> /dev/null && echo "::: Installed Pi-Hole SELinux policy" || echo "::: Warning: Pi-Hole SELinux policy did not install."
-	fi
+
+
+checkSelinux() {
+  if [ -x "$(command -v getenforce)" ]; then
+    echo ":::"
+    echo -n "::: SELinux Support Detected... Mode: "
+    enforceMode=$(getenforce)
+    echo "${enforceMode}"
+    if [[ "${enforceMode}" == "Enforcing" ]]; then
+      if (whiptail --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: Admin UI Will not function fully without setting your policies correctly\n\nContinue installing Pi-hole?" ${r} ${c}); then
+          echo ":::"
+          echo "::: Continuing installation with SELinux Enforcing."
+          echo "::: Please refer to official SELinux documentation to create a custom policy."
+      else
+          echo ":::"
+          echo "::: Not continuing install after SELinux Enforcing detected."
+          exit 1
+      fi
+    fi
+  fi
 }
 
 displayFinalMessage() {
-	if (( ${#1} > 0 )) ; then
-	# 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:
+  if (( ${#1} > 0 )) ; then
+  # 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}
@@ -976,8 +979,8 @@ If you set a new IP address, you should restart the Pi.
 The install log is in /etc/pihole.
 View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin
 The currently set password is ${1}" ${r} ${c}
-	else
-	whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
+  else
+  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}
@@ -986,170 +989,171 @@ If you set a new IP address, you should restart the Pi.
 
 The install log is in /etc/pihole.
 View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin" ${r} ${c}
-	fi
+  fi
 }
 
 update_dialogs() {
-	# reconfigure
-	if [ "${reconfigure}" = true ]; then
-		opt1a="Repair"
-		opt1b="This will retain existing settings"
-		strAdd="You will remain on the same version"
-	else
-		opt1a="Update"
-		opt1b="This will retain existing settings."
-		strAdd="You will be updated to the latest version."
-	fi
-	opt2a="Reconfigure"
-	opt2b="This will allow you to enter new settings"
+  # reconfigure
+  if [ "${reconfigure}" = true ]; then
+    opt1a="Repair"
+    opt1b="This will retain existing settings"
+    strAdd="You will remain on the same version"
+  else
+    opt1a="Update"
+    opt1b="This will retain existing settings."
+    strAdd="You will be updated to the latest version."
+  fi
+  opt2a="Reconfigure"
+  opt2b="This will allow you to enter new settings"
 
-	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)
-
-	if [[ $? = 0 ]];then
-		case ${UpdateCmd} in
-			${opt1a})
-				echo "::: ${opt1a} option selected."
-				useUpdateVars=true
-				;;
-			${opt2a})
-				echo "::: ${opt2a} option selected"
-				useUpdateVars=false
-				;;
-		esac
-	else
-		echo "::: Cancel selected. Exiting..."
-		exit 1
-	fi
+  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)
 
+  if [[ $? = 0 ]];then
+    case ${UpdateCmd} in
+      ${opt1a})
+        echo "::: ${opt1a} option selected."
+        useUpdateVars=true
+        ;;
+      ${opt2a})
+        echo "::: ${opt2a} option selected"
+        useUpdateVars=false
+        ;;
+    esac
+  else
+    echo "::: Cancel selected. Exiting..."
+    exit 1
+  fi
 }
 
 main() {
-# Check arguments for the undocumented flags
-	for var in "$@"; do
-		case "$var" in
-			"--reconfigure"  ) reconfigure=true;;
-			"--i_do_not_follow_recommendations"   ) skipSpaceCheck=false;;
-			"--unattended"     ) runUnattended=true;;
-		esac
-	done
 
-	if [[ -f ${setupVars} ]]; then
-		if [[ "${runUnattended}" == true ]]; then
-			echo "::: --unattended passed to install script, no whiptail dialogs will be displayed"
-			useUpdateVars=true
-		else
-			update_dialogs
-		fi
-	fi
+  # Check arguments for the undocumented flags
+  for var in "$@"; do
+    case "$var" in
+      "--reconfigure"  ) reconfigure=true;;
+      "--i_do_not_follow_recommendations"   ) skipSpaceCheck=false;;
+      "--unattended"     ) runUnattended=true;;
+    esac
+  done
 
-	# Start the installer
-	# Verify there is enough disk space for the install
-	if [[ "${skipSpaceCheck}" == true ]]; then
-		echo "::: --i_do_not_follow_recommendations passed to script, skipping free disk space verification!"
-	else
-		verifyFreeDiskSpace
-	fi
+  if [[ -f ${setupVars} ]]; then
+    if [[ "${runUnattended}" == true ]]; then
+      echo "::: --unattended passed to install script, no whiptail dialogs will be displayed"
+      useUpdateVars=true
+    else
+      update_dialogs
+    fi
+  fi
 
-	# Update package cache
-	update_pacakge_cache
+  # Start the installer
+  # Verify there is enough disk space for the install
+  if [[ "${skipSpaceCheck}" == true ]]; then
+    echo "::: --i_do_not_follow_recommendations passed to script, skipping free disk space verification!"
+  else
+    verifyFreeDiskSpace
+  fi
 
-	# Notify user of package availability
-	notify_package_updates_available
+  # Update package cache
+  update_pacakge_cache
 
-	# Install packages used by this installation script
-	install_dependent_packages INSTALLER_DEPS[@]
+  # Notify user of package availability
+  notify_package_updates_available
 
-	if [[ "${reconfigure}" == true ]]; then
-		echo "::: --reconfigure passed to install script. Not downloading/updating local repos"
-	else
-		# Get Git files for Core and Admin
-		getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl}
-		getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
-	fi
+  # Install packages used by this installation script
+  install_dependent_packages INSTALLER_DEPS[@]
 
-	if [[ ${useUpdateVars} == false ]]; then
-		# Display welcome dialogs
-		welcomeDialogs
-		# Create directory for Pi-hole storage
-		mkdir -p /etc/pihole/
-		# Remove legacy scripts from previous storage location
-		remove_legacy_scripts
-		# Stop resolver and webserver while installing proceses
-		stop_service dnsmasq
-		stop_service lighttpd
-		# Determine available interfaces
-		get_available_interfaces
-		# Find interfaces and let the user choose one
-		chooseInterface
-		# Let the user decide if they want to block ads over IPv4 and/or IPv6
-		use4andor6
-		# Decide what upstream DNS Servers to use
-		setDNS
-		# Let the user decide if they want query logging enabled...
-		setLogging
+   # Check if SELinux is Enforcing
+  checkSelinux
 
-		# Install packages used by the Pi-hole
-	  install_dependent_packages PIHOLE_DEPS[@]
+  if [[ "${reconfigure}" == true ]]; then
+    echo "::: --reconfigure passed to install script. Not downloading/updating local repos"
+  else
+    # Get Git files for Core and Admin
+    getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl}
+    getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
+  fi
 
-		# Install and log everything to a file
+  if [[ ${useUpdateVars} == false ]]; then
+    # Display welcome dialogs
+    welcomeDialogs
+    # Create directory for Pi-hole storage
+    mkdir -p /etc/pihole/
+    # Stop resolver and webserver while installing proceses
+    stop_service dnsmasq
+    stop_service lighttpd
+    # Determine available interfaces
+    get_available_interfaces
+    # Find interfaces and let the user choose one
+    chooseInterface
+    # Decide what upstream DNS Servers to use
+    setDNS
+    # Let the user decide if they want to block ads over IPv4 and/or IPv6
+    use4andor6
+    # Let the user decide if they want query logging enabled...
+    setLogging
+
+    # Install packages used by the Pi-hole
+    install_dependent_packages PIHOLE_DEPS[@]
+
+    # Install and log everything to a file
     installPihole | tee ${tmpLog}
-	else
-	  # update packages used by the Pi-hole
-	  install_dependent_packages PIHOLE_DEPS[@]
+  else
+    # update packages used by the Pi-hole
+    install_dependent_packages PIHOLE_DEPS[@]
 
-		updatePihole | tee ${tmpLog}
-	fi
+    updatePihole | tee ${tmpLog}
+  fi
 
-	# Move the log file into /etc/pihole for storage
-	mv ${tmpLog} ${instalLogLoc}
+  # Move the log file into /etc/pihole for storage
+  mv ${tmpLog} ${instalLogLoc}
 
-	# Add password to web UI if there is none
-	pw=""
-	if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
-	    pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
-	    pihole -a -p ${pw}
-	fi
+  # Add password to web UI if there is none
+  pw=""
+  if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
+      pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
+      pihole -a -p ${pw}
+  fi
 
-	if [[ "${useUpdateVars}" == false ]]; then
-	    displayFinalMessage ${pw}
-	fi
+  if [[ "${useUpdateVars}" == false ]]; then
+      displayFinalMessage ${pw}
+  fi
 
-	echo "::: Restarting services..."
-	# Start services
-	start_service dnsmasq
-	enable_service dnsmasq
-	start_service lighttpd
-	enable_service lighttpd
-	echo "::: done."
+  echo "::: Restarting services..."
+  # Start services
+  start_service dnsmasq
+  enable_service dnsmasq
+  start_service lighttpd
+  enable_service lighttpd
+  echo "::: done."
 
-	echo ":::"
-	if [[ "${useUpdateVars}" == false ]]; then
-		echo "::: Installation Complete! Configure your devices to use the Pi-hole as their DNS server using:"
-		echo ":::     ${IPV4_ADDRESS%/*}"
-		echo ":::     ${IPV6_ADDRESS}"
-		echo ":::"
-		echo "::: If you set a new IP address, you should restart the Pi."
+  echo ":::"
+  if [[ "${useUpdateVars}" == false ]]; then
+    echo "::: Installation Complete! Configure your devices to use the Pi-hole as their DNS server using:"
+    echo ":::     ${IPV4_ADDRESS%/*}"
+    echo ":::     ${IPV6_ADDRESS}"
+    echo ":::"
+    echo "::: If you set a new IP address, you should restart the Pi."
     echo "::: View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin"
-	else
-		echo "::: Update complete!"
-	fi
+  else
+    echo "::: Update complete!"
+  fi
 
-	if (( ${#pw} > 0 )) ; then
-		echo ":::"
-		echo "::: Note: As security measure a password has been installed for your web interface"
-		echo "::: The currently set password is"
-		echo ":::                                ${pw}"
-		echo ":::"
-		echo "::: You can always change it using"
-		echo ":::                                pihole -a -p new_password"
-	fi
+  if (( ${#pw} > 0 )) ; then
+    echo ":::"
+    echo "::: Note: As security measure a password has been installed for your web interface"
+    echo "::: The currently set password is"
+    echo ":::                                ${pw}"
+    echo ":::"
+    echo "::: You can always change it using"
+    echo ":::                                pihole -a -p new_password"
+  fi
 
-	echo ":::"
-	echo "::: The install log is located at: /etc/pihole/install.log"
+  echo ":::"
+  echo "::: The install log is located at: /etc/pihole/install.log"
 }
 
 if [[ "${PH_TEST}" != true ]] ; then
-    main "$@"
+  main "$@"
 fi
diff --git a/gravity.sh b/gravity.sh
index 58d0eef9..b5a3765c 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -104,16 +104,30 @@ gravity_collapse() {
 # patternCheck - check to see if curl downloaded any new files.
 gravity_patternCheck() {
 	patternBuffer=$1
-	# check if the patternbuffer is a non-zero length file
-	if [[ -s "${patternBuffer}" ]]; then
-		# Some of the blocklists are copyright, they need to be downloaded
-		# and stored as is. They can be processed for content after they
-		# have been saved.
-		mv "${patternBuffer}" "${saveLocation}"
-		echo " List updated, transport successful!"
+	success=$2
+	error=$3
+	if [ $success = true ]; then
+		# check if download was successful but list has not been modified
+		if [ "${error}" == "304" ]; then
+			echo ":::   No changes detected, transport skipped!"
+		# check if the patternbuffer is a non-zero length file
+		elif [[ -s "${patternBuffer}" ]]; then
+			# Some of the blocklists are copyright, they need to be downloaded
+			# and stored as is. They can be processed for content after they
+			# have been saved.
+			mv "${patternBuffer}" "${saveLocation}"
+			echo ":::   List updated, transport successful!"
+		else
+			# Empty file -> use previously downloaded list
+			echo ":::   Received empty file, using cached one (list not updated!)"
+		fi
 	else
-		# curl didn't download any host files, probably because of the date check
-		echo " No changes detected, transport skipped!"
+		# check if cached list exists
+		if [[ -r "${saveLocation}" ]]; then
+			echo ":::   List download failed, using cached list (list not updated!)"
+		else
+			echo ":::   Download failed and no cached list available (list will not be considered)"
+		fi
 	fi
 }
 
@@ -132,9 +146,27 @@ gravity_transport() {
 	fi
 
 	# Silently curl url
-	curl -s -L ${cmd_ext} ${heisenbergCompensator} -A "${agent}" ${url} > ${patternBuffer}
-	# Check for list updates
-	gravity_patternCheck "${patternBuffer}"
+	err=$(curl -s -L ${cmd_ext} ${heisenbergCompensator} -w %{http_code} -A "${agent}" ${url} -o ${patternBuffer})
+
+	echo " done"
+	# Analyze http response
+	echo -n ":::   Status: "
+	case "$err" in
+		"200"  ) echo "Success (OK)"; success=true;;
+		"304"  ) echo "Not modified"; success=true;;
+		"403"  ) echo "Forbidden"; success=false;;
+		"404"  ) echo "Not found"; success=false;;
+		"408"  ) echo "Time-out"; success=false;;
+		"451"  ) echo "Unavailable For Legal Reasons"; success=false;;
+		"521"  ) echo "Web Server Is Down (Cloudflare)"; success=false;;
+		"522"  ) echo "Connection Timed Out (Cloudflare)"; success=false;;
+		"500"  ) echo "Internal Server Error"; success=false;;
+		*      ) echo "Status $err"; success=false;;
+	esac
+
+	# Process result
+	gravity_patternCheck "${patternBuffer}" ${success} "${err}"
+
 }
 
 # spinup - main gravity function
@@ -181,7 +213,10 @@ gravity_Schwarzchild() {
 	echo -n "::: Aggregating list of domains..."
 	truncate -s 0 ${piholeDir}/${matterAndLight}
 	for i in "${activeDomains[@]}"; do
-		cat "${i}" | tr -d '\r' >> ${piholeDir}/${matterAndLight}
+		# Only assimilate list if it is available (download might have faild permanently)
+		if [[ -r "${i}" ]]; then
+			cat "${i}" | tr -d '\r' >> ${piholeDir}/${matterAndLight}
+		fi
 	done
 	echo " done!"
 }
@@ -353,7 +388,7 @@ if [[ "${forceGrav}" == true ]]; then
 fi
 
 #Overwrite adlists.default from /etc/.pihole in case any changes have been made. Changes should be saved in /etc/adlists.list
-cp /etc/.pihole/adlists.default /etc/pihole/adlists.default
+#cp /etc/.pihole/adlists.default /etc/pihole/adlists.default
 gravity_collapse
 gravity_spinup
 if [[ "${skipDownload}" == false ]]; then
diff --git a/pihole b/pihole
index 5509df47..5a54fae4 100755
--- a/pihole
+++ b/pihole
@@ -72,9 +72,9 @@ scanList(){
   list="${2}"
   method="${3}"
   if [[ ${method} == "-exact" ]] ; then
-    grep -E "(^|\s)${domain}($|\s)" "${list}"
+    grep -i -E "(^|\s)${domain}($|\s)" "${list}"
   else
-    grep "${domain}" "${list}"
+    grep -i "${domain}" "${list}"
   fi
 }