diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 33692611..35efb035 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -1,130 +1,137 @@
 # This list contains domains that don't have access point in China. This is opposite to geolocation-cn.
 
+# V2Ray related
+include:v2ray
+
+# GFW related
+include:bypasscensorship
+include:gfw
+include:greatfire
+
+# VPN related
+include:dlercloud
+include:duyaoss
+include:maying
+include:nexitally
+include:rixcloud
+
+# Tech companies & Orginations
 include:adobe
 include:amazon
-include:apkpure
 include:apple
-include:archive
-include:avgle
-include:bbc
-include:bestbuy
-include:boxun
-include:bypasscensorship
-include:chinadigitaltimes
-include:cnn
-include:discord
-include:disqus
-include:dropbox
-include:duckduckgo
-include:dw
-include:ebay
-include:epicgames
 include:facebook
-include:faststone
-include:gfw
-include:gitbook
-include:github
-include:gitlab
-include:globalvoices
 include:google
-include:greatfire
-include:guo
-include:hk01
-include:huanghuagang
-include:infrapedia
-include:jetbrains
-include:line
 include:linkedin
 include:microsoft
 include:mozilla
+include:oracle
+include:twitter
+include:uber
+include:yahoo
+include:yandex
+
+# Software development related
+include:gitbook
+include:github
+include:gitlab
+include:jetbrains
+include:python
+include:stackexchange
+include:ubuntu
+include:xda
+include:xposed
+
+# Services & Softwares
+include:apkpure
+include:disqus
+include:dropbox
+include:duckduckgo
+include:faststone
+include:gofundme
+include:infrapedia
+include:pinterest
+include:startpage
+include:steemit
+include:tumblr
+
+# Communications
+include:discord
+include:line
+include:telegram
+
+# E-commerce
+include:bestbuy
+include:ebay
+
+# Entertainment & Videos & Games & Music
+include:epicgames
 include:netflix
+include:pixiv
+include:spotify
+include:soundcloud
+include:steam
+include:steamunlocked
+include:ubi
+include:vimeo
+
+# Forums
+include:pincong
+include:quora
+include:reddit
+
+# News & Press & Media
+include:0zmedia
+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:jfengtime
+include:medium
+include:myradio
 include:ntd
 include:nytimes
-include:oracle
-include:pinterest
-include:pixiv
-include:pornhub
-include:python
-include:quora
-include:rarbg
-include:reddit
 include:reuters
 include:rfa
 include:rfi
 include:rsf
 include:scmp
-include:soundcloud
-include:spotify
-include:startpage
-include:steam
-include:steamunlocked
-include:steemit
-include:stackexchange
-include:taboola
-include:ted
-include:telegram
-include:tsquare
-include:tumblr
-include:twitter
-include:uber
-include:ubi
-include:ubuntu
-include:v2ray
-include:vimeo
-include:voanews
-include:washingtonpost
-include:wikileaks
-include:wikimedia
-include:windy
-include:xda
-include:xposed
-include:yahoo
-include:yandex
-include:medium
-include:elsevier
-include:clarivate
-include:springer
-include:acm
-include:ieee
-include:nature
-include:computingreviews
-include:knovel
-include:theporndude
-include:caoliu
-include:91porn
-include:chaturbate
-include:xvideos
-include:javbus
-include:javhd
-include:xhamster
-include:xnxx
-include:beeg
-include:pornhd
-include:hqporner
-include:eporner
-include:redtube
-include:youporn
-include:tube8
-include:pigav
-include:netflav
-include:kindgirls
-include:xart
-include:hegre
-include:0zmedia
-include:caijinglengyan
 include:sinoinsider
-include:gofundme
-include:appledaily
-include:d100
-include:dlercloud
-include:duyaoss
-include:fox
-include:jfengtime
-include:maying
-include:myradio
-include:nexitally
-include:pincong
-include:rixcloud
 include:soundofhope
 include:thestandnews
+include:voanews
+include:washingtonpost
 include:wenzhao
+include:wikimedia
+
+# Science & Technology & Knowledge
+include:acm
+include:computingreviews
+include:elsevier
+include:ieee
+include:knovel
+include:nature
+include:springer
+include:ted
+
+# Advertisment & Analytics
+include:clarivate
+include:taboola
+
+# Porn
+include:category-porn
+
+# Others
+include:archive
+include:huanghuagang
+include:rarbg
+include:tsquare
+include:wikileaks
+include:windy