diff --git a/pihole/blocklists/build/affiliatetracking/affiliatetracking.config.whitelists b/pihole/blocklists/build/affiliatetracking/affiliatetracking.config.whitelists
index 5fb56716..daad1039 100755
--- a/pihole/blocklists/build/affiliatetracking/affiliatetracking.config.whitelists
+++ b/pihole/blocklists/build/affiliatetracking/affiliatetracking.config.whitelists
@@ -1,2 +1 @@
 ../../data/white.list
-../../data/white.list.adguard
diff --git a/pihole/blocklists/build/big/big.config.prioblocklists b/pihole/blocklists/build/big/big.config.prioblocklists
index 5cf929ea..8f3c4ac6 100755
--- a/pihole/blocklists/build/big/big.config.prioblocklists
+++ b/pihole/blocklists/build/big/big.config.prioblocklists
@@ -1 +1,2 @@
+../../data/black.list.block
 ../../data/rules.list.block
diff --git a/pihole/blocklists/build/big/big.config.sourcelists b/pihole/blocklists/build/big/big.config.sourcelists
index d4e625c4..9e799fdb 100755
--- a/pihole/blocklists/build/big/big.config.sourcelists
+++ b/pihole/blocklists/build/big/big.config.sourcelists
@@ -1,4 +1,3 @@
 ../../multi.txt
 ../../fake.txt
 https://dbl.oisd.nl
-& https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
diff --git a/pihole/blocklists/build/big/big.config.unblocklists b/pihole/blocklists/build/big/big.config.unblocklists
old mode 100644
new mode 100755
index d6bb0769..7d0b54c7
--- a/pihole/blocklists/build/big/big.config.unblocklists
+++ b/pihole/blocklists/build/big/big.config.unblocklists
@@ -1,2 +1,3 @@
+../../data/white.list
 ../../data/white.list.important
 ../../data/white.list.referral
diff --git a/pihole/blocklists/build/big/big.config.whitelists b/pihole/blocklists/build/big/big.config.whitelists
deleted file mode 100755
index 5fb56716..00000000
--- a/pihole/blocklists/build/big/big.config.whitelists
+++ /dev/null
@@ -1,2 +0,0 @@
-../../data/white.list
-../../data/white.list.adguard
diff --git a/pihole/blocklists/build/black/black.config.whitelists b/pihole/blocklists/build/black/black.config.whitelists
index 5fb56716..daad1039 100755
--- a/pihole/blocklists/build/black/black.config.whitelists
+++ b/pihole/blocklists/build/black/black.config.whitelists
@@ -1,2 +1 @@
 ../../data/white.list
-../../data/white.list.adguard
diff --git a/pihole/blocklists/build/black/black.config.prioblocklists b/pihole/blocklists/build/default.config.prioblocklists
similarity index 100%
rename from pihole/blocklists/build/black/black.config.prioblocklists
rename to pihole/blocklists/build/default.config.prioblocklists
diff --git a/pihole/blocklists/build/black/black.config.unblocklists b/pihole/blocklists/build/default.config.unblocklists
similarity index 74%
rename from pihole/blocklists/build/black/black.config.unblocklists
rename to pihole/blocklists/build/default.config.unblocklists
index d6bb0769..7d0b54c7 100755
--- a/pihole/blocklists/build/black/black.config.unblocklists
+++ b/pihole/blocklists/build/default.config.unblocklists
@@ -1,2 +1,3 @@
+../../data/white.list
 ../../data/white.list.important
 ../../data/white.list.referral
diff --git a/pihole/blocklists/build/multi/multi.config.whitelists b/pihole/blocklists/build/default.config.whitelists
similarity index 100%
rename from pihole/blocklists/build/multi/multi.config.whitelists
rename to pihole/blocklists/build/default.config.whitelists
diff --git a/pihole/blocklists/build/fake/fake.config.unblocklists b/pihole/blocklists/build/fake/fake.config.unblocklists
deleted file mode 100755
index b0c71430..00000000
--- a/pihole/blocklists/build/fake/fake.config.unblocklists
+++ /dev/null
@@ -1 +0,0 @@
-../../data/white.list.important
diff --git a/pihole/blocklists/build/fake/fake.config.whitelists b/pihole/blocklists/build/fake/fake.config.whitelists
index 8909716b..2b23e813 100755
--- a/pihole/blocklists/build/fake/fake.config.whitelists
+++ b/pihole/blocklists/build/fake/fake.config.whitelists
@@ -1,3 +1,6 @@
 ../../data/exclude.list
 ../../data/white.list.apple
 ../../data/white.list.microsoft
+../../data/white.list.hl2guide
+../../data/networks/google.list
+../../doh-vpn-proxy-bypass.txt
diff --git a/pihole/blocklists/build/light/light.config.excludelists b/pihole/blocklists/build/light/light.config.excludelists
index 2a7b66da..334dc223 100755
--- a/pihole/blocklists/build/light/light.config.excludelists
+++ b/pihole/blocklists/build/light/light.config.excludelists
@@ -1 +1,2 @@
 ../../fake.txt
+../../doh-vpn-proxy-bypass.txt
diff --git a/pihole/blocklists/build/light/light.config.unblocklists b/pihole/blocklists/build/light/light.config.unblocklists
index d6bb0769..7d0b54c7 100755
--- a/pihole/blocklists/build/light/light.config.unblocklists
+++ b/pihole/blocklists/build/light/light.config.unblocklists
@@ -1,2 +1,3 @@
+../../data/white.list
 ../../data/white.list.important
 ../../data/white.list.referral
diff --git a/pihole/blocklists/build/multi/muilt.config.whitelists b/pihole/blocklists/build/multi/muilt.config.whitelists
new file mode 100755
index 00000000..7c11ea1e
--- /dev/null
+++ b/pihole/blocklists/build/multi/muilt.config.whitelists
@@ -0,0 +1 @@
+../../data/exclude.list
diff --git a/pihole/blocklists/build/multi/multi.config.excludelists b/pihole/blocklists/build/multi/multi.config.excludelists
index 2a7b66da..334dc223 100755
--- a/pihole/blocklists/build/multi/multi.config.excludelists
+++ b/pihole/blocklists/build/multi/multi.config.excludelists
@@ -1 +1,2 @@
 ../../fake.txt
