From 3f8de2aa5169d3c71e72bce1cbc6a43054a628ba Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Mon, 20 Apr 2020 03:50:02 +0200
Subject: [PATCH] Substantial syntax fix for AdGuard

---
 .../DandelionSproutsNorskeFiltre.tpl          |  5 +--
 .../NordicFiltersABP.txt                      | 31 ++++++---------
 .../NordicFiltersAdGuard.txt                  | 39 ++++++++-----------
 .../NordicFiltersBrave.txt                    |  4 +-
 .../NordicFiltersPrivacy.txt                  | 31 ++++++---------
 .../NordicFiltersPrivoxy.action               |  5 +--
 .../XYZPrepareFilters.py                      | 12 ++++++
 7 files changed, 55 insertions(+), 72 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl
index 4693c16e9..79781a622 100644
--- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
+++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
@@ -1,5 +1,5 @@
 msFilterList
-# Version: 15April2020v3-Alpha
+# Version: 20April2020v1-Alpha
 # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider
 # Translated title: Dandelion Sprout's Nordic filters for tidier websites
 : expires = 1
@@ -255,11 +255,8 @@ msFilterList
 # ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ———
 # https://github.com/easylist/easylist/issues/1861
 +d _prebid_
-# https://github.com/easylist/easylist/issues/5220
 # ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ———
 # Makes E-newspaper previews show up properly
-# ——— Caused by «AdGuard Base» ———
-# https://trolli.is/smitudum-faekkar-a-nordurlandi-vestra/
 # 🇳🇴 🇩🇰: ——— Anti-anti-reklameblokkering ———
 # 🇮🇸: ——— And-and-auglýsingshindrun ———
 # 🇬🇧: ——— Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273/were/to/specifically/mention/such/entries as a reason to be denied EasyList affiliation or native ABP inclusion ———
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt
index 683445401..a75ba9cc6 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
@@ -1,5 +1,5 @@
 [Adblock Plus 3.4]
-! Version: 150420203
+! Version: 200420201
 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus)
 ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus)
 ! Expires: 12 hours
@@ -90,7 +90,7 @@ momondo.no,monondo.dk##.type-provider.clearfix.flights
 nakenprat.com#$#abort-on-property-read document.dispatchEvent
 nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame))
 nettavisen.no#?#.story:-abp-has(.vignette)
-nettavisen.no#?#article:-abp-has(:scope > a[href*="?utm_source="])
+nettavisen.no#?#article:-abp-has(> a[href*="?utm_source="])
 nordlysid.fo###ease_adgroup_3
 nordlysid.fo##column[class*=ad-style]:not([collapse])
 norskenettsider.no###g_image4
@@ -373,7 +373,7 @@ avisen.dk##.Ad
 avvir.no##.avvir-block-top.avvir-block-container
 ba.no###cm2-1
 ba.no##.maelstrom-topbanner
-ba.no#?#.am-gridComp-item:-abp-has(:scope > .am-ad-item)
+ba.no#?#.am-gridComp-item:-abp-has(> .am-ad-item)
 bilnorge.no###artikkel300x250right
 bilnorge.no###nettboard_art1
 bilnorge.no#?#tr:-abp-has(td:-abp-contains(Annonse:))
@@ -416,7 +416,7 @@ dinside.no#?#.columns.small-8:-abp-has(div[id^=ad-netboard])
 diskusjon.no###diskusjon_toppbanner
 diskusjon.no##.prisguide-content
 dmi.dk##.add-container
-dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad)
+dmi.dk#?#.large-6:-abp-has(> .section-1-ad)
 dn.no##[id^=googlead-]:not(#googlead-toppbanner)
 dv.is##.adbox_310x400
 dv.is##.ticker
@@ -429,8 +429,7 @@ eavisa.com#?#.post-content > p:-abp-has(a[onclick^="javascript:window.open("])
 ebcontent.dk###ebcontentMegaboard
 ehandel.com##aside
 ekstrabladet.dk###manipulate_monster
-eurogamer.dk###leaderboard
-eurogamer.dk,nhi.no##.advert
+nhi.no##.advert
 euroinvestor.dk,valutakurser.dk###ctl00_BannerContainerTop
 eyjar.net##.hausad
 eyjar.net#?#.col-sm-12.col-md-8:-abp-has(a[href^="/ad/"])
