category-scholar-uk: include oup

* category-companies: remove some unnecessary inclusion

anthropic, groq, openai, perplexity and xai are included in category-ai-!cn

* category-dev: merge imageglass and mpv

* category-media: remove inclusion of tver

tver is included in category-entertainment

* accuweather: add awxcdn.com

data/2ch

@@ -1,2 +1,4 @@
 2ch.hk
-2ch.life
+2ch.life
+2ch.org
+2ch.su

data/3dm

@@ -1 +0,0 @@
-3dmgame.com

data/3type

@@ -1 +0,0 @@
-3type.cn

data/4paradigm

@@ -1 +0,0 @@
-4paradigm.com

data/accuweather

@@ -1 +1,2 @@
 accuweather.com
+awxcdn.com

data/ali213

@@ -1 +0,0 @@
-ali213.net

data/antutu

@@ -1 +0,0 @@
-antutu.com

data/authy

@@ -1 +0,0 @@
-authy.com

data/b3log

@@ -1 +1,5 @@
+# 云南链滴科技有限公司 滇ICP备14007358号
 b3log.org
+b3logfile.com
+hacpai.com
+ld246.com

data/baijiayun

@@ -1 +0,0 @@
-baijiayun.com

data/canva

@@ -0,0 +1,7 @@
+# affinity
+affinity.api.serifservices.com
+affinity.studio
+affinity-beta.s3.amazonaws.com
+affinity-lessons.s3.amazonaws.com
+
+canva.com

data/category-companies

@@ -2,12 +2,10 @@
 
 include:acer
 include:adobe
-include:agilebits
 include:alibabacloud
 include:amazon
 include:amd
 include:anexia
-include:anthropic
 include:apple
 include:asus
 include:atlassian
@@ -17,6 +15,7 @@ include:bandwagonhost
 include:blurams
 include:broadcom
 include:canon
+include:canva
 include:chegg
 include:cisco
 include:cloudcone
@@ -32,7 +31,6 @@ include:giffgaff
 include:gigabyte
 include:godaddy
 include:google
-include:groq
 include:hetzner
 include:hinet
 include:hkbn
@@ -43,6 +41,7 @@ include:ibm
 include:ibkr
 include:inshot
 include:intel
+include:intuit
 include:ixsystems
 include:kakao
 include:kaspersky
@@ -60,12 +59,10 @@ include:mxroute
 include:naver
 include:neuralink
 include:nvidia
-include:openai
 include:openweather
 include:oracle
 include:panasonic
 include:pccw
-include:perplexity
 include:qnap
 include:qualcomm
 include:qwant
@@ -93,7 +90,6 @@ include:westerndigital
 include:wisekey
 include:yahoo
 include:yandex
-include:xai
 
 # Remote Control
 include:category-remote-control

data/category-dev

@@ -100,6 +100,7 @@ greenend.org.uk
 
 hex.pm
 hexdocs.pm
+imageglass.org
 ius.io
 jenkins.io
 js.org
@@ -115,6 +116,7 @@ mingw.org
 # Mobatek official website.
 mobatek.net
 
+mpv.io
 mysql.com
 neovim.io
 nixos.org

data/category-dev-cn

@@ -8,7 +8,6 @@ include:deepin
 include:gitee
 include:goproxy
 include:huawei-dev
-include:jinrishici
 include:juejin
 include:kuaiyikeji
 include:oschina
@@ -18,6 +17,7 @@ include:rubychina
 include:segmentfault
 include:sxl
 include:tencent-dev
-include:tipdm
 include:ubuntukylin
-include:xueyuanjun
+
+jinrishici.com
+tipdm.org

data/category-education-cn

@@ -8,7 +8,6 @@ include:koolearn
 include:shanbay
 include:xueersi
 include:yuanfudao
-include:zhihuishu
 
 # 教育部学生服务与素质发展中心
 # 京ICP备19004913号
@@ -39,6 +38,16 @@ qgzb.net
 zbbm.gov.cn
 zbbm.net
 
