diff --git a/services/Directory/data/FilterList.json b/services/Directory/data/FilterList.json
index 021980247..098399339 100644
--- a/services/Directory/data/FilterList.json
+++ b/services/Directory/data/FilterList.json
@@ -12521,14 +12521,14 @@
   },
   {
     "description": "This repository is www.mypdns.org self maintained list of domains that needs to be blocked for various reasons.",
-    "homeUrl": "https://gitlab.com/my-privacy-dns/matrix/matrix/",
+    "homeUrl": "https://0xacab.org/my-privacy-dns/matrix",
     "id": 1933,
     "licenseId": 43,
     "name": "My Privacy DNS Matrix - Adware"
   },
   {
     "description": "This repository is www.mypdns.org self maintained list of domains that needs to be blocked for various reasons.",
-    "homeUrl": "https://gitlab.com/my-privacy-dns/matrix/matrix/",
+    "homeUrl": "https://0xacab.org/my-privacy-dns/matrix",
     "id": 1934,
     "licenseId": 43,
     "name": "My Privacy DNS Matrix - Tracking"
@@ -17126,15 +17126,13 @@
     "description": "Porn Records Blacklisting. Porn Records from My Privacy DNS is among the best maintained projects and one of them with the lowest FP's as all records are veryfied by a human before committed to the lists. We do also have a Browser add-on for simple committing new domains",
     "donateUrl": "https://ko-fi.com/X8X37FUGU",
     "emailAddress": "incoming+my-privacy-dns-porn-records-2-dmptefj25u6tlslz82c3oolb9-issue@noreply.mypdns.org",
-    "homeUrl": "https://mypdns.org/my-privacy-dns/porn-records",
+    "homeUrl": "https://0xacab.org/my-privacy-dns/matrix",
     "id": 2566,
-    "issuesUrl": "https://mypdns.org/my-privacy-dns/porn-records/-/issues",
+    "issuesUrl": "https://0xacab.org/my-privacy-dns/matrix/-/issues",
     "licenseId": 13,
     "name": "My Privacy DNS - Porn Records Blacklist",
-    "policyUrl": "https://mypdns.org/my-privacy-dns/porn-records/-/blob/master/README.md",
-    "submissionUrl": "https://mypdns.org/my-privacy-dns/porn-records/-/issues",
-    "viewUrlMirror1": "https://github.com/porn-records/Porn-Records",
-    "viewUrlMirror2": "https://gitlab.com/MypDNS/porn-records"
+    "policyUrl": "https://0xacab.org/my-privacy-dns/matrix/-/blob/master/README.md",
+    "submissionUrl": "https://0xacab.org/my-privacy-dns/matrix/-/issues"
   },
   {
     "description": "Filter that enables removing of ads and anti-adblock scripts from websites with Korean content.",
diff --git a/services/Directory/data/FilterListViewUrl.json b/services/Directory/data/FilterListViewUrl.json
index ff6bed025..c9bb55d1a 100644
--- a/services/Directory/data/FilterListViewUrl.json
+++ b/services/Directory/data/FilterListViewUrl.json
@@ -15831,140 +15831,35 @@
     "id": 2814,
     "primariness": 1,
     "segmentNumber": 1,
-    "url": "https://mypdns.org/my-privacy-dns/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/wildcard.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2815,
-    "primariness": 2,
-    "segmentNumber": 1,
-    "url": "https://raw.githubusercontent.com/mypdns/porn-records/master/submit_here/adult.mypdns.cloud/wildcard.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2816,
-    "primariness": 3,
-    "segmentNumber": 1,
-    "url": "https://raw.githubusercontent.com/porn-records/porn-records/master/submit_here/adult.mypdns.cloud/wildcard.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2817,
-    "primariness": 4,
-    "segmentNumber": 1,
-    "url": "https://gitlab.com/MypDNS/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/wildcard.list"
+    "url": "https://0xacab.org/my-privacy-dns/matrix/-/raw/master/source/porn_filters/explicit_content/wildcard.list"
   },
   {
     "filterListId": 2566,
     "id": 2818,
     "primariness": 1,
     "segmentNumber": 2,
-    "url": "https://mypdns.org/my-privacy-dns/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/tld.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2819,
-    "primariness": 2,
-    "segmentNumber": 2,
-    "url": "https://raw.githubusercontent.com/mypdns/porn-records/master/submit_here/adult.mypdns.cloud/tld.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2820,
-    "primariness": 3,
-    "segmentNumber": 2,
-    "url": "https://raw.githubusercontent.com/porn-records/porn-records/master/submit_here/adult.mypdns.cloud/tld.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2821,
-    "primariness": 4,
-    "segmentNumber": 2,
-    "url": "https://gitlab.com/MypDNS/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/tld.list"
+    "url": "https://0xacab.org/my-privacy-dns/matrix/-/raw/master/source/porn_filters/explicit_content/tld.list"
   },
   {
     "filterListId": 2566,
     "id": 2822,
     "primariness": 1,
     "segmentNumber": 3,
-    "url": "https://mypdns.org/my-privacy-dns/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/domains.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2823,
-    "primariness": 2,
-    "segmentNumber": 3,
-    "url": "https://raw.githubusercontent.com/mypdns/porn-records/master/submit_here/adult.mypdns.cloud/domains.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2824,
-    "primariness": 3,
-    "segmentNumber": 3,
-    "url": "https://raw.githubusercontent.com/porn-records/porn-records/master/submit_here/adult.mypdns.cloud/domains.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2825,
-    "primariness": 4,
-    "segmentNumber": 3,
-    "url": "https://gitlab.com/MypDNS/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/domains.list"
+    "url": "https://0xacab.org/my-privacy-dns/matrix/-/raw/master/source/porn_filters/explicit_content/domains.list"
   },
   {
     "filterListId": 2566,
     "id": 2826,
     "primariness": 1,
     "segmentNumber": 4,
-    "url": "https://mypdns.org/my-privacy-dns/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/hosts.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2827,
-    "primariness": 2,
-    "segmentNumber": 4,
-    "url": "https://raw.githubusercontent.com/mypdns/porn-records/master/submit_here/adult.mypdns.cloud/hosts.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2828,
-    "primariness": 3,
-    "segmentNumber": 4,
-    "url": "https://raw.githubusercontent.com/porn-records/porn-records/master/submit_here/adult.mypdns.cloud/hosts.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2829,
-    "primariness": 4,
-    "segmentNumber": 4,
-    "url": "https://gitlab.com/MypDNS/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/hosts.list"
+    "url": "https://0xacab.org/my-privacy-dns/matrix/-/raw/master/source/porn_filters/explicit_content/hosts.list"
   },
   {
     "filterListId": 2566,
     "id": 2830,
     "primariness": 1,
     "segmentNumber": 5,
-    "url": "https://mypdns.org/my-privacy-dns/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/snuff.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2831,
-    "primariness": 2,
-    "segmentNumber": 5,
-    "url": "https://raw.githubusercontent.com/mypdns/porn-records/master/submit_here/adult.mypdns.cloud/snuff.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2832,
-    "primariness": 3,
-    "segmentNumber": 5,
-    "url": "https://raw.githubusercontent.com/porn-records/porn-records/master/submit_here/adult.mypdns.cloud/snuff.list"
-  },
-  {
-    "filterListId": 2566,
-    "id": 2833,
-    "primariness": 4,
-    "segmentNumber": 5,
-    "url": "https://gitlab.com/MypDNS/porn-records/-/raw/master/submit_here/adult.mypdns.cloud/snuff.list"
+    "url": "https://0xacab.org/my-privacy-dns/matrix/-/raw/master/source/porn_filters/explicit_content/snuff.list"
   },
   {
     "filterListId": 2567,