@@ -450,7 +449,7 @@ finn.no##.ads__unit--banner
 finn.no##article[id^=ad-stream_]
 finn.no##div[id^=netboard_]
 finn.no#?#.ad-stream__unit:-abp-has(div[id*=google-ad])
-finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google])
+finn.no#?#div[class^=ads__unit]:-abp-has(> div[id^=ad-stream__google])
 finna.is##.augl
 fiskeribladet.no##div[id^=banner_billboard1_]
 forum.klikk.no##.ehm-megaboard
@@ -532,7 +531,7 @@ m.kanalfrederikshavn.dk##.OX
 markedsforing.dk##.articles-baner-content
 markedsforing.dk##.banner-annonce
 markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce])
-matoppskrift.no#?##sticky:-abp-has(:scope > .adsbygoogle)
+matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle)
 matoppskrift.no#?#.text-center:not(:-abp-has(img))
 mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid))
 medier24.no##.ad-toppbanner-article
@@ -544,7 +543,7 @@ min-mave.dk##.vspacer
 minmote.no##.ad-box
 minmote.no##.advert-container-inline
 minmote.no##.advert-horseshoe
-minmote.no#?#article:-abp-has(:scope > div[id^=advert-])
+minmote.no#?#article:-abp-has(> div[id^=advert-])
 mobil.nu,mobilkunden.dk##.tower
 nakenprat.com##.threadbit:not([id])
 nattogdag.no##.category-annonse
@@ -598,14 +597,14 @@ sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box
 sporttv.is#?#.box:-abp-has(div[class^=auglysing-])
 sporttv.is,utdanningsnytt.no##.banner-right
 startsiden.no##div[class*=advertisement_]
-startsiden.no#?#div[class*=articleContainer_]:-abp-has(:scope > div[data-ga-action$=_ad])
+startsiden.no#?#div[class*=articleContainer_]:-abp-has(> div[data-ga-action$=_ad])
 storm.no###topbanner
 studievalg.no###top-announce
 sva.no##.code-block-1
 sva.no#?#.widget_text:not(:-abp-has(a))
 sva.no#?#section:not(:-abp-has(a))
 sveip.net##.app_ad2
-sveip.net#?#div:-abp-has(:scope > ins.adsbygoogle)
+sveip.net#?#div:-abp-has(> ins.adsbygoogle)
 sveip.no##.notnews
 sysla.no##.ad-nexus-ad
 tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2)
@@ -677,7 +676,7 @@ tipsbladet.dk##.c-single__box-inset
 tipsbladet.dk##.col--lg-fixed-width-sidebar.col--xs-12
 bilnorge.no##td[colspan="7"][style]
 yrkesbil.no###nettboard_art1
-yrkesbil.no#?#td:-abp-has(:scope > noscript)
+yrkesbil.no#?#td:-abp-has(> noscript)
 yrkesbil.no#?#*:-abp-has(:scope > .forside_adholder)
 yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"])
 yrkesbil.no##td:empty
@@ -689,7 +688,7 @@ itavisen.no#?#*:-abp-has(:scope > .comcontent)
 m.feltet.dk##.banner_mobile
 klikk.no##.floatRight.columns
 veitingastadir.is##.footer_top > .footer-wrap > .columns
-bilasolur.is#?#.col-12:-abp-has(:scope > div[class*=advertisement-spot])
+bilasolur.is#?#.col-12:-abp-has(> div[class*=advertisement-spot])
 ||yrkesbil.no/gifs/*emty.gif^
 ||yrkesbil.no/gifs/1pix.gif^
 ||730.no/banner/*/sonymusic/$subdocument
@@ -846,17 +845,11 @@ krom.is#@#.share-container
 ! https://github.com/ryanbr/fanboy-adblock/issues/1243
 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid
 ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ———
-austurfrett.is#@#.middlead
 ! https://github.com/easylist/easylist/issues/1861
 @@_prebid_$domain=seher.no