+# 中国地质大学 继续教育学院
+cugbonline.cn
+
+# 智慧树
+zhihuishu.com
+
+# 日语测试
+j-test.com
+nattest-china.com
+
 # 雨课堂
 include:yuketang
 

data/category-enhance-gaming

@@ -4,6 +4,7 @@ include:trackernetwork
 
 # Android Emulator
 bluestacks.com
+ldmnq.com @cn
 lsplayer.com @cn
 yeshen.com @cn
 

data/category-enterprise-query-platform-cn

@@ -1,8 +1,8 @@
 include:aiqicha
-include:hongdunwang
 include:qcc
-include:qichamao
 include:qixin
-include:qyyjt
 include:tianyancha
-include:x315
+
+qichamao.com
+qyyjt.cn
+x315.com

data/category-entertainment-cn

@@ -2,27 +2,22 @@
 
 include:category-games-cn
 
-include:3dm
 include:acfun
 include:acplay
-include:ali213
 include:bestv
 include:bilibili
 include:ciweimao
 include:dedao
-include:dmzj
 include:douyin
 include:douyu
 include:duitang
 include:fengxing
 include:fqnovel
 include:gamersky
-include:gcores
 include:gitv
 include:hunantv
 include:huya
 include:iqiyi
-include:jinjiang
 include:ku6
 include:kuaikan
 include:kuaishou
@@ -30,23 +25,19 @@ include:kugou
 include:kuwo
 include:le
 include:lizhi
-include:mfuns
-include:miaopai
-include:muwai
 include:pptv
 include:qimao
 include:qingtingfm
 include:sakurafrp
-include:sfacg
 include:taomee
 include:u17
 include:wasu
 include:xiaoheihe
 include:ximalaya
 include:youku
-include:zhanqi
 
 # Android Emulator
+ldmnq.com
 lsplayer.com
 yeshen.com
 
@@ -57,6 +48,15 @@ yeshen.com
 # B站空降助手 鲁ICP备2024098956号-1
 bsbsb.top
 
+3dmgame.com
+ali213.net
+dmzj.com # 动漫之家
 dongqiudi.com
 goka.top # 三国杀打小抄官网
+jjwxc.net # 晋江文学城
+mfuns.cn # 喵御宅
+miaopai.com
+muwai.com #703
 pearvideo.com
+sfacg.com # SF轻小说二次元
+zhanqi.tv

data/category-food-cn

@@ -1,10 +1,12 @@
 include:bestore
-include:heytea
 include:lkcoffee
 
 3songshu.com
 haidilao.com
 
+# 喜茶
+heytea.com
+
 # 俺来也（上海）网络科技有限公司
 anlaiye.com
 anlaiye.com.cn

data/category-media

@@ -64,7 +64,6 @@ include:theinitium
 include:thomsonreuters
 include:tokyo-sports
 include:tvb
-include:tver
 include:udn
 include:voanews
 include:voxmedia

data/category-media-cn

@@ -1,21 +1,42 @@
 include:36kr
 include:cctv
 include:chinanews
-include:dgtle
-include:geekpark
 include:ifanr
 include:jiemian
 include:landian
 include:phoenix
 include:ruanmei
 include:sohu
-include:solidot
-include:sspai
 include:tmtpost
 include:weiphone
 include:xueqiu
 include:ynet
 
+# 江苏省广播电视总台
+jsbc.com
+jstv.com
+
+# 浙江广播电视集团/浙江卫视/新蓝网
+cztv.com
+cztvcdn.com
+cztvcloud.com
+zjstv.com
+
+# 数字尾巴
+dgtle.com
+
+# 机核
+gcores.com
+
+# 极客公园
+geekpark
+
+# 奇客资讯网
+solidot.org
+
+# 少数派
+sspai.com
+
 # 证券时报网
 stcn.com
 
@@ -159,3 +180,6 @@ admin5.com
 
 # 江西省出版传媒集团
 jxpp.com
+
+# 人人都是产品经理
+woshipm.com

data/category-password-management

@@ -1,3 +1,12 @@
-include:agilebits
+include:agilebits # 1password
 include:bitwarden
 include:lastpass
