diff --git a/data/category-collaborate-cn b/data/category-collaborate-cn
index 431b6c83684..1f475611c0a 100644
--- a/data/category-collaborate-cn
+++ b/data/category-collaborate-cn
@@ -1,2 +1,17 @@
+# Remote Desktop
+## Oray
+oray.com
+oray.net
+orayer.com
+orayimg.com
+sunlogin.net
+
+## ToDesk
+todesk.com
+
+# Tower 团队协作
+tower.im
+
+
 shimo.im
 yuque.com
diff --git a/data/category-education-cn b/data/category-education-cn
index 005d5282e26..ba50bcc1e62 100644
--- a/data/category-education-cn
+++ b/data/category-education-cn
@@ -1,3 +1,5 @@
+include:category-mooc-cn
+
 include:17zuoye
 include:applysquare
 include:hujiang
@@ -7,7 +9,6 @@ include:xueersi
 include:yuanfudao
 include:zhihuishu
 
-
 # 雨课堂
 include:yuketang
 
@@ -24,6 +25,28 @@ xuetangx.com
 x-cloud.cc
 
 
+# 快对作业
+kuaiduizuoye.com
+
+# 流利说
+liulishuo.com
+llsapp.com
+llscdn.com
+llsserver.com
+
+# 百词斩
+baicizhan.com
+baicizhan.org
+bczcdn.com
+bczeducation.cn
+
+# 小站教育
+zhan.com
+
+# Burning Vocabulary
+burningvocabulary.cn
+burningvocabulary.com
+
 # 莞教通
 dgjy.net
 
@@ -47,3 +70,14 @@ pigai.org
 
 # 未来云校
 weilaiyunxiao.com
+
+# 马哥教育
+magedu.com
+
+# 老男孩教育
+oldboyedu.com
+
+# 在职研究生教育信息网
+eduei.com
+
+edu.cn
diff --git a/data/category-entertainment-cn b/data/category-entertainment-cn
new file mode 100644
index 00000000000..2b89f620abf
--- /dev/null
+++ b/data/category-entertainment-cn
@@ -0,0 +1,52 @@
+# Entertainment & Videos & Games & Music & Podcasts
+include:3dm
+include:4399
+include:acfun
+include:acplay
+include:ali213
+include:bilibili
+include:ciweimao
+include:cowlevel
+include:dedao
+include:dmzj
+include:douyu
+include:duitang
+include:gamersky
+include:gcores
+include:gitv
+include:huya
+include:iqiyi
+include:jinjiang
+include:ku6
+include:kuaikan
+include:kuaishou
+include:kugou
+include:le
+include:lizhi
+include:mfuns
+include:miaopai
+include:mihoyo-cn
+include:muwai
+include:pptv
+include:qingtingfm
+include:sfacg
+include:taomee
+include:tgbus
+include:tiancity
+include:u17
+include:vgtime
+include:xd
+include:ximalaya
+include:youku
+include:zhanqi
+
+# Enhance Gaming
+heavenlywind.cc
+steampp.net
+
+# Android Emulator
+lsplayer.com
+yeshen.com
+
+ledu.com
+wo1wan.com
diff --git a/data/category-food-cn b/data/category-food-cn
index 6dc5ecc0827..f00c6b4d222 100644
--- a/data/category-food-cn
+++ b/data/category-food-cn
@@ -1,5 +1,6 @@
 include:bestore
 include:heytea
+include:lkcoffee
 
 3songshu.com
 haidilao.com
