diff --git a/data/FilterList.json b/data/FilterList.json
index 3f88bc62b..9bd737c05 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -6254,56 +6254,30 @@
     "viewUrl": "https://raw.githubusercontent.com/marktron/fakenews/master/fakenews"
   },
   {
-    "id": 594,
+    "id": 595,
     "description": "Collection of Analytics, Ads, and tracking hosts to block.",
-    "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking.txt",
-    "homeUrl": "https://github.com/lightswitch05/hosts",
+    "descriptionSourceUrl": "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt",
+    "homeUrl": "https://www.github.developerdan.com/hosts",
     "issuesUrl": "https://github.com/lightswitch05/hosts/issues",
     "licenseId": 18,
     "name": "Ads & Tracking",
-    "publishedDate": "2018-05-10T21:33:02",
-    "syntaxId": 1,
-    "updatedDate": "2019-04-04T13:03:51",
-    "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking.txt"
-  },
-  {
-    "id": 595,
-    "description": "Collection of Analytics, Ads, and tracking hosts to block.",
-    "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking-extended.txt",
-    "homeUrl": "https://github.com/lightswitch05/hosts",
-    "issuesUrl": "https://github.com/lightswitch05/hosts/issues",
-    "licenseId": 18,
-    "name": "Ads & Tracking Extended",
     "publishedDate": "2018-05-24T14:40:19",
     "syntaxId": 1,
     "updatedDate": "2019-04-04T13:12:12",
-    "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking-extended.txt"
+    "viewUrl": "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt"
   },
   {
     "id": 596,
-    "description": "Collection of Analytics, Ads, and tracking hosts to block.",
-    "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive.txt",
-    "homeUrl": "https://github.com/lightswitch05/hosts",
+    "description": "A very aggressive block list for tracking, geo-targeting, & ads. This list is only recommended for advanced users who do not mind occasional whitelisting.",
+    "descriptionSourceUrl": "https://www.github.developerdan.com/hosts/lists/tracking-aggressive-extended.txt",
+    "homeUrl": "https://www.github.developerdan.com/hosts",
     "issuesUrl": "https://github.com/lightswitch05/hosts/issues",
     "licenseId": 18,
     "name": "Tracking Aggressive",
     "publishedDate": "2018-07-19T11:03:56",
     "syntaxId": 1,
     "updatedDate": "2019-03-13T15:29:12",
-    "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive.txt"
-  },
-  {
-    "id": 597,
-    "description": "Collection of Analytics, Ads, and tracking hosts to block.",
-    "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive-extended.txt",
-    "homeUrl": "https://github.com/lightswitch05/hosts",
-    "issuesUrl": "https://github.com/lightswitch05/hosts/issues",
-    "licenseId": 18,
-    "name": "Tracking Aggressive Extended",
-    "publishedDate": "2018-07-19T11:03:56",
-    "syntaxId": 1,
-    "updatedDate": "2019-04-08T04:25:10",
-    "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive-extended.txt"
+    "viewUrl": "https://www.github.developerdan.com/hosts/lists/tracking-aggressive-extended.txt"
   },
   {
     "id": 598,
@@ -17404,5 +17378,18 @@
     "syntaxId": 14,
     "updatedDate": "2019-04-16T23:19:09",
     "viewUrl": "https://raw.githubusercontent.com/Hakame-kun/uBlock-Filters-Indonesia/master/Windows%20Host/hosts"
+  },
+  {
+    "id": 1639,
+    "description": "Google AMP (Accelerated Mobile Pages) block list.",
+    "descriptionSourceUrl": "https://www.github.developerdan.com/hosts/lists/amp-hosts-extended.txt",
+    "homeUrl": "https://www.github.developerdan.com/hosts",
+    "issuesUrl": "https://github.com/lightswitch05/hosts/issues",
+    "licenseId": 18,
+    "name": "AMP Hosts",
+    "publishedDate": "2018-07-19T11:03:56",
+    "syntaxId": 1,
+    "updatedDate": "2019-03-13T15:29:12",
+    "viewUrl": "https://www.github.developerdan.com/hosts/lists/amp-hosts-extended.txt"
   }
 ]
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index ff715bd2b..3b9ff866d 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -4550,5 +4550,17 @@
   {
     "filterListId": 1602,
     "maintainerId": 138
+  },
+  {
+    "filterListId": 595,
+    "maintainerId": 139
+  },
+  {
+    "filterListId": 596,
+    "maintainerId": 139
+  },
+  {
+    "filterListId": 1639,
+    "maintainerId": 139
   }
 ]
diff --git a/data/FilterListTag.json b/data/FilterListTag.json
index 559e5293c..15cfe9486 100644
--- a/data/FilterListTag.json
+++ b/data/FilterListTag.json
@@ -2739,14 +2739,6 @@
     "filterListId": 593,
     "tagId": 21
   },
-  {
-    "filterListId": 594,
-    "tagId": 2
-  },
-  {
-    "filterListId": 594,
-    "tagId": 3
-  },
   {
     "filterListId": 595,
     "tagId": 2
@@ -2763,14 +2755,6 @@
     "filterListId": 596,
     "tagId": 3
   },
-  {
-    "filterListId": 597,
-    "tagId": 2
-  },
-  {
-    "filterListId": 597,
-    "tagId": 3
-  },
   {
     "filterListId": 598,
     "tagId": 2
@@ -7618,5 +7602,13 @@
   {
     "filterListId": 1638,
     "tagId": 12
+  },
+  {
+    "filterListId": 1639,
+    "tagId": 15
+  },
+  {
+    "filterListId": 1639,
+    "tagId": 19
   }
 ]
diff --git a/data/Maintainer.json b/data/Maintainer.json
index e426bf581..59fa97be6 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -728,5 +728,10 @@
     "id": 138,
     "homeUrl": "https://github.com/HankAviator",
     "name": "HankAviator"
+  },
+  {
+    "id": 139,
+    "homeUrl": "https://www.github.developerdan.com/hosts/",
+    "name": "lightswitch05"
   }
 ]