+
+authy.com
+dashlane.com
+enpass.io
+keepass.info
+keeper.io
+keepersecurity.com
+roboform.com
+strongboxsafe.com

data/category-porn

@@ -136,6 +136,9 @@ porn
 18insta.com
 18j.tv
 18jms.com
+18mh.co
+18mh.me
+18mh.net
 18novel.xyz
 18porncomic.com
 18porno.tv
@@ -237,6 +240,7 @@ porn
 50dh.app
 51cg1.com
 51dh.site
+51lieqi.com
 51luoli.info
 51mh.app
 51pincha.cc
@@ -320,6 +324,9 @@ porn
 88kkn.com
 88manhua.top
 88square.com
+88xkk.com
+88xm.tv
+88xqq.com
 89.com
 8kcosplay.com
 8kpornvids.com
@@ -341,9 +348,12 @@ porn
 91jinman.com
 91md.me
 91moxiong.com
+91nt.com
 91oo.xyz
 91porn.best
+91pornforum.com
 91pornplus.com
+91pornvideo.com
 91porny.com
 91porny.store
 91qk41rf.com
@@ -956,6 +966,7 @@ biguz.net
 bijukujo.club
 bimbim.com
 bimbolive.com
+bingoporno.com
 bioporno.com
 biqle.org
 biqle.ru
@@ -1376,6 +1387,7 @@ diamantewebcam.com
 diamondgirls.co.uk
 diamondgirlstudio.com
 dianapost.com
+diaoda.co
 diarrheafan.livedoor.blog
 dickeomas.com
 dickhardon.com
@@ -1739,6 +1751,7 @@ fetishpapa.com
 fetishpornonly.com
 fetishshrine.com
 fetlife.com
+ffddff.com
 fffucked.com
 fgirl.ch
 fi11.com
@@ -3097,6 +3110,7 @@ llcaoxm-avi.sbs
 llwht88.xyz
 lmm167.shop
 lmmbtc.com
+lms01.com
 lobstertube.com
 localxlist.org
 loholidayhk.com
@@ -4200,6 +4214,7 @@ pp6.info
 ppb-mod.buzz
 ppe.lawyer
 pplah.com
+ppnnpp.com
 ppp91.cc
 prastitutki.ru
 premium-beauty.com
@@ -4280,6 +4295,7 @@ qombol.com
 qooqlevideo.com
 qorno.com
 qporno.xxx
+qq33qq.com
 qqbs.asia
 qqbs.work
 quickiepage.com
@@ -5057,6 +5073,7 @@ tittykings.com
 tkb008.xyz
 tkb2233.life
 tkbqf2.life
+tksex.com
 tktube.com
 tmei-taoyuan.com
 tnaflix.com
@@ -5657,8 +5674,11 @@ xvds.tv
 xvedo.net
 xvideo-jp.com
 xvideo.com
+xvideo.org
 xvideo.run
 xvideo.vlog.br
+xvideo1.org
+xvideo2.org
 xvideoporno.tv
 xvideos.com
 xvideos-dl.top
@@ -5930,6 +5950,7 @@ yy55.tv
 yy7y.com
 yy8y.com
 yyfb.cyou
+yyvhhbmw.cc
 yzld188.top
 z00.world
 z676869.com
@@ -6044,11 +6065,13 @@ regexp:(^|\.)7mm0([0-1][0-9]?)?\.com$
 regexp:(^|\.)8dgo[1-57-9]\.com$
 regexp:(^|\.)91cg([1-9]|[0-9][1-9])?.com$
 regexp:(^|\.)91p[0-9][0-9]?\.com$
-regexp:(^|\.)91porn\.(best|com|cool|group|party|plus|site|tw|work)$
+regexp:(^|\.)91porn\.(best|com|cool|fun|group|party|plus|site|tw|work)$
 regexp:(^|\.)91porn[0-9]{3}\.me$
 regexp:(^|\.)91porn[0-9]?\.store$
+regexp:(^|\.)91porna[1-7]?\.com$
 regexp:(^|\.)91porn[fvxy]\.com$
 regexp:(^|\.)91sew1[1-6]\.buzz$
