diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl
index 8ecafc325..fab00c58d 100644
--- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
+++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
@@ -1,6 +1,6 @@
 msFilterList
-# Version: 05June2019v1-Beta
-# Version: 050620191 (for Adblock Plus' issue report system)
+# Version: 05June2019v2-Beta
+# Version: 050620192 (for Adblock Plus' issue report system)
 # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider
 # Translated title: Dandelion Sprout's Nordic filters for tidier websites
 # expires = 1
@@ -71,7 +71,7 @@ msFilterList
 # Ads (Section under construction)
 
 
--d ad1.emediate.dk
+
 
 
 
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt
index 2aa801ab2..145854089 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
@@ -1,8 +1,8 @@
 [Adblock Plus 3.2]
-! Version: 05June2019v1
-! Version: 050620191 (for Adblock Plus' issue report system)
-! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus)
-! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and AdBlock Plus)
+! Version: 05June2019v2
+! Version: 050620192 (for Adblock Plus' issue report system)
+! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock and Adblock Plus)
+! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus)
 ! Expires: 12 hours
 
 ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md
@@ -383,7 +383,7 @@ xstra.no##.td-fix-index
 ##.sponset-innlegg
 ||ad.*.no^
 ||ad1.*.no^
-||ad1.emediate.dk
+||ad1.*.dk^
 ||adcache.*.no^
 ||ads.*.no^
 ||ads.*.dk^
@@ -630,9 +630,9 @@ tv2.no###tv2_8533699
 tv2.no##.lab-skin-cm.medium-4.small-12.large-4.boxwrapper.tv2-story
 tv2.no##.doubleClickAd
 tv2.no##a[href*="&utm_source=Blogg"]
-@@||www.tv2.no/s/js/ads.js$script,~third-party
+@@||www.tv2.no/s/js/ads.js$script,~3p
 ! ↓ Attempting to fix a problem with voting online on Idol Norway when using EasyPrivacy. ↓
-@@||tv2.no/*/config/analytics.json$first-party
+@@||tv2.no/*/config/analytics.json$~third-party
 
 ! Nettavisen
 ! It was difficult to place the line between adticles that had educational values and which ones that didn't, but I feel I did a decent job at it
@@ -743,7 +743,7 @@ fiskeribladet.no##.teaser_overlay
 @@||bondebladet.screen9.tv^$generichide
 @@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk
 csp.screen9.com#@#.adsbox
-@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.dk|viafree.no
+@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.dk|viafree.no
 @@||sixscissors.com^$third-party,domain=itavisen.no
 langaa-guiden.dk,madforfattigroeve.dk##div[class][style^="z-index: 999999; background: rgba"]
 langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opacity"]
@@ -858,7 +858,7 @@ google.no,google.dk,google.is##.rlfl__tls > div[jstcache="0"]:not([class]):not([
 ||fwmrm.net/p/MTG_Live/LinkTag2.js$script,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
 ||fwmrm.net^$image,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
 ||openx.gamereactor.dk/multi.php?$script
-@@||tv2.no/*/config/analytics.json$xmlhttprequest,first-party
+@@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party
 ||ssl.p.jwpcdn.com^*/jwpsrv.js,script,domain=vg.no
 ||ssl.p.jwpcdn.com^*/vast.js,script,domain=vg.no
 ||gamereactor.*/lay/ad-video-stats.js^$script
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt
index 7be27b832..98ceb706d 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
@@ -1,5 +1,5 @@
 [AdGuard ≥6]
-! Version: 05June2019v1
+! Version: 05June2019v2
 
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)
@@ -384,7 +384,7 @@ xstra.no##.td-fix-index
 ##.sponset-innlegg
 ||ad.*.no^
 ||ad1.*.no^
-||ad1.emediate.dk
+||ad1.*.dk^
 ||adcache.*.no^
 ||ads.*.no^
 ||ads.*.dk^
@@ -632,9 +632,9 @@ tv2.no###tv2_8533699
 tv2.no##.lab-skin-cm.medium-4.small-12.large-4.boxwrapper.tv2-story
 tv2.no##.doubleClickAd
 tv2.no##a[href*="&utm_source=Blogg"]
-@@||www.tv2.no/s/js/ads.js$script,~third-party
+@@||www.tv2.no/s/js/ads.js$script,~3p
 ! ↓ Attempting to fix a problem with voting online on Idol Norway when using EasyPrivacy. ↓
