diff --git a/list.php b/list.php
index dc8097c16..308eccf0f 100644
--- a/list.php
+++ b/list.php
@@ -24,6 +24,7 @@ function getFullName() {
 <div class="page-header">
     <h1><?php getFullName(); ?></h1>
 </div>
+<?php if($list == "white"){ ?><p>Note that the ad list domains are automatically added to the whitelist so that a list can never get blocked by another list.</p><?php } ?>
 
 <!-- Domain Input -->
 <div class="form-group input-group">
@@ -48,6 +49,7 @@ function getFullName() {
     Failure! Something went wrong.
 </div>
 
+
 <!-- Domain List -->
 <ul class="list-group" id="list"></ul>
 
diff --git a/scripts/pi-hole/js/gravity.js b/scripts/pi-hole/js/gravity.js
index a208cae12..1a00ee27f 100644
--- a/scripts/pi-hole/js/gravity.js
+++ b/scripts/pi-hole/js/gravity.js
@@ -32,9 +32,23 @@ $("#gravityBtn").on("click", () => {
     eventsource();
 });
 
+$("#gravityBtn").on("click", () => {
+    $("#gravityBtn").attr("disabled", true);
+    eventsource();
+});
+
 // Handle hiding of alerts
 $(function(){
     $("[data-hide]").on("click", function(){
         $(this).closest("." + $(this).attr("data-hide")).hide();
     });
+
+    // Do we want to start updating immediately?
+    // gravity.php?go
+    var searchString = window.location.search.substring(1);
+    if(searchString.indexOf("go") !== -1)
+    {
+        $("#gravityBtn").attr("disabled", true);
+        eventsource();
+    }
 });
diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index e7e613eac..b614bdeed 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -87,3 +87,14 @@ $(document).ready(function(){
     $("[data-toggle=\"tooltip\"]").tooltip({"html": true, container : "body"});
 });
 
+// Handle list deletion
+$("button[id^='adlist-btn-']").on("click", function (e) {
+	e.preventDefault();
+
+	var status = $(this).siblings("input[name^='adlist-del-']").is(":checked");
+	var textType = status ? "none" : "line-through";
+
+    $(this).siblings("input[name^='adlist-del-']").prop("checked", !status);
+    $(this).siblings("input[name^='adlist-enable-']").prop("disabled", !status);
+	$(this).siblings("a").css("text-decoration", textType);
+});
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index e65a7a610..08cbbcc29 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -48,6 +48,35 @@ function validDomain($domain_name)
 			"8.20.247.20" => "Comodo"
 		];
 
+$adlist = [];
+function readAdlists()
+{
+	// Reset list
+	$list = [];
+	$handle = @fopen("/etc/pihole/adlists.list", "r");
+	if ($handle)
+	{
+		while (($line = fgets($handle)) !== false)
+		{
+			if(substr($line, 0, 5) === "#http")
+			{
+				// Commented list
+				array_push($list, [false,rtrim(substr($line, 1))]);
+			}
+			elseif(substr($line, 0, 4) === "http")
+			{
+				// Active list
+				array_push($list, [true,rtrim($line)]);
+			}
+		}
+		fclose($handle);
+	}
+	return $list;
+}
+
+	// Read available adlists
+	$adlist = readAdlists();
+
 	$error = "";
 	$success = "";
 
@@ -369,6 +398,41 @@ function validDomain($domain_name)
 
 				break;
 
+			case "adlists":
+				foreach ($adlist as $key => $value)
+				{
+					if(isset($_POST["adlist-del-".$key]))
+					{
+						// Delete list
+						exec("sudo pihole -a adlist del ".escapeshellcmd($value[1]));
+					}
+					elseif(isset($_POST["adlist-enable-".$key]) && !$value[0])
+					{
+						// Is not enabled, but should be
+						exec("sudo pihole -a adlist enable ".escapeshellcmd($value[1]));
+
+					}
+					elseif(!isset($_POST["adlist-enable-".$key]) && $value[0])
+					{
+						// Is enabled, but shouldn't be
+						exec("sudo pihole -a adlist disable ".escapeshellcmd($value[1]));
+					}
+				}
+
+				if(strlen($_POST["newuserlists"]) > 1)
+				{
+					$domains = array_filter(preg_split('/\r\n|[\r\n]/', $_POST["newuserlists"]));
+					foreach($domains as $domain)
+					{
+						exec("sudo pihole -a adlist add ".escapeshellcmd($domain));
+					}
+				}
+
+				// Reread available adlists
+				$adlist = readAdlists();
+
+				break;
+
 			default:
 				// Option not found
 				$debug = true;
diff --git a/settings.php b/settings.php
index 21e89fc16..95c989045 100644
--- a/settings.php
+++ b/settings.php
@@ -11,11 +11,19 @@
 	}
 </style>
 
+<?php // Check if ad lists should be updated after saving ...
+if(isset($_POST["submit"])) {
+	if($_POST["submit"] == "saveupdate") {
+	// If that is the case -> refresh to the gravity page and start updating immediately
+?>
+<meta http-equiv="refresh" content="1;url=gravity.php?go">
+<?php }} ?>
+
 <?php if(isset($debug)){ ?>
 <div id="alDebug" class="alert alert-warning alert-dismissible fade in" role="alert">
     <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h4><i class="icon fa fa-warning"></i> Debug</h4>
-    <?php print_r($_POST); ?>
+    <pre><?php print_r($_POST); ?></pre>
 </div>
 <?php } ?>
 
@@ -518,7 +526,43 @@ function convertseconds($argument) {
 	}
 
 ?>
-		<div class="box box-success">
+        <div class="box box-danger collapsed-box">
+            <div class="box-header with-border">
+                <h3 class="box-title">Pi-Hole's Block Lists</h3>
+                <div class="box-tools pull-right"><button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button></div>
+            </div>
+            <form role="form" method="post">
+                <div class="box-body">
+                    <div class="col-lg-12">
+                        <label>Lists used to generate Pi-hole's Gravity</label>
+                        <?php foreach ($adlist as $key => $value) { ?>
+                            <div class="form-group">
+                                <div class="checkbox">
+                                    <label style="word-break: break-word;">
+                                        <input type="checkbox" name="adlist-enable-<?php echo $key; ?>" <?php if($value[0]){ ?>checked<?php } ?>>
+                                        <a href="<?php echo htmlentities ($value[1]); ?>" target="_new"><?php echo htmlentities($value[1]); ?></a>
+                                        <input type="checkbox" name="adlist-del-<?php echo $key; ?>" hidden>
+                                        <br>
+                                        <button class="btn btn-danger btn-xs" id="adlist-btn-<?php echo $key; ?>">
+                                            <span class="glyphicon glyphicon-trash"></span>
+                                        </button>
+                                    </label>
+                                </div>
+                            </div>
+                        <?php } ?>
+                        <div class="form-group">
+                            <textarea name="newuserlists" class="form-control" rows="1" placeholder="Enter one URL per line to add new ad lists"></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <input type="hidden" name="field" value="adlists">
+                    <button type="submit" class="btn btn-primary" name="submit" value="save">Save</button>
+                    <button type="submit" class="btn btn-primary pull-right" name="submit" value="saveupdate">Save and Update</button>
+                </div>
+            </form>
+        </div>
+        <div class="box box-success">
 			<div class="box-header with-border">
 				<h3 class="box-title">API</h3>
 			</div>