+regexp:(^|\.)91wang[1-9]\.com$
 regexp:(^|\.)989[a-z]?\.tv$
 regexp:(^|\.)99pp[1-9][0-9]\.com$
 regexp:(^|\.)9cha[0-9]{2}\.cc$

data/category-scholar-!cn

@@ -10,7 +10,6 @@ include:google-scholar
 include:ieee
 include:knovel
 include:mit
-include:oup
 include:proquest
 include:sci-hub
 include:sciencedirect

data/chiphell

@@ -1 +0,0 @@
-chiphell.com

data/cugbonline

@@ -1 +0,0 @@
-cugbonline.cn

data/dgtle

@@ -1 +0,0 @@
-dgtle.com

data/dida365

@@ -1 +0,0 @@
-dida365.com

data/dmzj

@@ -1 +0,0 @@
-dmzj.com

data/erji

@@ -1 +0,0 @@
-erji.net

data/foundertype

@@ -1 +0,0 @@
-foundertype.com

data/gcores

@@ -1 +0,0 @@
-gcores.com

data/geekpark

@@ -1 +0,0 @@
-geekpark.net

data/geolocation-!cn

@@ -159,6 +159,7 @@ include:category-browser-!cn
 include:category-enhance-gaming
 include:category-mobile-repair
 include:category-ntp
+include:category-password-management
 include:decryptipastore # iOS
 
 include:rsshub
@@ -172,9 +173,7 @@ include:addtoany
 include:adguard
 include:aptoide
 include:arphic
-include:authy
 include:bitly
-include:bitwarden
 include:blender
 include:brightcove
 include:buymeacoffee
@@ -198,7 +197,6 @@ include:hcaptcha
 include:heroku
 include:hurricaneelectric
 include:iina
-include:imageglass
 include:infrapedia
 include:inoreader
 include:isgd
@@ -211,7 +209,6 @@ include:localizejs
 include:madshi
 include:mapbox
 include:mega
-include:mpv
 include:netlify
 include:notion
 include:ok

data/geolocation-cn

@@ -49,10 +49,11 @@ include:category-bank-cn
 include:category-securities-cn
 include:eastmoney
 include:everbright
-include:hsqh
 include:pingan
 include:taikang
 
+hsqh.net # 徽商期货有限责任公司
+
 # Blogs
 include:category-blog-cn
 
@@ -70,12 +71,10 @@ include:category-automobile-cn
 
 # CDN or SDWAN
 include:aws-cn
-include:baijiayun
 include:bootcdn
 include:cloudflare-cn
 include:dwion
 include:maocloud
-include:pkoplink
 include:qingcloud
 include:qiniu
 include:snodehome
@@ -84,6 +83,25 @@ include:upai
 include:wangsu
 include:yunfanjiasu
 
+# 百家云
+baijiayun.com
+
+# 明源云
+fdcyun.com
+mingyuanyun.com
+mypaas.com
+mypaas.com.cn
+myypark.com
+
+# 开普云
+kaipuyun.cn
+kaipuyun.com
+kaipuyun.com.cn
+kaipuyun.net
+
+# 江西节点技术服务有限公司
+pkoplink.com
+
 funcdn.com
 knet.cn # 北龙中网
 leigod.cn
@@ -96,7 +114,6 @@ include:dewu
 include:dongjiao
 include:jd
 include:lianjia
-include:manmanbuy
 include:meituan
 include:miaomiaozhe
 include:mogujie
@@ -122,6 +139,8 @@ appsimg.com
 appvipshop.com
 vip.com
 vipstatic.com
+# 慢慢买
+manmanbuy.com
 # 瞎买
 xiamai.net
 
@@ -132,15 +151,15 @@ include:category-entertainment-cn
 include:category-game-accelerator-cn
 
 # Forums
-include:chiphell
-include:erji
-include:hacpai
+include:b3log
 include:kechuang
 include:nga
 include:stage1st
 
 52pojie.cn # 吾爱破解
+chiphell.com # ChipHell
 chongbuluo.com # 虫部落