+../../doh-vpn-proxy-bypass.txt
diff --git a/pihole/blocklists/build/multi/multi.config.unblocklists b/pihole/blocklists/build/multi/multi.config.unblocklists
index d6bb0769..7d0b54c7 100755
--- a/pihole/blocklists/build/multi/multi.config.unblocklists
+++ b/pihole/blocklists/build/multi/multi.config.unblocklists
@@ -1,2 +1,3 @@
+../../data/white.list
 ../../data/white.list.important
 ../../data/white.list.referral
diff --git a/pihole/blocklists/build/personal/personal.config.unblocklists b/pihole/blocklists/build/personal/personal.config.unblocklists
index d6bb0769..7d0b54c7 100755
--- a/pihole/blocklists/build/personal/personal.config.unblocklists
+++ b/pihole/blocklists/build/personal/personal.config.unblocklists
@@ -1,2 +1,3 @@
+../../data/white.list
 ../../data/white.list.important
 ../../data/white.list.referral
diff --git a/pihole/blocklists/build/sourcefiles.txt b/pihole/blocklists/build/sourcefiles.txt
deleted file mode 100644
index ca3e7d40..00000000
--- a/pihole/blocklists/build/sourcefiles.txt
+++ /dev/null
@@ -1,245 +0,0 @@
-/media/nas/git/rpi/pihole/blocklists/sources/abpindo_indonesianadblockrules_subscriptions_abpindo.txt
-/media/nas/git/rpi/pihole/blocklists/sources/abpvn_abpvn_filter_abpvn.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adaway.org_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_adguardsdnsfilter_filters_rules.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_cname-trackers_combined_disguised_trackers_justdomains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_11_mobile_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_14_annoyances_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_16_french_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_1_russian_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_224_chinese_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_2_english_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_3_spyware_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_4_social_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_6_german_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_7_japanese_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_8_dutch_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam_filtersregistry_filters_filter_9_spanish_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adguardteam.github.io_adguardsdnsfilter_filters_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/adroitadorkhan_antipopads-re_formats_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/amnestytech_investigations_2021-07-18_nso_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/assets.windscribe.com_custom_blocklists_clickbait.txt
-/media/nas/git/rpi/pihole/blocklists/sources/azorult-tracker.net_api_list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/badmojr_1hosts_lite_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/badmojr_1hosts_submit_here_include_for_all.txt
-/media/nas/git/rpi/pihole/blocklists/sources/bigdargon_hostsvn_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/black.list
-/media/nas/git/rpi/pihole/blocklists/sources/black.list.affiliatetracking
-/media/nas/git/rpi/pihole/blocklists/sources/black.list.dohdot
-/media/nas/git/rpi/pihole/blocklists/sources/black.list.fake
-/media/nas/git/rpi/pihole/blocklists/sources/black.list.threat-intelligence
-/media/nas/git/rpi/pihole/blocklists/sources/black.list.wc.removed
-/media/nas/git/rpi/pihole/blocklists/sources/black.list.wl.removed
-/media/nas/git/rpi/pihole/blocklists/sources/blocklist.cyberthreatcoalition.org_vetted_domain.txt
-/media/nas/git/rpi/pihole/blocklists/sources/bongochong_combinedprivacyblocklists_noformatting_additionalsupplementaryhosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/bongochong_combinedprivacyblocklists_noformatting_md-id-fork.txt
-/media/nas/git/rpi/pihole/blocklists/sources/botvrij.eu_data_ioclist.domain.raw.txt
-/media/nas/git/rpi/pihole/blocklists/sources/botvrij.eu_data_ioclist.hostname.raw.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_shallalist_adv_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_shallalist_costtraps_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_shallalist_spyware_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_shallalist_tracker_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_ut1_ads_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_ut1_cryptojacking_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/cbuijs_ut1_malware_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/curben.io_malware-filter_phishing-filter-hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/curben.io_malware-filter_pup-filter-hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/curben.io_malware-filter_urlhaus-filter-hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/d3ward_toolz_src_d3host.txt
-/media/nas/git/rpi/pihole/blocklists/sources/dandelionsprout_adfilt_alternateversionsanti-malwarelist_antimalwarehosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/davidonzo_threat-intel_lists_latestdomains.pihole.txt
-/media/nas/git/rpi/pihole/blocklists/sources/dbl.oisd.nl_basic_.txt
-/media/nas/git/rpi/pihole/blocklists/sources/dbl.oisd.nl.txt
-/media/nas/git/rpi/pihole/blocklists/sources/drsdavidsoft_additional-hosts_domains_blacklist_adservers-and-trackers.txt
-/media/nas/git/rpi/pihole/blocklists/sources/drsdavidsoft_additional-hosts_domains_blacklist_fake-domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/durablenapkin_scamblocklist_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_advblock.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistchina.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistdutch.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistgermany.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistitaly.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistpolish.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistportuguese.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_easylistspanish.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_indianlist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_koreanlist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_liste_ar.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-downloads.adblockplus.org_liste_fr.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist_easylist_easyprivacy_easyprivacy_specific_cname.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist_easylisthebrew_easylisthebrew.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-lithuania_easylist_lithuania_easylistlithuania.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist-thailand_easylist-thailand_subscription_easylist-thailand.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist.to_easylist_easylist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist.to_easylist_easyprivacy.txt
-/media/nas/git/rpi/pihole/blocklists/sources/easylist.to_easylist_fanboy-social.txt
-/media/nas/git/rpi/pihole/blocklists/sources/fademind_hosts.extras_add.2o7net_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/fademind_hosts.extras_add.risk_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/fademind_hosts.extras_add.spam_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/fake.ts.black.list
-/media/nas/git/rpi/pihole/blocklists/sources/fake.txt
-/media/nas/git/rpi/pihole/blocklists/sources/fake.vzni.black.list
-/media/nas/git/rpi/pihole/blocklists/sources/feeds.alphasoc.net_ryuk.txt
-/media/nas/git/rpi/pihole/blocklists/sources/guardicore_labs_campaigns_autodiscover_autodiscover-tlds.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hblock.molinero.dev_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hole.cert.pl_domains_domains_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hole.cert.pl_domains_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hoshsadiq_adblock-nocoin-list_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hostfiles.frogeye.fr_firstparty-trackers-hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hpthreatresearch_iocs_cryptbot_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hpthreatresearch_iocs_icedid_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/hpthreatresearch_iocs_ta551_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/iam-py-test_my_filters_001_alternativelistformats_antimalware_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/iam-py-test_my_filters_001_alternativelistformats_clickbait_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/infinitytec_blocklists_ads-and-trackers.txt
-/media/nas/git/rpi/pihole/blocklists/sources/infinitytec_blocklists_scams-and-phishing.txt
-/media/nas/git/rpi/pihole/blocklists/sources/jdlingyu_ad-wars_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/jkrejcha_admiralist_admiralist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/joewein.net_dl_bl_dom-bl-base.txt
-/media/nas/git/rpi/pihole/blocklists/sources/joewein.net_dl_bl_dom-bl.txt
-/media/nas/git/rpi/pihole/blocklists/sources/kees1958_w3c_annual_most_used_survey_blocklist_eu_usmost_used_ad_and_tracking_networks.txt
-/media/nas/git/rpi/pihole/blocklists/sources/kees1958_w3c_annual_most_used_survey_blocklist_top_eu_us_ads_trackers_abp.txt
-/media/nas/git/rpi/pihole/blocklists/sources/kevinthomas0_cryptoscamdb-lists_-_master_cryptoscamdb-blocklist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/kriskintel.com_feeds_ktip_covid_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/kriskintel.com_feeds_ktip_malicious_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/kriskintel.com_feeds_ktip_ransomware_feeds.txt
-/media/nas/git/rpi/pihole/blocklists/sources/laicure_hosts_shithosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/matomo-org_referrer-spam-blacklist_spammers.txt
-/media/nas/git/rpi/pihole/blocklists/sources/metamask_eth-phishing-detect_src_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_badd-boyz-hosts_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_phishing.database_phishing-domains-active.txt
-/media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_phishing.database_phishing-domains-new-today.txt
-/media/nas/git/rpi/pihole/blocklists/sources/mitchellkrogza_the-big-list-of-hacked-malware-web-sites_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/multi.txt
-/media/nas/git/rpi/pihole/blocklists/sources/nextdns_cname-cloaking-blocklist_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/nextdns_metadata_parentalcontrol_bypass-methods.txt
-/media/nas/git/rpi/pihole/blocklists/sources/nextdns_metadata_privacy_affiliate-tracking-domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/nextdns_metadata_security_parked-domains-cname.txt
-/media/nas/git/rpi/pihole/blocklists/sources/notabug.org_latvian-list_adblock-latvian_master_lists_latvian-list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/notracking_hosts-blocklists_dnscrypt-proxy_dnscrypt-proxy.blacklist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/oneoffdallas_dohservers_list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ookangzheng_blahdns_hosts_blacklist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/orca.pet_notonmyshift_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/osint.digitalside.it_threat-intel_lists_latestdomains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/paulgb.github.io_barbblock_blacklists_hosts-file.txt
-/media/nas/git/rpi/pihole/blocklists/sources/pgl.yoyo.org_adservers_serverlist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/phishing.army_download_phishing_army_blocklist_extended.txt
-/media/nas/git/rpi/pihole/blocklists/sources/phishing.army_download_phishing_army_blocklist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/piperun_iploggerfilter_filterlist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/polishfiltersteam_kadhosts_kadomains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/prodaft_malware-ioc_flubot_v3.7_5000_domain.txt
-/media/nas/git/rpi/pihole/blocklists/sources/prodaft_malware-ioc_flubot_v3.7_germany.txt
-/media/nas/git/rpi/pihole/blocklists/sources/prodaft_malware-ioc_flubot_v3.8_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/prodaft_malware-ioc_flubot_v3.9_italy.txt
-/media/nas/git/rpi/pihole/blocklists/sources/prodaft_malware-ioc_flubot_v4.0_uk.txt
-/media/nas/git/rpi/pihole/blocklists/sources/quidsup_notrack-blocklists_master_notrack-blocklist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/quidsup_notrack-blocklists_master_notrack-malware.txt
-/media/nas/git/rpi/pihole/blocklists/sources/raw.tomasko126_easylistczechandslovak_filters.txt
-/media/nas/git/rpi/pihole/blocklists/sources/rescure.me_covid.txt
-/media/nas/git/rpi/pihole/blocklists/sources/rescure.me_rescure_domain_blacklist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-amnenstytech.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-certego.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-citizenlabs.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-cyble.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-drweb.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-eset.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-kaspersky.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-main.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-malware-traffic.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-personal.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-sentinelone.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-unit42-playbook.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-unit42-silverterrier.txt
-/media/nas/git/rpi/pihole/blocklists/sources/scafroglia93_blocklists_blocklists-zscaler.txt
-/media/nas/git/rpi/pihole/blocklists/sources/secure.fanboy.co.nz_fanboy-annoyance.txt
-/media/nas/git/rpi/pihole/blocklists/sources/secure.fanboy.co.nz_fanboy-cookiemonster.txt
-/media/nas/git/rpi/pihole/blocklists/sources/shadowwhisperer_blocklists_lists_cryptocurrency.txt
-/media/nas/git/rpi/pihole/blocklists/sources/shadowwhisperer_blocklists_lists_malware.txt
-/media/nas/git/rpi/pihole/blocklists/sources/shadowwhisperer_blocklists_lists_risk.txt
-/media/nas/git/rpi/pihole/blocklists/sources/shadowwhisperer_blocklists_lists_scam.txt
-/media/nas/git/rpi/pihole/blocklists/sources/shreyasminocha_shady-hosts_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/someonewhocares.org_hosts_.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stamparm_aux_maltrail-malware-domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stamparm_blackbook_blackbook.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stanev.org_abp_adblock_bg.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stevenblack_hosts_extensions_fakenews_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stevenblack_hosts_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stonecrusher_filterlists-pihole_watchlist-internet-ph.txt
-/media/nas/git/rpi/pihole/blocklists/sources/stopforumspam.com_downloads_toxic_domains_whole.txt
-/media/nas/git/rpi/pihole/blocklists/sources/threatfox.abuse.ch_downloads_hostfile.txt
-/media/nas/git/rpi/pihole/blocklists/sources/tiuxo_hosts_ads.txt
-/media/nas/git/rpi/pihole/blocklists/sources/travisboss_thegreatwall_doh.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ublockorigin_uassets_filters_badware.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ublockorigin_uassets_filters_filters-2020.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ublockorigin_uassets_filters_filters-2021.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ublockorigin_uassets_filters_filters.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ublockorigin_uassets_filters_privacy.txt
-/media/nas/git/rpi/pihole/blocklists/sources/ublockorigin_uassets_filters_resource-abuse.txt
-/media/nas/git/rpi/pihole/blocklists/sources/urlhaus.abuse.ch_downloads_hostfile_.txt
-/media/nas/git/rpi/pihole/blocklists/sources/usom.gov.tr_url-list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/velesila_yhosts_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/v.firebog.net_hosts_admiral.txt
-/media/nas/git/rpi/pihole/blocklists/sources/v.firebog.net_hosts_static_w3kbl.txt
-/media/nas/git/rpi/pihole/blocklists/sources/void.gr_kargig_void-gr-filters.txt
-/media/nas/git/rpi/pihole/blocklists/sources/what-zit-tooya_ad-block_main-blocklist_ad-block-hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/ahadns_aha.dns.domains_domains_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/anudeepnd_blacklist_miscellaneous_false-positives.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/anudeepnd_whitelist_domains_optional-list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/anudeepnd_whitelist_domains_referral-sites.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/anudeepnd_whitelist_domains_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/badmojr_1hosts_submit_here_exclude_for_all.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/blokadaorg_landing-github-pages_scripts_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/bongochong_combinedprivacyblocklists_noformatting_whitelisteddomains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/boutetnico_url-shorteners_list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/cbuijs_accomplist_whitelist_optimized.white.domain.list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/cbuijs_my-allowlist_allow.list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/chrisjudk_hosts_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/common-lisp.net_clo_exim-surbl_4094b9f5353810b0c3ed989721a12a1d9f6c3bfa_surbl_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead-hosts_zelo72s_rpi.pihole.blocklists.fake_output_origin.list_domains_inactive_list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead-hosts_zelo72s_rpi.pihole.blocklists.multi_output_origin.list_domains_inactive_list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead.list.afftrack
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead.list.doh
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead.list.fake
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead.list.multi
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead.list.personal
-/media/nas/git/rpi/pihole/blocklists/sources/white/dead.list.threat-intelligence
-/media/nas/git/rpi/pihole/blocklists/sources/white/drsdavidsoft_additional-hosts_domains_whitelist_duckduckgo.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/drsdavidsoft_additional-hosts_domains_whitelist_github.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/drsdavidsoft_additional-hosts_domains_whitelist_google.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/drsdavidsoft_additional-hosts_domains_whitelist_root.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/energizedprotection_unblock_basic_formats_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/josegalre_hosty_bits_hosty.whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/kees1958_w3c_annual_most_used_survey_blocklist_removeddomains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/kevinthomas0_cryptoscamdb-lists_-_master_cryptoscamdb-allowlist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/kevinthomas0_cryptoscamdb-lists_-_master_potential-false-positives.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/mkb2091_blockconvert_output_whitelist_domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/natizyskunk_pi-hole-lists_master_whitelist_personal_mega_whitelist_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/nextdns_metadata_privacy_affiliate-tracking-domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/nextdns_metadata_security_typosquatting_protected-domains.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/notracking_hosts-blocklists-scripts_domains.dead.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/notracking_hosts-blocklists-scripts_hostnames.dead.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/notracking_hosts-blocklists-scripts_hostnames.whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/ookangzheng_232057d3562bffc31daa7739dfdb4469_c3246079b96bf6091081407efdea2a1bfa87223a_xiaomi-whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/ookangzheng_blahdns_hosts_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/raghavdua1995_dnslock-pihole-whitelist_whitelist.list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/rpilist_specials_dev_coronawhitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/rpilist_specials_dev_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/rspamd_maps_rspamd_dmarc_whitelist.inc.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/shadowwhisperer_blocklists_whitelists_filter.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/shadowwhisperer_blocklists_whitelists_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/t145_black-mirror_releases_download_latest_white_domain.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/ultimate-hosts-blacklist_whitelist_domains.list.txt
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list.adguard
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list.bmj
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list.important
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list.oisd
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list.referral
-/media/nas/git/rpi/pihole/blocklists/sources/white/white.list.shc
-/media/nas/git/rpi/pihole/blocklists/sources/white/zebpalmer_dns_blocklists_whitelist.txt
-/media/nas/git/rpi/pihole/blocklists/sources/winhelp2002.mvps.org_hosts.txt
-/media/nas/git/rpi/pihole/blocklists/sources/zelo72_rpi_pihole_blocklists_doh-vpn-proxy-bypass.txt
-/media/nas/git/rpi/pihole/blocklists/sources/zelo72_rpi_pihole_blocklists_fake.txt
-/media/nas/git/rpi/pihole/blocklists/sources/zelo72_rpi_pihole_blocklists_personal.txt
-/media/nas/git/rpi/pihole/blocklists/sources/zelo72_rpi_pihole_blocklists_threat-intelligence.txt
-/media/nas/git/rpi/pihole/blocklists/sources/zerodot1_coinblockerlists_master_hosts_browser.txt
-/media/nas/git/rpi/pihole/blocklists/sources/zoso.ro_pages_rolist.txt
diff --git a/pihole/blocklists/build/test/test.config.deadlists b/pihole/blocklists/build/test/test.config.deadlists
deleted file mode 100644
index 8068da4b..00000000
--- a/pihole/blocklists/build/test/test.config.deadlists
+++ /dev/null
@@ -1 +0,0 @@
-../../data/dead.list
diff --git a/pihole/blocklists/build/test/test.config.excludelists b/pihole/blocklists/build/test/test.config.excludelists
deleted file mode 100644
index cc77aa26..00000000
--- a/pihole/blocklists/build/test/test.config.excludelists
+++ /dev/null
@@ -1,3 +0,0 @@
-../../big.txt
-../../affiliatetracking.txt
-../../threat-intelligence.txt
diff --git a/pihole/blocklists/build/test/test.config.sourcelists b/pihole/blocklists/build/test/test.config.sourcelists
deleted file mode 100644
index 8b137891..00000000
--- a/pihole/blocklists/build/test/test.config.sourcelists
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pihole/blocklists/build/test/test.config.whitelists b/pihole/blocklists/build/test/test.config.whitelists
deleted file mode 100644
index 8909716b..00000000
--- a/pihole/blocklists/build/test/test.config.whitelists
+++ /dev/null
@@ -1,3 +0,0 @@
-../../data/exclude.list
-../../data/white.list.apple
-../../data/white.list.microsoft
diff --git a/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.excludelists b/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.excludelists
new file mode 100755
index 00000000..334dc223
--- /dev/null
+++ b/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.excludelists
@@ -0,0 +1,2 @@
+../../fake.txt
+../../doh-vpn-proxy-bypass.txt
diff --git a/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.whitelists b/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.whitelists
index c5467ba3..ba28f0cc 100755
--- a/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.whitelists
+++ b/pihole/blocklists/build/threat-intelligence/threat-intelligence.config.whitelists
@@ -1,5 +1,5 @@
 ../../data/exclude.list