-! https://github.com/easylist/easylist/issues/5220
-@@/nb_front.js$domain=molde.kommune.no
 ! ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ———
 ! Makes E-newspaper previews show up properly
 @@/teasers/*$domain=agderposten.no
-! ——— Caused by «AdGuard Base» ———
-! https://trolli.is/smitudum-faekkar-a-nordurlandi-vestra/
-trolli.is#@#iframe[width="300"][height="250"]
 
 ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ———
 ! 🇮🇸: ——— And-and-auglýsingshindrun ———
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt
index f9ef5be88..f6db3be84 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
@@ -1,4 +1,4 @@
-! Version: 15April2020v3
+! Version: 20April2020v1
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)
 ! Expires: 12 hours
@@ -91,7 +91,7 @@ momondo.no,monondo.dk##.type-provider.clearfix.flights
 nakenprat.com##+js(aopr, document.dispatchEvent)
 nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame))
 nettavisen.no#?#.story:-abp-has(.vignette)
-nettavisen.no#?#article:-abp-has(:scope > a[href*="?utm_source="])
+nettavisen.no#?#article:-abp-has(> a[href*="?utm_source="])
 nordlysid.fo###ease_adgroup_3
 nordlysid.fo##column[class*=ad-style]:not([collapse])
 norskenettsider.no###g_image4
@@ -385,7 +385,7 @@ avisen.dk##.Ad
 avvir.no##.avvir-block-top.avvir-block-container
 ba.no###cm2-1
 ba.no##.maelstrom-topbanner
-ba.no#?#.am-gridComp-item:-abp-has(:scope > .am-ad-item)
+ba.no#?#.am-gridComp-item:-abp-has(> .am-ad-item)
 bilnorge.no###artikkel300x250right
 bilnorge.no###nettboard_art1
 bilnorge.no#?#tr:-abp-has(td:-abp-contains(Annonse:))
@@ -428,7 +428,7 @@ dinside.no#?#.columns.small-8:-abp-has(div[id^=ad-netboard])
 diskusjon.no###diskusjon_toppbanner
 diskusjon.no##.prisguide-content
 dmi.dk##.add-container
-dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad)
+dmi.dk#?#.large-6:-abp-has(> .section-1-ad)
 dn.no###googlead-toppbanner:style(min-height: 0 !important)
 dn.no##[id^=googlead-]:not(#googlead-toppbanner)
 dv.is##.adbox_310x400
@@ -443,8 +443,7 @@ eavisa.com#?#.post-content > p:-abp-has(a[onclick^="javascript:window.open("])
 ebcontent.dk###ebcontentMegaboard
 ehandel.com##aside
 ekstrabladet.dk###manipulate_monster
-eurogamer.dk###leaderboard
-eurogamer.dk,nhi.no##.advert
+nhi.no##.advert
 euroinvestor.dk,valutakurser.dk###ctl00_BannerContainerTop
 eyjar.net##.hausad
 eyjar.net#?#.col-sm-12.col-md-8:-abp-has(a[href^="/ad/"])
@@ -464,7 +463,7 @@ finn.no##.ads__unit--banner
 finn.no##article[id^=ad-stream_]
 finn.no##div[id^=netboard_]
 finn.no#?#.ad-stream__unit:-abp-has(div[id*=google-ad])
-finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google])
+finn.no#?#div[class^=ads__unit]:-abp-has(> div[id^=ad-stream__google])
 finna.is##.augl
 fiskeribladet.no##div[id^=banner_billboard1_]
 forum.klikk.no##.ehm-megaboard
@@ -547,7 +546,7 @@ m.kanalfrederikshavn.dk##.OX
 markedsforing.dk##.articles-baner-content
 markedsforing.dk##.banner-annonce
 markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce])
-matoppskrift.no#?##sticky:-abp-has(:scope > .adsbygoogle)
+matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle)
 matoppskrift.no#?#.text-center:not(:-abp-has(img))
 mbl.is##.container:style(margin-top: 0px !important)
 mbl.is##.main-header:style(margin-top: 0px !important)
@@ -561,7 +560,7 @@ min-mave.dk##.vspacer
 minmote.no##.ad-box
 minmote.no##.advert-container-inline
 minmote.no##.advert-horseshoe
-minmote.no#?#article:-abp-has(:scope > div[id^=advert-])
+minmote.no#?#article:-abp-has(> div[id^=advert-])
 mobil.nu,mobilkunden.dk##.tower
 nakenprat.com##.threadbit:not([id])
 nakenprat.com#?##content:style(margin-left: 0px !important)
@@ -618,14 +617,14 @@ sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box
 sporttv.is#?#.box:-abp-has(div[class^=auglysing-])
 sporttv.is,utdanningsnytt.no##.banner-right
 startsiden.no##div[class*=advertisement_]
-startsiden.no#?#div[class*=articleContainer_]:-abp-has(:scope > div[data-ga-action$=_ad])
+startsiden.no#?#div[class*=articleContainer_]:-abp-has(> div[data-ga-action$=_ad])
 storm.no###topbanner
 studievalg.no###top-announce
 sva.no##.code-block-1
 sva.no#?#.widget_text:not(:-abp-has(a))
 sva.no#?#section:not(:-abp-has(a))
 sveip.net##.app_ad2
-sveip.net#?#div:-abp-has(:scope > ins.adsbygoogle)
+sveip.net#?#div:-abp-has(> ins.adsbygoogle)
 sveip.no##.notnews
 sysla.no##.ad-nexus-ad
 tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2)
@@ -671,7 +670,7 @@ utrop.no##.bottom-widead
 vafo.dk,folketidende.dk##.top_banner_container
 valutakurser.dk##.bottom_banner_div
 tek.no##body:before
-tek.no###topboard:upward(1)
+tek.no#?#*:-abp-has(> #topboard)
 varden.no##.top_banner
 vartoslo.no##.vo-annonse
 vb.is##.big_spons
@@ -702,19 +701,19 @@ tipsbladet.dk##.c-single__box-inset
 tipsbladet.dk##.col--lg-fixed-width-sidebar.col--xs-12
 bilnorge.no##td[colspan="7"][style]
 yrkesbil.no###nettboard_art1
-yrkesbil.no#?#td:-abp-has(:scope > noscript)
-yrkesbil.no##.forside_adholder:upward(1)
+yrkesbil.no#?#td:-abp-has(> noscript)
+yrkesbil.no#?#*:-abp-has(> .forside_adholder)
 yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"])
 yrkesbil.no##td:empty
 1881.no#?#.content:-abp-has(.ad-takeover)
 austurfrett.is##.upperad
 austurfrett.is##.lowerad
 e24.no##div[data-ad-subtype]
-itavisen.no##.comcontent:upward(1)
+itavisen.no#?#*:-abp-has(> .comcontent)
 m.feltet.dk##.banner_mobile
 klikk.no##.floatRight.columns
 veitingastadir.is##.footer_top > .footer-wrap > .columns
-bilasolur.is#?#.col-12:-abp-has(:scope > div[class*=advertisement-spot])
+bilasolur.is#?#.col-12:-abp-has(> div[class*=advertisement-spot])
 ||yrkesbil.no/gifs/*emty.gif^
 ||yrkesbil.no/gifs/1pix.gif^
 ||730.no/banner/*/sonymusic/$subdocument