diff --git a/data/category-httpdns b/data/category-httpdns
deleted file mode 100644
index d6218e3371b..00000000000
--- a/data/category-httpdns
+++ /dev/null
@@ -1,21 +0,0 @@
-dns.jd.com
-dns.weibo.cn
-dns.weixin.qq.com
-dns.weixin.qq.com.cn
-httpdns-api.aliyuncs.com
-httpdns-sc.aliyuncs.com
-httpdns.alicdn.com
-httpdns.baidu.com
-httpdns.baidubce.com
-httpdns.bcelive.com
-httpdns.bilivideo.com
-httpdns.c.cdnhwc2.com
-httpdns.meituan.com
-httpdns.music.163.com
-httpdns.n.netease.com
-httpdns.push.oppomobile.com
-httpdns.volcengineapi.com
-httpsdns.baidu.com
-kuaishou.httpdns.pro
-lofter.httpdns.c.163.com
-music.httpdns.c.163.com
diff --git a/data/category-httpdns-cn b/data/category-httpdns-cn
new file mode 100644
index 00000000000..dd6c7327f2b
--- /dev/null
+++ b/data/category-httpdns-cn
@@ -0,0 +1,68 @@
+# Aliyun
+httpdns-api.aliyuncs.com @ads
+httpdns-sc.aliyuncs.com @ads
+httpdns.alicdn.com @ads
+
+# Baidu
+httpdns.baidu.com @ads
+httpdns.baidubce.com @ads
+httpdns.bcelive.com @ads
+httpdns.n.shifen.com @ads
+httpsdns.baidu.com @ads
+
+# Huawei Cloud
+httpdns-browser.platform.dbankcloud.cn @ads
+httpdns.c.cdnhwc2.com @ads
+httpdns.huaweicloud.com @ads
+httpdns.platform.dbankcloud.cn @ads
+httpdns.platform.dbankcloud.com @ads
+httpdns1.cc.cdnhwc5.com @ads
+
+# iqiyi
+dns.iqiyi.com @ads
+dns.qiyipic.iqiyi.com @ads
+doh.iqiyi.com @ads
+
+# Kuaishou
+hdns.ksyun.com @ads
+kuaishou.httpdns.pro @ads
+
+# Meituan
+httpdns.meituan.com @ads
+httpdnsvip.meituan.com @ads
+
+# NetEase
+httpdns-sdk.n.netease.com @ads
+httpdns.music.163.com @ads
+httpdns.n.netease.com @ads
+lofter.httpdns.c.163.com @ads
+music.httpdns.c.163.com @ads
+
+# Oppo
+httpdns.push.oppomobile.com @ads
+httpdns.ocloud.oppomobile.com @ads
+
+# Tencent
+dns.weixin.qq.com @ads
+dns.weixin.qq.com.cn @ads
+httpdns.kg.qq.com @ads
+
+# HeyTap
+httpdns.ocloud.heytapmobi.com @ads
+httpdns.push.heytapmobi.com @ads
+
+apidns.kwd.inkuai.com @ads
+dns.jd.com @ads
+dns.weibo.cn @ads
+doh.ptqy.gitv.tv @ads
+dotserver.douyucdn.cn @ads
+httpdns.bilivideo.com @ads
+httpdns.browser.miui.com @ads
+httpdns.cctv.com @ads
+httpdns.danuoyi.tbcache.com @ads
+httpdns.gslb.yy.com @ads
+httpdns.kwd.inkuai.com @ads
+httpdns.pro @ads
+httpdns.volcengineapi.com @ads
+httpdns.yunxindns.com @ads
+httpdns.zybang.com @ads
diff --git a/data/category-social-media-cn b/data/category-social-media-cn
index 3a20cc2990a..d18a4b4c49c 100644
--- a/data/category-social-media-cn
+++ b/data/category-social-media-cn
@@ -5,6 +5,7 @@ include:douban
 include:gracg
 include:sina
 include:xiaohongshu
+include:yy
 include:zhihu
 
 tieba.baidu.com
diff --git a/data/category-wiki-cn b/data/category-wiki-cn
index 311c629e38f..e0044ee1779 100644
--- a/data/category-wiki-cn
+++ b/data/category-wiki-cn
@@ -1,6 +1,17 @@
 fgo.wiki
+jikipedia.com
+mbalib.com
+qiuwen.wiki
+sec-wiki.com
+shidianbaike.com
+
+# huijiwiki
 huijistatic.com
 huijiwiki.com
-mbalib.com
+
+# moegirl
 moegirl.org
 moegirl.org.cn
+
+# MC百科
+mcmod.cn
diff --git a/data/geolocation-cn b/data/geolocation-cn
index d3995223c66..4373e0e21f0 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -76,60 +76,6 @@ include:vancl
 include:youzan
 include:ziroom
 
