diff --git a/data/category-anticensorship b/data/category-anticensorship
new file mode 100644
index 00000000..d7105778
--- /dev/null
+++ b/data/category-anticensorship
@@ -0,0 +1,40 @@
+include:ahmia
+include:akasha
+include:browserleaks
+include:bypasscensorship
+include:citizenlab
+include:datfoundation
+include:democracyearth
+include:eff
+include:epicbrowser
+include:ffprofile
+include:freenet
+include:fteproxy
+include:gfw
+include:greatfire
+include:guardianproject
+include:haveibeenpwned
+include:i2p
+include:ipfs
+include:jitsi
+include:lantern
+include:ntc
+include:onionshare
+include:ooni
+include:openvpn
+include:psiphon
+include:shadowsocks
+include:softether
+include:stunnel
+include:telex
+include:torproject
+include:tribler
+include:tunsafe
+include:twister
+include:uproxy
+include:v2ray
+include:vuvuzela
+include:whonix
+include:wikileaks
+include:wireguard
+include:zeronet
diff --git a/data/category-media b/data/category-media
new file mode 100644
index 00000000..79bd77b2
--- /dev/null
+++ b/data/category-media
@@ -0,0 +1,38 @@
+include:appledaily
+include:bbc
+include:boxun
+include:caijinglengyan
+include:chinadigitaltimes
+include:cnbc
+include:cnn
+include:d100
+include:dw
+include:fox
+include:globalvoices
+include:guo
+include:hk01
+include:inmediahk
+include:jfengtime
+include:ltn
+include:matters
+include:medium
+include:myradio
+include:nikkei
+include:ntd
+include:nytimes
+include:passiontimes
+include:reuters
+include:rfa
+include:rfi
+include:rsf
+include:rthk
+include:scmp
+include:sinoinsider
+include:soundofhope
+include:thestandnews
+include:udn
+include:voanews
+include:washingtonpost
+include:watchout
+include:wenzhao
+include:zaobao
diff --git a/data/cnbc b/data/cnbc
new file mode 100644
index 00000000..0464c45d
--- /dev/null
+++ b/data/cnbc
@@ -0,0 +1,4 @@
+cnbc.com
+cnbcfm.com
+nbcuni.com
+nbcudigitaladops.com
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 42982ef9..198b1cdb 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -4,49 +4,13 @@
 include:category-vpnservices
 
 # VPN tools & Privacy protection & Anti-GFW & Anti-censorship
-# References:
-# https://github.com/danoctavian/awesome-anti-censorship
-# https://github.com/KevinColemanInc/awesome-privacy
-include:ahmia
-include:akasha
-include:browserleaks
-include:bypasscensorship
-include:citizenlab
-include:datfoundation
-include:democracyearth
-include:eff
-include:epicbrowser
-include:ffprofile
-include:freenet
-include:fteproxy
-include:gfw
-include:greatfire
-include:guardianproject
-include:haveibeenpwned
-include:i2p
-include:ipfs
-include:jitsi
-include:lantern
-include:ntc
-include:onionshare
-include:ooni
-include:openvpn
-include:psiphon
-include:shadowsocks
-include:softether
-include:stunnel
-include:telex
-include:torproject
-include:tribler
-include:tunsafe
-include:twister
-include:uproxy
-include:v2ray
-include:vuvuzela
-include:whonix
-include:wikileaks
-include:wireguard
-include:zeronet
+include:category-anticensorship
+
+# Porn
+include:category-porn
+
+# News & Press & Media
+include:category-media
 
 # Tech companies & Orginations
 include:adobe
@@ -111,6 +75,7 @@ include:imgur
 include:infrapedia
 include:netlify
 include:pinterest
+include:protonmail
 include:startpage
 include:steemit
 include:tumblr
@@ -145,45 +110,6 @@ include:pincong
 include:quora
 include:reddit
 
-# News & Press & Media
-include:appledaily
-include:bbc
-include:boxun
-include:caijinglengyan
-include:chinadigitaltimes
-include:cnn
-include:d100
-include:dw
-include:fox
-include:globalvoices
-include:guo
-include:hk01
-include:inmediahk
-include:jfengtime
-include:ltn
-include:matters
-include:medium
-include:myradio
-include:nikkei
-include:ntd
-include:nytimes
-include:passiontimes
-include:reuters
-include:rfa
-include:rfi
-include:rsf
-include:rthk
-include:scmp
-include:sinoinsider
-include:soundofhope
-include:thestandnews
-include:udn
-include:voanews
-include:washingtonpost
-include:watchout
-include:wenzhao
-include:zaobao
-
 # Organizations
 include:archive
 include:change
@@ -210,9 +136,6 @@ include:clarivate
 include:pubmatic
 include:taboola
 
-# Porn
-include:category-porn
-
 # Others
 include:huanghuagang
 include:rarbg
diff --git a/data/protonmail b/data/protonmail
new file mode 100644
index 00000000..ef943d59
--- /dev/null
+++ b/data/protonmail
@@ -0,0 +1,3 @@
+protonmail.com
+protonstatus.com
+pm.me