+erji.net # 耳机网
 itsk.com # IT天空论坛
 kafan.cn # 卡饭论坛
 kanxue.com # 看雪
@@ -179,17 +198,13 @@ include:category-hospital-cn
 include:category-education-cn
 include:category-scholar-cn
 include:category-wiki-cn
-include:cugbonline
 include:guokr
 include:ihuman
 
 # Services & Softwares
-include:3type
-include:4paradigm
 include:51job
 include:afdian
 include:agora
-include:antutu
 include:category-collaborate-cn
 include:category-documents-cn
 include:category-ntp-cn
@@ -199,9 +214,7 @@ include:capitalonline
 include:chinaso
 include:chinaz
 include:colorfulclouds
-include:dida365
 include:flowus
-include:foundertype
 include:geetest
 include:hanyi
 include:intsig
@@ -209,7 +222,6 @@ include:jianshu
 include:jinshuju
 include:keep
 include:lagou
-include:ldmnq
 include:liepin
 include:linakesi
 include:mafengwo
@@ -226,10 +238,12 @@ include:weathercn
 include:wiwide
 include:wjx
 include:wolai
-include:yinxiang
 include:zdns
 include:zhangtao
 
+# 方正字库
+foundertype.com
+
 # BOSS 直聘
 zhipin.com
 bosszhipin.com
@@ -248,7 +262,6 @@ include:category-dev-cn
 include:aisiku # 北京艾斯酷科技有限公司
 include:akiko # 秋子酱科技
 include:alibaba
-include:b3log
 include:baidu
 include:beisen
 include:bluepoch
@@ -273,7 +286,6 @@ include:narwal # 云鲸科技
 include:netease
 include:oppo
 include:qihoo360
-include:roborock # 石头科技
 include:sumkoo #北京尚古创新科技有限公司
 include:tcl
 include:tencent
@@ -286,23 +298,14 @@ include:youquan # 祐全科技
 include:yuanbei # 上海圆贝信息科技有限公司
 include:zte
 
+antutu.com # 安兔兔
+dida365.com # 滴答清单
 huorong.cn # 火绒
 quickapp.cn # 快应用
+roborock.com # 石头科技
 socpk.com # 极客湾移动芯片排行
 udesk.cn # 沃丰科技
-
-# 明源云
-fdcyun.com
-mingyuanyun.com
-mypaas.com
-mypaas.com.cn
-myypark.com
-
-# 开普云
-kaipuyun.cn
-kaipuyun.com
-kaipuyun.com.cn
-kaipuyun.net
+yinxiang.com # 印象笔记
 
 # 酷控
 deepepg.com
@@ -326,10 +329,6 @@ include:chinatower
 # OI
 include:category-olympiad-in-informatics
 
-# 语言能力测试
-include:j-test
-include:nat-test
-
 # 在线工具
 itdog.cn # itdog网站工具箱
 webmasterhome.cn # 站长之家
@@ -474,8 +473,10 @@ zzdtec.com
 3d66.com
 3elife.net
 3h3.com
+3type.cn
 3yx.com
 40407.com
+4paradigm.com
 500.com
 500d.me
 50bang.org
@@ -681,8 +682,6 @@ cwxzx.com
 cyagen.com
 cybtc.com
 cyts.com
-cztv.com
-cztvcloud.com
 dadajiasu.com
 dadighost.com
 daguzhe.com
@@ -921,9 +920,7 @@ jmstatic.com
 job5588.com
 job910.com
 jobjm.com
-jsbc.com
 jsrdgg.com
-jstv.com
 jsyks.com
 juefeng.com
 julive.com
@@ -1431,7 +1428,6 @@ zhugeio.com
 zimuzu.io
 zixiaomao.com
 zixuntop.com
-zjstv.com
 zmengzhu.com
 zongheng.com
 zpb365.com

data/greatfire

@@ -3,6 +3,8 @@ freebrowser.org
 freewechat.com
 freeweibo.com
 freezhihu.org
+googlecensorship.org
 greatfire.org
+greatfirevpn.com
 pao-pao.net
 wikiunblocked.org