-@@||tv2.no/*/config/analytics.json$first-party
+@@||tv2.no/*/config/analytics.json$~third-party
 
 ! Nettavisen
 ! It was difficult to place the line between adticles that had educational values and which ones that didn't, but I feel I did a decent job at it
@@ -745,7 +745,7 @@ fiskeribladet.no##.teaser_overlay
 @@||bondebladet.screen9.tv^$generichide
 @@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk
 csp.screen9.com#@#.adsbox
-@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.dk|viafree.no
+@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.dk|viafree.no
 @@||sixscissors.com^$third-party,domain=itavisen.no
 langaa-guiden.dk,madforfattigroeve.dk##div[class][style^="z-index: 999999; background: rgba"]
 langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opacity"]
@@ -927,7 +927,7 @@ no##.polarisSpid.widget:before
 ||fwmrm.net/p/MTG_Live/LinkTag2.js$script,important,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
 ||fwmrm.net^$image,important,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
 ||openx.gamereactor.dk/multi.php?$script,important
-@@||tv2.no/*/config/analytics.json$xmlhttprequest,first-party
+@@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party
 ||ssl.p.jwpcdn.com^*/jwpsrv.js$important,script,domain=vg.no
 ||ssl.p.jwpcdn.com^*/vast.js$important,script,domain=vg.no
 ||damoh.vgtv.no/hic_qos$script,redirect=noopjs,domain=vg.no
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt
index ef50353c2..bfc2b40f7 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt	
@@ -1,5 +1,5 @@
 