-../../data/white.list.important
 ../../data/white.list.apple
 ../../data/white.list.microsoft
 ../../data/white.list.hl2guide
+../../data/networks/google.list
diff --git a/pihole/blocklists/build/threat-intelligence/threat-intelligence.white b/pihole/blocklists/build/threat-intelligence/threat-intelligence.white
index 51adfa59..07207444 100755
--- a/pihole/blocklists/build/threat-intelligence/threat-intelligence.white
+++ b/pihole/blocklists/build/threat-intelligence/threat-intelligence.white
@@ -1 +1,94 @@
+*.0rz.tw
+*.1drv.ms
+*.4shared.com
+*.adobe.com
+*.alicdn.com
+*.archive.org
+*.arpa
+*.backblazeb2.com
+*.bit.do
+*.bit.ly
+*.bitly.com
+*.cl.ly
+*.cloud.answerhub.com
+*.cloud.ovh.net
 *.cloudfront.net
+*.cutt.ly
+*.digitaloceanspaces.com
+*.docs.google.com
+*.docs.zoho.com
+*.downloads.intercomcdn.com
+*.drive.google.com
+*.dropbox.com
+*.dropboxusercontent.com
+*.evernote.com
+*.file-upload.com
+*.filefactory.com
+*.files.1drv.com
+*.files.cloud.orange.fr
+*.forms.gle
+*.ghostbin.co
+*.gitlab.com
+*.googleapis.com
+*.googleusercontent.com
+*.gov
+*.imagebam.com
+*.imagehosting.biz
+*.imgbox.com
+*.imgur.com
+*.inc.com
+*.iobit.com
+*.is.gd
+*.j.mp
+*.jsdelivr.net
+*.lenta.ru
+*.linktr.ee
+*.lnky.in
+*.mail.naver.com
+*.maven.org
+*.mediafire.com
+*.mega.nz
+*.ntv.io
+*.on24.com
+*.onedrive.live.com
+*.ow.ly
+*.paste.ee
+*.pastebin.com
+*.pasteboard.co
+*.pastelink.net
+*.postimg.cc
+*.pxlme.me
+*.rb.gy
+*.rebrand.ly
+*.reurl.cc
+*.s.id
+*.send.firefox.com
+*.sendspace.com
+*.slack.com
+*.smartsheet.com
+*.snip.ly
+*.thumbsnap.com
+*.tiny.cc
+*.tinypic.com
+*.tinyurl.com
+*.wetransfer.com
+*.wixstatic.com
+*.xpixl.me
+*.zdusercontent.com
+*.zippyshare.com
+bbuseruploads.s3.amazonaws.com
+bitbucket.org
+ddns.net
+hopto.org
+kinesis.*.amazonaws.com
+kriskintel.com
+mailchi.mp
+mandrillapp.com
+s3-*.amazonaws.com
+s3.*.amazonaws.com
+s3.amazonaws.com
+simp.ly
+sites.google.com
+sytes.net
+weebly.com
+zapto.org
diff --git a/pihole/blocklists/data/white.list b/pihole/blocklists/data/white.list
index 4b5b5e97..0f7e37bd 100755
--- a/pihole/blocklists/data/white.list
+++ b/pihole/blocklists/data/white.list
@@ -13,6 +13,10 @@ tagger.opecloud.com
 tags.tiqcdn.com
 www.asadcdn.com
 