@@ -878,17 +877,11 @@ krom.is#@#.share-container
 ! https://github.com/ryanbr/fanboy-adblock/issues/1243
 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid
 ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ———
-austurfrett.is#@#.middlead
 ! https://github.com/easylist/easylist/issues/1861
 @@_prebid_$domain=seher.no
-! https://github.com/easylist/easylist/issues/5220
-@@/nb_front.js$domain=molde.kommune.no
 ! ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ———
 ! Makes E-newspaper previews show up properly
 @@/teasers/*$domain=agderposten.no
-! ——— Caused by «AdGuard Base» ———
-! https://trolli.is/smitudum-faekkar-a-nordurlandi-vestra/
-trolli.is#@#iframe[width="300"][height="250"]
 
 ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ———
 ! 🇮🇸: ——— And-and-auglýsingshindrun ———
@@ -1033,7 +1026,7 @@ gamereactor.no,gamereactor.dk#@#.afs_ads
 ||media.gamereactor.dk/prerolls/*$media,redirect=noopmp3-0.1s,domain=gamereactor.no|gamereactor.dk
 ||openx.gamereactor.dk/multi.php?$important,script
 ||ssl.p.jwpcdn.com^*/gapro.js$important,script,domain=gamereactor.no|gamereactor.dk
-viafree.no,viafree.dk##.vjs-playing:upward(1) ~ .no-autoplay-overlay
+viafree.no,viafree.dk#?#*:-abp-has(> .vjs-playing) ~ .no-autoplay-overlay
 viafree.no,viafree.dk##.ad-click-through
 viafree.no,viafree.dk##.pause-ad
 viafree.no,viafree.dk##.pause-ad-container
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt
index d5b38454f..dc88b4390 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt	
@@ -1,5 +1,5 @@
 [Adblock Plus 3.4]