-! Version: 05June2019v1
+! Version: 05June2019v2
 
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings)
@@ -85,8 +85,8 @@
 @@||api.instagram.com^$domain=www.samiteahter.org
 @@||fagbladetjournalen.no/*/300x250_
 @@||fwmrm.net/*MTG$script,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
-@@||fwmrm.net/ad/$xmlhttprequest,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
-@@||playapi.mtgx.tv/*/adinfo?$xmlhttprequest,domain=viafree.no|viafree.dk
+@@||fwmrm.net/ad/$xhr,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
+@@||playapi.mtgx.tv/*/adinfo?$xhr,domain=viafree.no|viafree.dk
 @@||seher.no/reise$generichide
 aftenbladet.no##.brandboard-ad
 aftenbladet.no##.netboard-ad
@@ -299,7 +299,7 @@ xlmoto.no##.sb-overlay
 xxl.no##.aboveheader.c-fader
 ||8m.com/fs_img/bannertype/
 ||boligsamvirket.no/promsys/
-||client-stream-events.mtg-api.com/client-stream-events/event/viafree/$xmlhttprequest,domain=viafree.se|viafree.no|viafree.dk|viafree.fi
+||client-stream-events.mtg-api.com/client-stream-events/event/viafree/$xhr,domain=viafree.se|viafree.no|viafree.dk|viafree.fi
 ||cluster.chart.dk
 ||dk-ekstrabladet.vp.videoplaza.tv
 ||dk.panel.gemius.dk
@@ -384,7 +384,7 @@ xstra.no##.td-fix-index
 ##.sponset-innlegg
 ||ad.*.no^
 ||ad1.*.no^
-||ad1.emediate.dk
+||ad1.*.dk^
 ||adcache.*.no^
 ||ads.*.no^
 ||ads.*.dk^
@@ -405,8 +405,8 @@ xstra.no##.td-fix-index
 ||track.adform.net/Banners/
 ||tvshop.com/tradedoubler_files/
 ||bornholm.nu/nonsec/banner$image
-||delivered-by-madington.com^$third-party
-||media.sonymusic.no/marketing/*.html$subdocument,third-party
+||delivered-by-madington.com^$3p
+||media.sonymusic.no/marketing/*.html$subdocument,3p
 -bazaar-$script,domain=nettavisen.no
 /bazaar/*$script,domain=nettavisen.no
 .dk/ad/
@@ -632,7 +632,7 @@ tv2.no###tv2_8533699
 tv2.no##.lab-skin-cm.medium-4.small-12.large-4.boxwrapper.tv2-story
 tv2.no##.doubleClickAd
 tv2.no##a[href*="&utm_source=Blogg"]
-@@||www.tv2.no/s/js/ads.js$script,~third-party
+@@||www.tv2.no/s/js/ads.js$script,~3p
 ! ↓ Attempting to fix a problem with voting online on Idol Norway when using EasyPrivacy. ↓
 
 
@@ -701,7 +701,7 @@ nettavisen.no##.stuck
 nettavisen.no##.sticked
 nettavisen.no###ad_top
 itavisen.no##.social
-||sannsyn.com^$third-party
+||sannsyn.com^$3p
 aftenbladet.no,aftenposten.no,bt.no,e24.no,fvn.no##[style="cursor: pointer;"]
 alternativ-media.com##.wpa
 ektenyheter.no##.cm-message
@@ -746,7 +746,7 @@ fiskeribladet.no##.teaser_overlay
 @@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk
 csp.screen9.com#@#.adsbox
 @@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.dk|viafree.no
-@@||sixscissors.com^$third-party,domain=itavisen.no
+@@||sixscissors.com^$3p,domain=itavisen.no
 langaa-guiden.dk,madforfattigroeve.dk##div[class][style^="z-index: 999999; background: rgba"]
 langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opacity"]
 ||elderlyscissors.com^
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action
index 4163e525b..b26f63d81 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
@@ -1,6 +1,6 @@
 {+block}
-# Version: 05June2019v1-Alpha
-# Version: 050620191 (for Adblock Plus' issue report system)
+# Version: 05June2019v2-Alpha
+# Version: 050620192 (for Adblock Plus' issue report system)
 # 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
@@ -63,7 +63,7 @@
 # Ads (Section under construction)
 .ad.*.no
 .ad1.*.no
-.ad1.emediate.dk
+.ad1.*.dk
 .adcache.*.no
 .ads.*.no
 .ads.*.dk
diff --git a/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py b/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py
index 482bce9f9..464d805fd 100644
--- a/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py	
+++ b/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py	
@@ -35,17 +35,11 @@ def prepare_ag(lines) -> str:
            r"\$doc.*", 
            "$empty,important", 
            line
-       )
-
-        line = re.sub(
-           "Dandelion Sprouts nordiske filtre for ryddigere nettsider", 
-           "Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)", 
-           line
         )
 
         line = re.sub(
-           "Dandelion Sprout's Nordic filters for tidier websites", 
-           "Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)", 
+           r"(itle:.*Dandelion Sprout.*)", 
+           r"\1 (for AdGuard)", 
            line
         )
 
@@ -67,6 +61,24 @@ def prepare_ag(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"([$,])xhr", 
+           r"\1xmlhttprequest", 
+           line
+        )
+
+        line = re.sub(
+           r"([$,])3p", 
+           r"\1third-party", 
+           line
+        )
+
+        line = re.sub(
+           r"([$,])1p", 
+           r"\1~third-party", 
+           line
+        )
+
         text += line + '\r\n'
 
     return text
@@ -94,37 +106,19 @@ def prepare_abp(lines) -> str:
 
         # remove $important modifier from the rule
         line = re.sub(
-           r",important", 
+           r"([$,])important", 
            "", 
            line
         )
 
         line = re.sub(
-           r"\$important", 
-           "", 
+           r"(itle:.*Dandelion Sprout.*)", 
+           r"\1 (for AdBlock and Adblock Plus)", 
            line
         )
 
         line = re.sub(
-           "Dandelion Sprouts nordiske filtre for ryddigere nettsider", 
-           "Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus)", 
-           line
-        )
-
-        line = re.sub(
-           "Dandelion Sprout's Nordic filters for tidier websites", 
-           "Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and AdBlock Plus)", 
-           line
-        )
-
-        line = re.sub(
-           r"!#if.*", 
-           "", 
-           line
-        )
-
-        line = re.sub(
-           r"!#endif", 
+           r"!#.*", 
            "", 
            line
         )
@@ -141,6 +135,24 @@ def prepare_abp(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"([$,])xhr", 
+           r"\1xmlhttprequest", 
+           line
+        )
+
+        line = re.sub(
+           r"([$,])3p", 
+           r"\1third-party", 
+           line
+        )
+
+        line = re.sub(
+           r"([$,])1p", 
+           r"\1~third-party", 
+           line
+        )
+
         if is_supported_abp(line):
             text += line + '\r\n'