+# Adobe
+# https://experienceleague.adobe.com/docs/audience-manager/user-guide/reference/demdex-calls.html
+*.demdex.net
+
 # Amazon
 *.amazon-adsystem.com
 *.amazon.ae
@@ -31,33 +35,16 @@ www.asadcdn.com
 *.amazonsilk.com
 *.media-amazon.com
 aan.amazon.com
-aax-eu-retail-direct.amazon-adsystem.com
-aax-eu.amazon-adsystem.com
-aax-us-east.amazon-adsystem.com
-aax.amazon-adsystem.amazon.com
+aax-*.amazon-adsystem.com
+aax.*.amazon.com
 aax.amazon-adsystem.com
 amazon-adsystem.com
 assoc-amazon.com
 aviary.amazon.de
 c.amazon-adsystem.com
-configuration-vending.service.amazonsilk.com
-fls-eu.amazon-adsystem.com
-fls-eu.amazon.ae
-fls-eu.amazon.co.uk
-fls-eu.amazon.com
-fls-eu.amazon.de
-fls-eu.amazon.es
-fls-eu.amazon.fr
-fls-eu.amazon.in
-fls-eu.amazon.it
-fls-eu.amazon.nl
-fls-eu.amazon.sa
-fls-eu.amazon.se
-fls-na.amazon.com.br
-fls-na.amazon.com.mx
-global.safebrowsing.service.amazonsilk.com
-kinesis.us-east-1.amazonaws.com
-mads-eu.amazon.com
+fls-*.amazon-adsystem.com
+fls-*.amazon.*
+mads-*.amazon.com
 mads.amazon-adsystem.com
 mads.amazon.com
 partnernet.amazon.de