-! Version: 15April2020v3-Alpha
+! Version: 20April2020v1-Alpha
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Brave Browser)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Brave Browser)
 ! Expires: 12 hours
@@ -195,11 +195,9 @@ contentMarketing$xmlhttprequest,domain=sol.no
 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid
 ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ———
 @@_prebid_$domain=seher.no
-@@/nb_front.js$domain=molde.kommune.no
 ! ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ———
 ! Makes E-newspaper previews show up properly
 @@/teasers/*$domain=agderposten.no
-! ——— Caused by «AdGuard Base» ———
 ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ———
 ! 🇮🇸: ——— And-and-auglýsingshindrun ———
 ! 🇬🇧: ——— Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion ———
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt
index 57b3f5e33..360412df7 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt	
@@ -1,4 +1,4 @@
-! Version: 15April2020v3
+! Version: 20April2020v1
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings)
 ! Expires: 12 hours
@@ -91,7 +91,7 @@ momondo.*##.type-provider.clearfix.flights
 nakenprat.com##+js(aopr, document.dispatchEvent)
 nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame))
 nettavisen.no#?#.story:-abp-has(.vignette)
-nettavisen.no#?#article:-abp-has(:scope > a[href*="?utm_source="])
+nettavisen.no#?#article:-abp-has(> a[href*="?utm_source="])
 nordlysid.fo###ease_adgroup_3
 nordlysid.fo##column[class*=ad-style]:not([collapse])
 norskenettsider.no###g_image4
@@ -385,7 +385,7 @@ avisen.dk##.Ad
 avvir.no##.avvir-block-top.avvir-block-container
 ba.no###cm2-1
 ba.no##.maelstrom-topbanner
-ba.no#?#.am-gridComp-item:-abp-has(:scope > .am-ad-item)
+ba.no#?#.am-gridComp-item:-abp-has(> .am-ad-item)
 bilnorge.no###artikkel300x250right
 bilnorge.no###nettboard_art1
 bilnorge.no#?#tr:-abp-has(td:-abp-contains(Annonse:))
@@ -428,7 +428,7 @@ dinside.no#?#.columns.small-8:-abp-has(div[id^=ad-netboard])
 diskusjon.no###diskusjon_toppbanner
 diskusjon.no##.prisguide-content
 dmi.dk##.add-container
-dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad)
+dmi.dk#?#.large-6:-abp-has(> .section-1-ad)
 dn.no###googlead-toppbanner:style(min-height: 0 !important)
 dn.no##[id^=googlead-]:not(#googlead-toppbanner)
 dv.is##.adbox_310x400
@@ -443,8 +443,7 @@ eavisa.com#?#.post-content > p:-abp-has(a[onclick^="javascript:window.open("])
 ebcontent.dk###ebcontentMegaboard
 ehandel.com##aside
 ekstrabladet.dk###manipulate_monster
-eurogamer.*###leaderboard
-eurogamer.*,nhi.no##.advert
+nhi.no##.advert
 euroinvestor.dk,valutakurser.dk###ctl00_BannerContainerTop
 eyjar.net##.hausad
 eyjar.net#?#.col-sm-12.col-md-8:-abp-has(a[href^="/ad/"])
@@ -464,7 +463,7 @@ finn.no##.ads__unit--banner
 finn.no##article[id^=ad-stream_]
 finn.no##div[id^=netboard_]
 finn.no#?#.ad-stream__unit:-abp-has(div[id*=google-ad])
-finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google])
+finn.no#?#div[class^=ads__unit]:-abp-has(> div[id^=ad-stream__google])
 finna.is##.augl
 fiskeribladet.no##div[id^=banner_billboard1_]
 forum.klikk.no##.ehm-megaboard
@@ -547,7 +546,7 @@ m.kanalfrederikshavn.dk##.OX
 markedsforing.dk##.articles-baner-content
 markedsforing.dk##.banner-annonce
 markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce])
-matoppskrift.no#?##sticky:-abp-has(:scope > .adsbygoogle)
+matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle)
 matoppskrift.no#?#.text-center:not(:-abp-has(img))
 mbl.is##.container:style(margin-top: 0px !important)
 mbl.is##.main-header:style(margin-top: 0px !important)
@@ -561,7 +560,7 @@ min-mave.dk##.vspacer
 minmote.no##.ad-box
 minmote.no##.advert-container-inline
 minmote.no##.advert-horseshoe
-minmote.no#?#article:-abp-has(:scope > div[id^=advert-])
+minmote.no#?#article:-abp-has(> div[id^=advert-])
 mobil.nu,mobilkunden.dk##.tower
 nakenprat.com##.threadbit:not([id])
 nakenprat.com#?##content:style(margin-left: 0px !important)
@@ -618,14 +617,14 @@ sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box
 sporttv.is#?#.box:-abp-has(div[class^=auglysing-])
 sporttv.is,utdanningsnytt.no##.banner-right
 startsiden.no##div[class*=advertisement_]
-startsiden.no#?#div[class*=articleContainer_]:-abp-has(:scope > div[data-ga-action$=_ad])
+startsiden.no#?#div[class*=articleContainer_]:-abp-has(> div[data-ga-action$=_ad])
 storm.no###topbanner
 studievalg.no###top-announce
 sva.no##.code-block-1
 sva.no#?#.widget_text:not(:-abp-has(a))
 sva.no#?#section:not(:-abp-has(a))
 sveip.net##.app_ad2
-sveip.net#?#div:-abp-has(:scope > ins.adsbygoogle)
+sveip.net#?#div:-abp-has(> ins.adsbygoogle)
 sveip.no##.notnews
 sysla.no##.ad-nexus-ad
 tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2)
@@ -702,7 +701,7 @@ tipsbladet.dk##.c-single__box-inset
 tipsbladet.dk##.col--lg-fixed-width-sidebar.col--xs-12
 bilnorge.no##td[colspan="7"][style]
 yrkesbil.no###nettboard_art1
-yrkesbil.no#?#td:-abp-has(:scope > noscript)
+yrkesbil.no#?#td:-abp-has(> noscript)
 yrkesbil.no##.forside_adholder:upward(1)
 yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"])
 yrkesbil.no##td:empty
@@ -714,7 +713,7 @@ itavisen.no##.comcontent:upward(1)
 m.feltet.dk##.banner_mobile
 klikk.no##.floatRight.columns
 veitingastadir.is##.footer_top > .footer-wrap > .columns
-bilasolur.is#?#.col-12:-abp-has(:scope > div[class*=advertisement-spot])
+bilasolur.is#?#.col-12:-abp-has(> div[class*=advertisement-spot])
 ||yrkesbil.no/gifs/*emty.gif^
 ||yrkesbil.no/gifs/1pix.gif^
 ||730.no/banner/*/sonymusic/$subdocument
