diff --git a/Source/domainset/reject_sukka.conf b/Source/domainset/reject_sukka.conf
index 9e411187..4159f9da 100644
--- a/Source/domainset/reject_sukka.conf
+++ b/Source/domainset/reject_sukka.conf
@@ -252,6 +252,26 @@ inst.360safe.com
 .dragonparking.com
 .minisplat.cn
 
+# --- Phishing ---
+
+.exaapi.com
+.actonservice.com
+.organiccrap.com
+.jungleheart.com
+.youdontcare.com
+.yourtrap.com
+.24houcryptowatcher.com
+.xsph.ru
+
+.temp.swtest.ru
+.tw1.ru
+.tarungdrajatsiokalama.com
+.cetusinvestmentsbtc.com
+.proenergy-engenharia.com
+.pages.net.br
+.myenotice.com
+.eu5.net
+
 # --- AD Block ---
 
 # >> General
@@ -649,6 +669,33 @@ t.yesware.com
 .eatcells.com
 comments.gazo.space
 
+.001www.com
+.16-b.it
+.32-b.it
+.64-b.it
+.crafting.xyz
+.ddnslive.com
+.dnsking.ch
+.dnsup.net
+.dynserv.org
+.forumz.info
+.freeddns.us
+.hicam.net
+.myiphost.com
+.mypi.co
+.now-dns.net
+.now-dns.org
+.now-dns.top
+.ntdll.top
+.ownip.net
+.soundcast.me
+.tcp4.me
+.vpndns.net
+.servebbs.net
+
+.3utilities.com
+.webhop.net
+
 # >> Tracking
 .mktg.tags.f5.com
 .trk.caseads.com
@@ -761,6 +808,56 @@ t.iwara.tv
 api-scout.vercel.app
 tracker.didiglobal.com
 
+# >> CNAME Tracking
+.b2bmktg.com
+.treker.fun
+.trekkww.fun
+.trekkww.space
+.trekkeeee.space
+.ubilab.me
+.freshalldaynews.com
+.bestandgreatests.com
+.jessunews.com
+.findgreatnews.com
+.wemakebestnews.com
+.km14hkusz.com
+.shockynews.com
+.jumronews.com
+.lookinews.com
+.huronews.com
+.tegronews.com
+.deeginews.com
+.gofenews.com
+.jemonews.com
+.guesswhatnews.com
+.luronews.com
+.reminews.com
+.groovinews.com
+.lootynews.com
+.rookinews.com
+.sifenews.com
+.karponews.com
+.ksrtmgoym.com
+.ruranews.com
+.leranews.com
+.bealanews.com
+.bestoffers-fe.com
+.bestoffers-wt.com
+.uho5m96ej.com
+.expobarrio.com
+.johncornell.com
+.hamdandates.com
+.espmp-nifr.net
+.carte-gr.total.fr
+.j74y03g8u.com
+.net.iberostar.com
+.kortfilmfestivalen.no
+.4puuqeh41.com
+.branch.rocks
+.5clo0xmbf.com
+.k3718qw08.com
+.j6t91e89q.com
+
 # >> Alexa
 data.alexa.com
 device-metrics-us.amazon.com
diff --git a/Source/non_ip/reject.conf b/Source/non_ip/reject.conf
index d4c00b52..3dc96b6b 100644
--- a/Source/non_ip/reject.conf
+++ b/Source/non_ip/reject.conf
@@ -1,37 +1,6 @@
 # $ meta_title Sukka's Ruleset - Reject Domains
 # $ meta_description The ruleset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining
 
-# --- Migrate from Reject Domainset due to Public Suffix List ---
-
-DOMAIN-SUFFIX,001www.com
-DOMAIN-SUFFIX,16-b.it
-DOMAIN-SUFFIX,32-b.it
-DOMAIN-SUFFIX,64-b.it
-DOMAIN-SUFFIX,crafting.xyz
-DOMAIN-SUFFIX,ddnslive.com
-DOMAIN-SUFFIX,dnsking.ch
-DOMAIN-SUFFIX,dnsup.net
-DOMAIN-SUFFIX,dynserv.org
-DOMAIN-SUFFIX,forumz.info
-DOMAIN-SUFFIX,freeddns.us
-DOMAIN-SUFFIX,hicam.net
-DOMAIN-SUFFIX,myiphost.com
-DOMAIN-SUFFIX,mypi.co
-DOMAIN-SUFFIX,now-dns.net
-DOMAIN-SUFFIX,now-dns.org
-DOMAIN-SUFFIX,now-dns.top
-DOMAIN-SUFFIX,ntdll.top
-DOMAIN-SUFFIX,ownip.net
-DOMAIN-SUFFIX,soundcast.me
-DOMAIN-SUFFIX,tcp4.me
-DOMAIN-SUFFIX,vpndns.net
-DOMAIN-SUFFIX,servebbs.net
-
-DOMAIN-SUFFIX,3utilities.com
-DOMAIN-SUFFIX,webhop.net
-
-# --- End of Migrate from Reject Domainset due to Public Suffix List ---
-
 # --- Blacklist ---
 
 # >> Crypto Coin Hive