@@ -65,37 +52,18 @@ s.amazon-adsystem.com
 
 # Amazon AWS
 bbuseruploads.s3.amazonaws.com
+kinesis.*.amazonaws.com
+s3-*.amazonaws.com
+s3.*.amazonaws.com
 s3.amazonaws.com
 
 # Amazon Devices (Alexa, Kindle, ...)
 a2z.com
-avs-alexa-1-na.amazon.com
-avs-alexa-13-na.amazon.com
-avs-alexa-14-eu.amazon.com
-avs-alexa-14-na.amazon.com
-avs-alexa-15-na.amazon.com
-avs-alexa-16-na.amazon.com
-avs-alexa-18-eu.amazon.com
-avs-alexa-18-fe.amazon.com
-avs-alexa-18-na.amazon.com
-avs-alexa-19-na.amazon.com
-avs-alexa-3-eu.amazon.com
-avs-alexa-3-na.amazon.com
-avs-alexa-4-eu.amazon.com
-avs-alexa-4-na.amazon.com
-avs-alexa-5-eu.amazon.com
-avs-alexa-5-na.amazon.com
-avs-alexa-6-eu.amazon.com
-avs-alexa-6-na.amazon.com
-avs-alexa-7-eu.amazon.com
-avs-alexa-7-na.amazon.com
+avs-alexa-*-*.amazon.com
 d3p8zr0ffa9t17.cloudfront.net