-# Enhance Gaming
-heavenlywind.cc
-steampp.net
-
-# Android Emulator
-lsplayer.com
-yeshen.com
-
-# Entertainment & Videos & Games & Music & Podcasts
-include:3dm
-include:4399
-include:acfun
-include:acplay
-include:ali213
-include:bilibili
-include:ciweimao
-include:cowlevel
-include:dedao
-include:dmzj
-include:douyu
-include:duitang
-include:gamersky
-include:gcores
-include:gitv
-include:huya
-include:iqiyi
-include:jinjiang
-include:ku6
-include:kuaikan
-include:kuaishou
-include:kugou
-include:le
-include:lizhi
-include:mfuns
-include:miaopai
-include:mihoyo-cn
-include:muwai
-include:pptv
-include:qingtingfm
-include:sfacg
-include:taomee
-include:tgbus
-include:tiancity
-include:u17
-include:vgtime
-include:xd
-include:xiaohongshu
-include:ximalaya
-include:youku
-include:yy
-include:zhanqi
-
-wo1wan.com
-
 # Forums
 include:chiphell
 include:erji
@@ -157,8 +103,8 @@ include:category-game-accelerator-cn
 # IP 定位网站
 include:ipip
 
-# HTTPDNS
-include:category-httpdns
+# category-httpdns-cn is mainly for advertising purpose
+# include:category-httpdns-cn
 
 # Infinity Pro
 infinitynewtab.com
@@ -167,28 +113,6 @@ inftab.com
 ip138.com
 ipplus360.com # 豫ICP备17017462号-1 埃文科技
 
-# 快对作业
-kuaiduizuoye.com
-
-# 流利说
-liulishuo.com
-llsapp.com
-llscdn.com
-llsserver.com
-
-# 百词斩
-baicizhan.com
-baicizhan.org  
-bczcdn.com     
-bczeducation.cn
-
-# 小站教育
-zhan.com
-
-# Burning Vocabulary
-burningvocabulary.cn
-burningvocabulary.com
-
 # 423Down
 423down.com
 
@@ -198,9 +122,6 @@ ghxi.com
 # Logistics
 include:sf-express
 
-# MC百科
-mcmod.cn
-
 # Media & News & Press
 include:category-media-cn
 
@@ -223,12 +144,8 @@ include:category-network-security-cn
 # Organizations
 include:category-hospital-cn
 
-# 瑞幸咖啡
-include:lkcoffee
-
 # Science & Technology & Knowledge & Scholar & Press & E-learning & Education
 include:category-education-cn
-include:category-mooc-cn
 include:category-scholar-cn
 include:category-wiki-cn
 include:cugbonline
@@ -284,9 +201,6 @@ include:zhangtao
 
 mihuashi.com # 米畫師
 
-# Tower 团队协作
-tower.im
-
 # 沃丰科技
 udesk.cn
 
@@ -334,11 +248,6 @@ include:chinamobile
 include:chinatelecom
 include:chinaunicom
 
-# Wiki
-jikipedia.com
-qiuwen.wiki
-shidianbaike.com
-
 # 信息学
 include:51nod
 
@@ -773,8 +682,6 @@ ebico.com
 ebrun.com
 ecitic.com
 ecjobhome.com
-edu.cn
-eduei.com
 eeyy.com
 eflycloud.com
 elecfans.com
@@ -1002,7 +909,6 @@ lascn.net
 lawxp.com
 leangoo.com
 leanote.com
-ledu.com
 leikeji.com
 leiphone.com
 leiting.com
@@ -1116,7 +1022,6 @@ oicq88.com
 okooo.com
 ol-cdn.com
 ol-img.com
-oldboyedu.com
 oneapm.com
 onegreen.net
 oneyac.com
@@ -1191,7 +1096,6 @@ scdng.com
 scoregg.com
 sczsxx.com
 sdo.com
-sec-wiki.com
 sencdn.com
 seniverse.com
 senlinjimore.com # 鲁ICP备20001333号 森林集