@@ -86,75 +55,7 @@ DOMAIN-SUFFIX,telemetry-coverage.mozilla.org
 DOMAIN-SUFFIX,telemetry.mozilla.org
 DOMAIN-SUFFIX,incoming-telemetry.thunderbird.net
 
-# >> CNAME Tracking
-DOMAIN-SUFFIX,b2bmktg.com
-DOMAIN-SUFFIX,treker.fun
-DOMAIN-SUFFIX,trekkww.fun
-DOMAIN-SUFFIX,trekkww.space
-DOMAIN-SUFFIX,trekkeeee.space
-DOMAIN-SUFFIX,ubilab.me
-DOMAIN-SUFFIX,freshalldaynews.com
-DOMAIN-SUFFIX,bestandgreatests.com
-DOMAIN-SUFFIX,jessunews.com
-DOMAIN-SUFFIX,findgreatnews.com
-DOMAIN-SUFFIX,wemakebestnews.com
-DOMAIN-SUFFIX,km14hkusz.com
-DOMAIN-SUFFIX,shockynews.com
-DOMAIN-SUFFIX,jumronews.com
-DOMAIN-SUFFIX,lookinews.com
-DOMAIN-SUFFIX,huronews.com
-DOMAIN-SUFFIX,tegronews.com
-DOMAIN-SUFFIX,deeginews.com
-DOMAIN-SUFFIX,gofenews.com
-DOMAIN-SUFFIX,jemonews.com
-DOMAIN-SUFFIX,guesswhatnews.com
-DOMAIN-SUFFIX,luronews.com
-DOMAIN-SUFFIX,reminews.com
-DOMAIN-SUFFIX,groovinews.com
-DOMAIN-SUFFIX,lootynews.com
-DOMAIN-SUFFIX,rookinews.com
-DOMAIN-SUFFIX,sifenews.com
-DOMAIN-SUFFIX,karponews.com
-DOMAIN-SUFFIX,ksrtmgoym.com
-DOMAIN-SUFFIX,ruranews.com
-DOMAIN-SUFFIX,leranews.com
-DOMAIN-SUFFIX,bealanews.com
-DOMAIN-SUFFIX,bestoffers-fe.com
-DOMAIN-SUFFIX,bestoffers-wt.com
-DOMAIN-SUFFIX,uho5m96ej.com
-DOMAIN-SUFFIX,expobarrio.com
-DOMAIN-SUFFIX,johncornell.com
-DOMAIN-SUFFIX,hamdandates.com
-DOMAIN-SUFFIX,espmp-nifr.net
-DOMAIN-SUFFIX,carte-gr.total.fr
-DOMAIN-SUFFIX,j74y03g8u.com
-DOMAIN-SUFFIX,net.iberostar.com
-DOMAIN-SUFFIX,kortfilmfestivalen.no
-DOMAIN-SUFFIX,4puuqeh41.com
-DOMAIN-SUFFIX,branch.rocks
-DOMAIN-SUFFIX,5clo0xmbf.com
-DOMAIN-SUFFIX,k3718qw08.com
-DOMAIN-SUFFIX,j6t91e89q.com
-
 # >> Phishing
-DOMAIN-SUFFIX,exaapi.com
-DOMAIN-SUFFIX,actonservice.com
-DOMAIN-SUFFIX,organiccrap.com
-DOMAIN-SUFFIX,jungleheart.com
-DOMAIN-SUFFIX,youdontcare.com
-DOMAIN-SUFFIX,yourtrap.com
-DOMAIN-SUFFIX,24houcryptowatcher.com
-DOMAIN-SUFFIX,xsph.ru
-
-DOMAIN-SUFFIX,temp.swtest.ru
-DOMAIN-SUFFIX,tw1.ru
-DOMAIN-SUFFIX,tarungdrajatsiokalama.com
-DOMAIN-SUFFIX,cetusinvestmentsbtc.com
-DOMAIN-SUFFIX,proenergy-engenharia.com
-DOMAIN-SUFFIX,pages.net.br
-DOMAIN-SUFFIX,myenotice.com
-DOMAIN-SUFFIX,eu5.net
-
 DOMAIN-KEYWORD,pancakeswap
 DOMAIN-KEYWORD,fb-restriction-case
 DOMAIN-KEYWORD,fb-restriction-appeal