-device-metrics-us-2.amazon.com
-device-metrics-us.amazon.com
+device-metrics-*.amazon.com
 dxz5jxhrrzigf.cloudfront.net
-msh.amazon.co.uk
-msh.amazon.com
-msh.amazon.de
+msh.amazon.*
 prod.amcs-tachyon.com
 
 # Amazon Prime Video
@@ -114,15 +82,14 @@ dmqdd6hw24ucf.cloudfront.net
 
 # Apps (Mobile)
 app.link
-mobilesdk-us.kampyle.com
+mobilesdk-*.kampyle.com
 
 # Apple
 doh.dns.apple.com
 cstat.apple.com
 iphone-ld.apple.com
 iphone-ld.origin-apple.com.akadns.net
-ocsp.apple.com
-ocsp2.apple.com
+ocsp*.apple.com
 xp.apple.com
 
 # Cookies (Spiegel/...)
@@ -193,8 +160,7 @@ st.bahn.de
 *.dssott.com
 *.dssott.com.akamaized.net
 *.search-api-disney.bamgrid.com
-akamai-san24.exacttarget.com.edgekey.net
-akamai-san39.exacttarget.com.edgekey.net
+akamai-san*.exacttarget.com.edgekey.net
 e12906.dscx.akamaiedge.net
 exacttarget.com.edgekey.net
 image.mail.disneyplus.com
@@ -275,11 +241,15 @@ renderer.apester.com
 static.apester.com
 
 # Microsoft
+*.1drv.com
+*.activity.windows.com
+*.events.data.microsoft.com
 *.msedge.net
 *.office.com
 *.onedrive.com
+*.pipe.aria.microsoft.com
 *.teams.microsoft.com
-*.activity.windows.com
+*.vortex.data.microsoft.com
 arc.msn.com
 browser.events.data.microsoft.com
 click.email.microsoftrewards.com
@@ -324,18 +294,12 @@ www.msftconnecttest.com
 *.nflximg.net
 *.nflxso.net
 *.nflxvideo.net
-apiproxy-device-prod-nlb-3-a653f8a785200e05.elb.us-west-2.amazonaws.com
+apiproxy-device-prod-nlb-*.*.amazonaws.com
 customerevents.netflix.com
-dualstack.apiproxy-device-prod-nlb-1-4d12762d4ba53e45.elb.eu-west-1.amazonaws.com
-dualstack.apiproxy-device-prod-nlb-1-c582e7914e487bf4.elb.us-east-1.amazonaws.com
-dualstack.apiproxy-device-prod-nlb-2-300c995e1ce8a001.elb.us-east-1.amazonaws.com
-dualstack.apiproxy-device-prod-nlb-3-a6ae1986950e693f.elb.us-east-1.amazonaws.com
-dualstack.apiproxy-device-prod-nlb-3-d601e17f0cb54f72.elb.eu-west-1.amazonaws.com
-dualstack.apiproxy-device-prod-nlb-4-1f9e6a56738a49ec.elb.us-east-1.amazonaws.com
-dualstack.apiproxy-device-prod-nlb-4-f1dce6fa09ac5989.elb.eu-west-1.amazonaws.com
-dualstack.apiproxy-http1-199106617.us-east-1.elb.amazonaws.com
-dualstack.beaconserver-ce-vpc0-1537565064.eu-west-1.elb.amazonaws.com
-dualstack.ichnaea-web-121909266.us-east-1.elb.amazonaws.com
+dualstack.apiproxy-device-prod-*.elb.*.amazonaws.com
+dualstack.apiproxy-http1-*.*.elb.amazonaws.com
+dualstack.beaconserver-ce-*.*.elb.amazonaws.com
+dualstack.ichnaea-web-*.*.elb.amazonaws.com
 ichnaea-web.netflix.com
 ichnaea.netflix.com
 nrdp.prod.ftl.netflix.com