@@ -878,17 +877,11 @@ krom.is#@#.share-container
 ! https://github.com/ryanbr/fanboy-adblock/issues/1243
 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid
 ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ———
-austurfrett.is#@#.middlead
 ! https://github.com/easylist/easylist/issues/1861
 
-! https://github.com/easylist/easylist/issues/5220
-@@/nb_front.js$domain=molde.kommune.no
 ! ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ———
 ! Makes E-newspaper previews show up properly
 @@/teasers/*$domain=agderposten.no
-! ——— Caused by «AdGuard Base» ———
-! https://trolli.is/smitudum-faekkar-a-nordurlandi-vestra/
-trolli.is#@#iframe[width="300"][height="250"]
 
 ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ———
 ! 🇮🇸: ——— And-and-auglýsingshindrun ———
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action
index e7c737761..428700249 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
@@ -1,4 +1,4 @@
-# Version: 15April2020v3-Alpha
+# Version: 20April2020v1-Alpha
 # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy)
 # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy)
 # Expires: 12 hours
@@ -289,11 +289,8 @@ contentMarketing
 .ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid
 # ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ———
 # https://github.com/easylist/easylist/issues/1861
-# https://github.com/easylist/easylist/issues/5220
 # ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ———
 # Makes E-newspaper previews show up properly
-# ——— Caused by «AdGuard Base» ———
-# https://trolli.is/smitudum-faekkar-a-nordurlandi-vestra/
 #
 # 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ———
 # 🇮🇸: ——— And-and-auglýsingshindrun ———
diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index 0a5c17536..284239de8 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -178,6 +178,12 @@ def prepare_ag(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", 
+           r"\1#?#*:-abp-has(> \2)", 
+           line
+        )
+
         text += line + '\r\n'
 
     return text
@@ -572,6 +578,12 @@ def prepare_abp(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r":remove()", 
+           r"", 
+           line
+        )
+
         if is_supported_abp(line):
             text += line + '\r\n'