data/hacpai

@@ -1,2 +0,0 @@
-hacpai.com
-ld246.com

data/heytea

@@ -1 +0,0 @@
-heytea.com

data/hongdunwang

@@ -1 +0,0 @@
-hongdunwang.com.cn

data/hsqh

@@ -1 +0,0 @@
-hsqh.net

data/imageglass

@@ -1 +0,0 @@
-imageglass.org

data/intuit

@@ -0,0 +1,36 @@
+intuit
+
+creditkarma.com
+gopayment.com
+gopayments.com
+intuit-gopayment.com
+intuit.ca
+intuit.co.uk
+intuit.com
+intuit.com.au
+intuit.fr
+intuitaffiliate.com
+intuitbenefits.com
+intuitcdn.net
+intuitfullservicepayroll.com
+intuitinnovationday.com
+intuitlabs.com
+intuitpayments.com
+mailchimp.com
+myproseries.com
+payroll.com
+proseries.com
+quickbook.com.br
+quickbooks.co.uk
+quickbooks.co.za
+quickbooks.com
+quickbooks.com.au
+quickbooks.com.br
+quickbooks.fr
+quickbooks.in
+quickbooks2000.com
+quickbooksenligne.ca
+quickbooksgetconnected.co.za
+quickbooksonline.com
+turbo.com
+turbotax.com

data/j-test

@@ -1 +0,0 @@
-j-test.com

data/jinjiang

@@ -1 +0,0 @@
-jjwxc.net

data/jinrishici

@@ -1 +0,0 @@
-jinrishici.com

data/ldmnq

@@ -1 +0,0 @@
-ldmnq.com

data/manmanbuy

@@ -1 +0,0 @@
-manmanbuy.com

data/mfuns

@@ -1 +0,0 @@
-mfuns.cn

data/miaopai

@@ -1 +0,0 @@
-miaopai.com

data/mpv

@@ -1 +0,0 @@
-mpv.io

data/muwai

@@ -1 +0,0 @@
-muwai.com

data/nat-test

@@ -1 +0,0 @@
-nattest-china.com

data/pkoplink

@@ -1 +0,0 @@
-pkoplink.com

data/primevideo

@@ -1,4 +1,16 @@
 # Prime Video
+
+full:d1v5ir2lpwr8os.cloudfront.net
+full:d22qjgkvxw22r6.cloudfront.net
+full:d25xi40x97liuc.cloudfront.net
+full:d27xxe7juh1us6.cloudfront.net
+full:dmqdd6hw24ucf.cloudfront.net
+full:images-eu.ssl-images-amazon.com
+full:images-na.ssl-images-amazon.com
+full:images-fe.ssl-images-amazon.com
+full:msh.amazon.co.uk
+full:static.siege-amazon.com
+
 aiv-cdn.net
 amazonprimevideo.cn @cn
 amazonprimevideo.com.cn @cn
@@ -10,4 +22,5 @@ primevideo.cc
 primevideo.com
 primevideo.info
 primevideo.org
-primevideo.tv
+primevideo.tv
+prod.service.minerva.devices.a2z.com

data/qichamao

@@ -1 +0,0 @@
-qichamao.com

data/qyyjt

@@ -1 +0,0 @@
-qyyjt.cn

data/roborock

@@ -1 +0,0 @@
-roborock.com

data/sfacg

@@ -1 +0,0 @@
-sfacg.com

data/solidot

@@ -1 +0,0 @@
-solidot.org

data/sspai

@@ -1 +0,0 @@
-sspai.com

data/stage1st

@@ -1 +1,2 @@
 saraba1st.com
+stage1st.com

data/tipdm

@@ -1 +0,0 @@
-tipdim.org

data/x315

@@ -1 +0,0 @@
-x315.com

data/xueyuanjun

@@ -1 +0,0 @@
-xueyuanjun.com

data/yinxiang

@@ -1 +0,0 @@
-yinxiang.com

data/zhanqi

@@ -1 +0,0 @@
-zhanqi.tv

data/zhihuishu

@@ -1 +0,0 @@
-zhihuishu.com