@@ -352,10 +316,7 @@ image.ccg.nintendo.net
 # n-tv
 *.damoh.n-tv.de
 *.ntvde.damoh.schneevonmorgen.com
-1.ntvde.damoh.schneevonmorgen.com
-2.ntvde.damoh.schneevonmorgen.com
-ssl.1.damoh.n-tv.de
-ssl.2.damoh.n-tv.de
+ssl.*.damoh.n-tv.de
 
 # NVidia
 events.gfe.nvidia.com
@@ -418,10 +379,9 @@ widgets.trustedshops.com
 *.sonyjpnpsg-1.hs.llnwd.net
 
 # Spotify
-*.audio-ak-spotify-com.akamaized.net
-*.audio-akp-bbr-spotify-com.akamaized.net
-*.audio4-ak-spotify-com.akamaized.net
-*.heads-ak-spotify-com.akamaized.net
+*.audio-*-spotify-com.akamaized.net
+*.audio4-*-spotify-com.akamaized.net
+*.heads-*-spotify-com.akamaized.net
 *.pscdn.co
 *.scdn.co
 *.spoti.fi
@@ -473,12 +433,12 @@ yrg6yks9.ab1n.net
 *.twitch.tv
 *.twitchcdn.net
 *.twitchsvc.net
-countess-prod-public-176850629.us-west-2.elb.amazonaws.com
+countess-prod-public-*.*.elb.amazonaws.com
 countess.twitch.tv
 ink1001.com
 mi.twitch.tv
-movable-ink-397.com
-science-edge-external-prod-73889260.us-west-2.elb.amazonaws.com
+movable-ink-*.com
+science-edge-external-prod-*.*.elb.amazonaws.com
 static-cdn.jtvnw.net
 supervisor.ext-twitch.tv
 
@@ -506,7 +466,7 @@ j.wfcdn.de
 *.webex.com.cn
 *.webex.com.edgekey.net
 *.webex.com.ssl.sc.omtrdc.net
-admin-webex-com-690861900.us-east-2.elb.amazonaws.com
+admin-webex-com-*.*.elb.amazonaws.com
 
 # XBox
 *.xbox.com
@@ -551,189 +511,6 @@ click.zoom.us
 log.zoom.us
 logfiles.zoom.us
 
