From 12ce0dc082579e66de9fac44b090035cf1ea94df Mon Sep 17 00:00:00 2001
From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Mon, 3 Aug 2020 16:27:15 +0800
Subject: [PATCH 1/4] Extract category-cas from geolocation-!cn

---
 data/category-cas    | 17 +++++++++++++++++
 data/geolocation-!cn | 16 +---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 data/category-cas

diff --git a/data/category-cas b/data/category-cas
new file mode 100644
index 00000000..cb14c04b
--- /dev/null
+++ b/data/category-cas
@@ -0,0 +1,17 @@
+# This list contains well-known Certificate Authorities (CA) outside China mainland.
+
+# Reference: https://en.wikipedia.org/wiki/Certificate_authority
+include:buypass
+include:comodo
+include:cybertrust
+include:digicert
+include:entrust
+include:globalsign
+include:identrust
+include:letsencrypt
+include:secom
+include:sectigo
+include:swisssign
+include:telekom
+include:trustwave
+include:verisign
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 3d045a65..12854f04 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -32,21 +32,7 @@ include:quantil
 include:stackpath
 
 # Certificate authorities
-# Reference: https://en.wikipedia.org/wiki/Certificate_authority
-include:buypass
-include:comodo
-include:cybertrust
-include:digicert
-include:entrust
-include:globalsign
-include:identrust
-include:letsencrypt
-include:secom
-include:sectigo
-include:swisssign
-include:telekom
-include:trustwave
-include:verisign
+include:category-cas
 
 # Communications
 include:discord

From d9a6d0443f7e915df47b18e79eca4415e5daa28c Mon Sep 17 00:00:00 2001
From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Mon, 3 Aug 2020 16:28:08 +0800
Subject: [PATCH 2/4] Extract category-companies from geolocation-!cn

---
 data/category-companies | 40 ++++++++++++++++++++++++++++++++++++++++
 data/geolocation-!cn    | 41 ++---------------------------------------
 2 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 data/category-companies

diff --git a/data/category-companies b/data/category-companies
new file mode 100644
index 00000000..cb19f36e
--- /dev/null
+++ b/data/category-companies
@@ -0,0 +1,40 @@
+# This list contains Tech & Cyber companies and organizations outside China mainland.
+
+include:acer
+include:adobe
+include:alibabacloud
+include:amazon
+include:amd
+include:apple
+include:atlassian
+include:canon
+include:cisco
+include:cloudcone
+include:dell
+include:facebook
+include:gigabyte
+include:godaddy
+include:google
+include:hinet
+include:hp
+include:ibm
+include:intel
+include:linkedin
+include:logitech
+include:microsoft
+include:mozilla
+include:neuralink
+include:nvidia
+include:oracle
+include:razer
+include:salesforce
+include:samsung
+include:sony
+include:spacex
+include:theboringcompany
+include:twitter
+include:uber
+include:verizon
+include:westerndigital
+include:yahoo
+include:yandex
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 12854f04..cd158ce6 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -250,45 +250,8 @@ include:zoom
 # Software development
 include:category-dev
 
-# Tech companies & Organizations
-include:acer
-include:adobe
-include:alibabacloud
-include:amazon
-include:amd
-include:apple
-include:atlassian
-include:canon
-include:cisco
-include:cloudcone
-include:dell
-include:facebook
-include:gigabyte
-include:godaddy
-include:google
-include:hinet
-include:hp
-include:ibm
-include:intel
-include:linkedin
-include:logitech
-include:microsoft
-include:mozilla
-include:neuralink
-include:nvidia
-include:oracle
-include:razer
-include:salesforce
-include:samsung
-include:sony
-include:spacex
-include:theboringcompany
-include:twitter
-include:uber
-include:verizon
-include:westerndigital
-include:yahoo
-include:yandex
+# Tech companies
+include:category-companies
 
 # VPN services
 include:category-vpnservices

From 430e1cf17aacf4d7e488713359001c26e4d2911d Mon Sep 17 00:00:00 2001
From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Mon, 3 Aug 2020 16:29:06 +0800
Subject: [PATCH 3/4] Extract category-entertainment from geolocation-!cn

---
 data/category-entertainment | 45 +++++++++++++++++++++++++++++++++++++
 data/geolocation-!cn        | 44 +-----------------------------------
 2 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 data/category-entertainment

diff --git a/data/category-entertainment b/data/category-entertainment
new file mode 100644
index 00000000..6465b02b
--- /dev/null
+++ b/data/category-entertainment
@@ -0,0 +1,45 @@
+# This list contains services related to entertainment & games & music & podcasts & videos outside China mainland.
+
+include:abema
+include:archiveofourown
+include:attwatchtv
+include:bahamut
+include:bandcamp
+include:castro
+include:deviantart
+include:disney
+include:epicgames
+include:fireside
+include:hbo
+include:hulu
+include:imdb
+include:internationalsaimoe
+include:kingkonglive
+include:litv
+include:megaphone
+include:moov
+include:netflix
+include:niconico
+include:nintendo
+include:op
+include:overcast
+include:pixiv
+include:playstation
+include:pocketcasts
+include:riot
+include:sling
+include:sonypictures
+include:soundcloud
+include:spotify
+include:steam
+include:steamunlocked
+include:tiktok
+include:twitch
+include:ubi
+include:vimeo
+include:visualarts
+include:viu
+include:weverse
+include:xbox
+include:yande
+include:yyets
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index cd158ce6..3e57ea74 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -81,49 +81,7 @@ include:udemy
 include:w3schools
 
 # Entertainment & Games & Music & Podcasts & Videos
-include:abema
-include:archiveofourown
-include:attwatchtv
-include:bahamut
-include:bandcamp
-include:castro
-include:deviantart
-include:disney
-include:epicgames
-include:fireside
-include:hbo
-include:hulu
-include:imdb
-include:internationalsaimoe
-include:kingkonglive
-include:litv
-include:megaphone
-include:moov
-include:netflix
-include:niconico
-include:nintendo
-include:op
-include:overcast
-include:pixiv
-include:playstation
-include:pocketcasts
-include:riot
-include:sling
-include:sonypictures
-include:soundcloud
-include:spotify
-include:steam
-include:steamunlocked
-include:tiktok
-include:twitch
-include:ubi
-include:vimeo
-include:visualarts
-include:viu
-include:weverse
-include:xbox
-include:yande
-include:yyets
+include:category-entertainment
 
 # Forums
 include:dcard

From 29b41e1b95b4cf057d4403b83d5f14ff3d74ee8e Mon Sep 17 00:00:00 2001
From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Mon, 3 Aug 2020 16:29:59 +0800
Subject: [PATCH 4/4] Extract category-orgs from geolocation-!cn

---
 data/category-orgs   | 20 ++++++++++++++++++++
 data/geolocation-!cn | 19 +------------------
 2 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 data/category-orgs

diff --git a/data/category-orgs b/data/category-orgs
new file mode 100644
index 00000000..8a1995cd
--- /dev/null
+++ b/data/category-orgs
@@ -0,0 +1,20 @@
+# This list contains organizations outside China mainland.
+
+include:aomedia
+include:archive
+include:atypi
+include:change
+include:creativecommons
+include:csis
+include:emojipedia
+include:globalsecurity
+include:ieee
+include:itu
+include:nist
+include:openstreetmap
+include:ruleoflaw
+include:smpte
+include:un
+include:w3c
+include:who
+include:wto
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 3e57ea74..d07532de 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -94,24 +94,7 @@ include:reddit
 include:category-media
 
 # Organizations
-include:aomedia
-include:archive
-include:atypi
-include:change
-include:creativecommons
-include:csis
-include:emojipedia
-include:globalsecurity
-include:ieee
-include:itu
-include:nist
-include:openstreetmap
-include:ruleoflaw
-include:smpte
-include:un
-include:w3c
-include:who
-include:wto
+include:category-orgs
 
 # Others
 include:fonts