-# Threat-Intelligence Exclusion (NextDNS)
-*.0rz.tw
-*.1drv.ms
-*.4shared.com
-*.archive.org
-*.arpa
-*.backblazeb2.com
-*.bit.do
-*.bit.ly
-*.bitly.com
-*.cl.ly
-*.cloud.ovh.net
-*.cutt.ly
-*.docs.google.com
-*.docs.zoho.com
-*.downloads.intercomcdn.com
-*.drive.google.com
-*.dropbox.com
-*.dropboxusercontent.com
-*.evernote.com
-*.file-upload.com
-*.filefactory.com
-*.files.1drv.com
-*.files.cloud.orange.fr
-*.forms.gle
-*.ghostbin.co
-*.gitlab.com
-*.googleusercontent.com
-*.imagebam.com
-*.imagehosting.biz
-*.imgbox.com
-*.imgur.com
-*.is.gd
-*.j.mp
-*.jsdelivr.net
-*.linktr.ee
-*.lnky.in
-*.mail.naver.com
-*.maven.org
-*.mediafire.com
-*.mega.nz
-*.on24.com
-*.onedrive.live.com
-*.ow.ly
-*.paste.ee
-*.pastebin.com
-*.pasteboard.co
-*.pastelink.net
-*.postimg.cc
-*.pxlme.me
-*.rb.gy
-*.rebrand.ly
-*.reurl.cc
-*.s.id
-*.send.firefox.com
-*.sendspace.com
-*.snip.ly
-*.thumbsnap.com
-*.tiny.cc
-*.tinypic.com
-*.tinyurl.com
-*.wetransfer.com
-*.wixstatic.com
-*.xpixl.me
-*.zdusercontent.com
-*.zippyshare.com
-ams3.digitaloceanspaces.com
-bitbucket.org
-ddns.net
-files.slack.com
-firebasestorage.googleapis.com
-hopto.org
-kriskintel.com
-mailchi.mp
-mandrillapp.com
-nyc3.digitaloceanspaces.com
-s3-af-south-1.amazonaws.com
-s3-ap-east-1.amazonaws.com
-s3-ap-northeast-1.amazonaws.com
-s3-ap-northeast-2.amazonaws.com
-s3-ap-northeast-3.amazonaws.com
-s3-ap-south-1.amazonaws.com
-s3-ap-southeast-1.amazonaws.com
-s3-ap-southeast-2.amazonaws.com
-s3-ca-central-1.amazonaws.com
-s3-cn-north-1.amazonaws.com
-s3-cn-northwest-1.amazonaws.com
-s3-eu-central-1.amazonaws.com
-s3-eu-north-1.amazonaws.com
-s3-eu-south-1.amazonaws.com
-s3-eu-west-1.amazonaws.com
-s3-eu-west-2.amazonaws.com
-s3-eu-west-3.amazonaws.com
-s3-sa-east-1.amazonaws.com
-s3-us-east-1.amazonaws.com
-s3-us-east-2.amazonaws.com
-s3-us-west-1.amazonaws.com
-s3-us-west-2.amazonaws.com
-s3-website-ap-northeast-1.amazonaws.com
-s3-website-ap-southeast-1.amazonaws.com
-s3-website-ap-southeast-2.amazonaws.com
-s3-website-eu-west-1.amazonaws.com
-s3-website-sa-east-1.amazonaws.com
-s3-website-us-east-1.amazonaws.com
-s3-website-us-west-1.amazonaws.com
-s3-website-us-west-2.amazonaws.com
-s3-website.af-south-1.amazonaws.com
-s3-website.ap-east-1.amazonaws.com
-s3-website.ap-northeast-2.amazonaws.com
-s3-website.ap-northeast-3.amazonaws.com
-s3-website.ap-south-1.amazonaws.com
-s3-website.ca-central-1.amazonaws.com
-s3-website.cn-northwest-1.amazonaws.com.cn
-s3-website.eu-central-1.amazonaws.com
-s3-website.eu-north-1.amazonaws.com
-s3-website.eu-south-1.amazonaws.com
-s3-website.eu-west-2.amazonaws.com
-s3-website.eu-west-3.amazonaws.com
-s3-website.us-east-2.amazonaws.com
-s3.af-south-1.amazonaws.com
-s3.ap-east-1.amazonaws.com
-s3.ap-northeast-1.amazonaws.com
-s3.ap-northeast-2.amazonaws.com
-s3.ap-northeast-3.amazonaws.com
-s3.ap-south-1.amazonaws.com
-s3.ap-southeast-1.amazonaws.com
-s3.ap-southeast-2.amazonaws.com
-s3.ca-central-1.amazonaws.com
-s3.cn-north-1.amazonaws.com
-s3.cn-northwest-1.amazonaws.com
-s3.dualstack.af-south-1.amazonaws.com
-s3.dualstack.ap-east-1.amazonaws.com
-s3.dualstack.ap-northeast-1.amazonaws.com
-s3.dualstack.ap-northeast-2.amazonaws.com
-s3.dualstack.ap-northeast-3.amazonaws.com
-s3.dualstack.ap-south-1.amazonaws.com
-s3.dualstack.ap-southeast-1.amazonaws.com
-s3.dualstack.ap-southeast-2.amazonaws.com
-s3.dualstack.ca-central-1.amazonaws.com
-s3.dualstack.cn-north-1.amazonaws.com
-s3.dualstack.cn-northwest-1.amazonaws.com
-s3.dualstack.eu-central-1.amazonaws.com
-s3.dualstack.eu-north-1.amazonaws.com
-s3.dualstack.eu-south-1.amazonaws.com
-s3.dualstack.eu-west-1.amazonaws.com
-s3.dualstack.eu-west-2.amazonaws.com
-s3.dualstack.eu-west-3.amazonaws.com
-s3.dualstack.sa-east-1.amazonaws.com
-s3.dualstack.us-east-1.amazonaws.com
-s3.dualstack.us-east-2.amazonaws.com
-s3.dualstack.us-west-1.amazonaws.com
-s3.dualstack.us-west-2.amazonaws.com
-s3.eu-central-1.amazonaws.com
-s3.eu-north-1.amazonaws.com
-s3.eu-south-1.amazonaws.com
-s3.eu-west-1.amazonaws.com
-s3.eu-west-2.amazonaws.com
-s3.eu-west-3.amazonaws.com
-s3.sa-east-1.amazonaws.com
-s3.us-east-1.amazonaws.com
-s3.us-east-2.amazonaws.com
-s3.us-west-1.amazonaws.com
-s3.us-west-2.amazonaws.com
-sfo2.digitaloceanspaces.com
-sgp1.digitaloceanspaces.com
-simp.ly
-sites.google.com
-storage.googleapis.com
-sytes.net
-weebly.com
-zapto.org
-
-# NextDNS
-*.cloud.answerhub.com
-*.gov
-*.inc.com
-*.lenta.ru
-*.smartsheet.com
-ae01.alicdn.com
-geo2.adobe.com
-get3.adobe.com
-teslarati-com-edge.ntv.io
-
 # Lokal
 *.fritz.box
 *.fritz.nas
@@ -797,12 +574,14 @@ www.*.cloudfront.net
 # False positive
 *.00110.citi.com
 *.static-webarchive.org
+*.wieistmeineip.de
 ad.nl
 bitmovin.com
 cdn.iobit.com
 clickhouse.com
 cloudfront.net
-demdex.net
+dee.su
+digi77.com
 esd.icloseli.com
 glitch.me
 glomex.com
@@ -810,18 +589,25 @@ go-mpulse.net
 ioam.de
 iobit.com
 ipapi.co
+ipredia.org
 mc-8c48dcd0-9dfd-4591-be7d-409340-headless-fd1.azurefd.net
 mimecast.com
+mofolinux.com
 mylivechat.com
 nextplatform.com
 online.com
 opecloud.com
+opera.com
 organicfruitapps.com
+parrotsec.org
 pcmatic.com
+polippix.org
+privacy-cd.org
 real-markt.de
 strato.de
+tails.boum.org
 visitor-badge.glitch.me
 watchlist-internet.at
-wieistmeineip.de
+whonix.org
 willhaben.at
 zomap.de
diff --git a/pihole/blocklists/data/white.list.important b/pihole/blocklists/data/white.list.important
index f0602ad8..a5de13a6 100755
--- a/pihole/blocklists/data/white.list.important
+++ b/pihole/blocklists/data/white.list.important
@@ -38,6 +38,9 @@ v20.events.data.microsoft.com
 cdn.zomap.de
 swankyrule.zomap.de
 
+# Spotify
+wl.spotify.com
+
 # Twitter
 analytics.twitter.com
 syndication.twitter.com
diff --git a/pihole/blocklists/data/white.list.referral b/pihole/blocklists/data/white.list.referral
index ef4defb7..c40ec655 100644
--- a/pihole/blocklists/data/white.list.referral
+++ b/pihole/blocklists/data/white.list.referral
@@ -1,3 +1,4 @@
+ink1001.com
 *.5014.xg4ken.com
 5014.xg4ken.com
 *.7eer.net