diff --git a/gfwlist.txt b/gfwlist.txt
index 1c3755a..9fac0df 100644
--- a/gfwlist.txt
+++ b/gfwlist.txt
@@ -1,5 +1,5 @@
-W0F1dG9Qcm94eSAwLjEuMF0KISBDaGVja3N1bTogSmQrWFpNdmdKNWZOOUQ3M01yK3dNdwohIExh
-c3QgTW9kaWZpZWQ6ICBGcmksIDE0IEF1ZyAyMDA5IDEzOjI4OjM1ICswODAwCiEgICAgIC0tLS1o
+W0F1dG9Qcm94eSAwLjEuMF0KISBDaGVja3N1bTogcW40c2xOdlg1Z3p3OTE1Z3pPbCtLQQohIExh
+c3QgTW9kaWZpZWQ6ICBGcmksIDE0IEF1ZyAyMDA5IDEzOjM4OjI3ICswODAwCiEgICAgIC0tLS1o
 dHRwOi8vYXV0b3Byb3h5LWdmd2xpc3QuZ29vZ2xlY29kZS5jb20vCgohLS0tLS0tLS0tLS0tLS0t
 LS0tLS0tLS0tLU51bS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCjEtYXBwbGUuY29tLnR3Cnxo
 dHRwOi8vbnNmLjExMG1iLmNvbQoxYmFuZzEuY24KfGh0dHA6Ly93d3cuMWJhby5vcmcKM2JveXMy
@@ -272,63 +272,62 @@ d3JldGNoLmNjCmNoaW5lc2Uud3NqLmNvbQp3dWVya2FpeGkuY29tCi53dWppZS5uZXQKd3VrYW5n
 cnVpLm5ldAoKIS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tWC0tLS0tLS0tLS0tLS0tLS0tLS0t
 LS0tLS0tCi54YW5nYS5jb20KeGluc2hlbmcubmV0CnxodHRwOi8vd3d3Lnhpbmh1YW5ldC5vcmcv
 CmJsb2cueHVpdGUubmV0Ci54eXMub3JnCgohLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1ZLS0t
-LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KCiEtLS0tLS0tLS0tLS0tWWFob28tLS0tLQpoay55YWhv
-by5jb20KaGsubWVzc2FnZXMueWFob28uY29tCmhrLm5ld3MueWFob28uY29tCmhrLnNlYXJjaC55
-YWhvby5jb20KdHcueWFob28uY29tCnR3Lm15YmxvZy55YWhvby5jb20KdXBjb21pbmcueWFob28u
-Y29tCgp8aHR0cDovL2Jsb2cueWFtLmNvbS8Kbi55YW0uY29tCm5ld3MueWFtLmNvbQpmb3J1bS55
-b3JrYmJzLmNhCnxodHRwOi8vd3d3LnlvdXBhaS5vcmcvCnxodHRwOi8vd3d3LnlvdXItZnJlZWRv
-bS5uZXQvCnxodHRwczovL3d3dy55b3VyLWZyZWVkb20ubmV0Lwp5b3V0aGJhby5jb20KYmxvZy55
-b3V0aHdhbnQuY29tLnR3CnRvcGljLnlvdXRod2FudC5jb20udHcKeW91dHViZS5jb20KIS0taGsu
-eW91dHViZS5jb20KIS0tdHcueW91dHViZS5jb20KIS0tQEB5b3V0dWJlLmNvbS9nZXRfdmlkZW8K
-IS1Zb3V0dWJlIENETgoueXRpbWcuY29tCnl0aHQubmV0LwoKIS0tLS0tLS0tLS0tLS0tLS0tLS0t
-LS0tLS0tWi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCnxodHRwOi8vbHVudGFuLnphb2Jhby5j
-b20vCnd3dy56YXVydXMub3JnLnVrCi56ZW5namlueWFuLm9yZwp5ZXppbWFyeS5zcGFjZXMubGl2
-ZS5jb20KemVuZ2ppbnlhbi5zcGFjZXMubGl2ZS5jb20KemhvbmdndW90ZXNlLm5ldAp6dW9sYS5j
-b20KCiEtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLU90aGVyLS0tLS0tLS0tLS0tLS0tLS0tLS0t
-LQpnZndQcm94eUVuYWJsZWQ9eWVzCnxodHRwOi8vKmZhbHVuCnxodHRwOi8vKmZyZWVnYXRlCnxo
-dHRwOi8vKnNlYXJjaCpxKmNhY2hlCnxodHRwOi8vKnNlYXJjaCpxKnNhZmV3ZWIKfGh0dHA6Ly8q
-dWx0cmFyZWFjaAp8aHR0cDovLyp1bHRyYXN1cmYKCiEtLUlQIG9mIEh1YSBZdWFuIFdhbmcKNzIu
-NTIuODEuMjIKCiEtLWRvbmcgdGFpIHdhbmcKfGh0dHA6Ly8qJUU1JThBJUE4JUU2JTgwJTgxJUU3
-JUJEJTkxCiEtLWZhIGx1biBkYSBmYQp8aHR0cDovLyolRTYlQjMlOTUlRTglQkQlQUUlRTUlQTQl
-QTclRTYlQjMlOTUKIS0tRmEgTHVuIEdvbmc6IFRyYWRpdGlvbmFsIENoaW5lc2UKfGh0dHA6Ly8q
-JUU2JUIzJTk1JUU4JUJDJUFBJUU1JThBJTlGCiEtLUZhIEx1biBHb25nOiBTaW1wbGlmaWVkIENo
-aW5lc2UKfGh0dHA6Ly8qJUU2JUIzJTk1JUU4JUJEJUFFJUU1JThBJTlGCiEtLUppYW5nIExpdSBN
-YW5nCnxodHRwOi8vKnNlYXJjaColRTYlQjElOUYlRTYlQjUlODElRTYlQjAlOTMKIS0tTGl1IFNp
-CnxodHRwOi8vKiVFNSU4NSVBRCVFNSU5QiU5QgohLS1MaXUgWGlhbyBCbwp8aHR0cDovLyolRTUl
-ODglOTglRTYlOTklOTMlRTYlQjMlQTIKIS0tTWVpIEd1byBaaGkgWWluCnxodHRwOi8vKiVFNyVC
-RSU4RSVFNSU5QiVCRCVFNCVCOSU4QiVFOSU5RiVCMwohLS1NaW4gSmluIERhbmcKfGh0dHA6Ly8q
-JUU2JUIwJTkxJUU4JUJGJTlCJUU1JTg1JTlBCiEtLShOb25nKSBNaW4gWXVuIChEb25nIEh1aSkK
-fGh0dHA6Ly8qJUU2JUIwJTkxJUU4JUJGJTkwCiEtLVF1biBUaSBNaWUgSnVlCnxodHRwOi8vKnNl
-YXJjaColRTclQkUlQTQlRTQlQkQlOTMlRTclODElQUQlRTclQkIlOUQKIS0tVGlhbiBBbiBNZW4K
-Z29vZ2xlLmNvbSpzZWFyY2gqcSolRTUlQTQlQTklRTUlQUUlODklRTklOTclQTgKIS0tV2FuZyBE
-YW4KfGh0dHA6Ly8qJUU3JThFJThCJUU0JUI4JUI5CiEtLVd1IEppZQp8aHR0cDovLypzZWFyY2gq
-JUU2JTk3JUEwJUU3JTk1JThDCiEtLVhpZSBFCnxodHRwOi8vKnNlYXJjaColRTklODIlQUElRTYl
-ODElQjYKIS0tWmhhbyBaaSBZYW5nCnxodHRwOi8vKiVFOCVCNSVCNSVFNyVCNCVBQiVFOSU5OCVC
-MwohLS1aaSBZb3UgTWVuCnxodHRwOi8vd3d3Lmdvb2dsZS5jb20qJUU4JTg3JUFBJUU3JTk0JUIx
-JUU5JTk3JUE4CgoKIS0tLS0tLVVuU29ydGVkLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
-LS0tLS0tLS0tCgohLS0tLU5vdCBhIGtleXdvcmQsIG5lZWQgdG8gYmUgZWRpdGVkIGluIG5leHQg
-dmVyc2lvbiBvZiBBdXRvUHJveHkKaWNhbmhhc2NoZWV6YnVyZ2VyLmNvbQp0aW55cGFzdGUuY29t
-CnBsdXJrdGVtcGxhdGVzLmNvbQpnaWdhb20uY29tCnNzaGdmdy5jb20KdHZ1bmV0d29ya3MuY29t
-Cm1pcm9ndWlkZS5jb20KdGhyb3VnaG5pZ2h0c2ZpcmUuY29tCmltYWdlc2hhY2sudXMKbXVsdGlw
-bHkuY29tCmZyZWUtY3VsdHVyZS5jYwptYXJjby5vcmcKYmxvZy5raWNrc3RhcnRlci5jb20Kd2lr
-aS5qcy1raXQuY29tCmdlZWthdGxhcy5jb20KbnVleHBvLmNvbQpwcmVzZW50YXRpb256ZW4uY29t
-CmVhc3lsaWZlLnR3CmZhaWxibG9nLm9yZwoKCgp8aHR0cDovL2Rsc3RhdHVzYmFyLnByb2JvYXJk
-czQzLmNvbS8KfGh0dHA6Ly9tYW9teS5tb3RpbWUuY29tLwp8aHR0cDovL2NoLnNodm9vbmcuY29t
-Lwp8aHR0cDovL3d3dy55enprLmNvbS8KfGh0dHA6Ly93d3cud2Vla21hZy5pbmZvLwpiZW5kaWtl
-bi5uZXQKLmVjc3RhcnQuY29tLwp8aHR0cDovL2JzaWVnZWwuYXRoLmN4Lwp8aHR0cDovL3d3dy50
-eWNvb2wuY29tLwp3d3cubXNndWFuY2hhLmNvbQp8aHR0cDovL3d3dy5tZWV0dXAuY29tLwp8aHR0
-cDovL3RydXZlby5jb20vCnxodHRwOi8vZnVucC5jb20vCnxodHRwOi8vd3d3Lm94ZmFtLm9yZy5o
-ay8KfGh0dHA6Ly93d3cuc2FsdmF0aW9uLm9yZy5oay8KfGh0dHA6Ly93d3cudGFjZW0ub3JnLwou
-cGl4bmV0Lm5ldC8KfGh0dHA6Ly9teXNpbmFibG9nLmNvbS8KfGh0dHA6Ly93d3cua3dvbmd3YWgu
-Y29tLm15LwptaXRiYnMuY29tCmdhcmRlbm5ldHdvcmtzLmNvbQpkb25ndGFpd2FuZy5jb20KYm9s
-aW4ubmV0ZmlybXMuY29tCnxodHRwOi8vd3d3LnJmYS5vcmcvCmNvbWVmcm9tY2hpbmEuY29tCmdv
-cGV0aXRpb24uY29tCmR3bmV3cy5jb20KZmlyZW9mbGliZXJ0eS5vcmcKfGh0dHA6Ly93d3cudGVj
-aHJldmlld2NoaW5hLmNvbQp8aHR0cDovL3d3dy5kZW1vbm9pZC5jb20vCnxodHRwOi8vd3d3Lndv
-cmxkYmJzLmluZm8vCmNoaW5lc2VwZW4ub3JnCmJsb2cuaXBob25lLWRldi5vcmcKYXZhdHJvbi5j
-b20KLmNhdGIub3JnCnpoLndpa2lwZWRpYS5vcmcqd2lraSpHRlcKLmlzbGFtLm9yZy5oawp0aHVt
-Ym5haWxzLnRydXZlby5jb20KdmlkZW8uYW9sLmNvbQouY3BqLm9yZwpoa2NjY2wub3JnLmhrCmNh
-dGhvbGljLm9yZy5oawouY29tbWl0dGVldG9wcm90ZWN0YmxvZ2dlcnMub3JnCi50cnV2ZW8uY29t
-LwouaHJ3Lm9yZwouYXNpYW5ld3MuaXQKaHR0cDovL3d3dy5jYXRob2xpYy5vcmcudHcvCi5ldmFu
-bGlmZS5vcmcuaGsKLmhranAub3JnCmhranAuZWFzeXdlYi5oawoucm9vZG8uY29tCmhrLmdlb2Np
-dGllcy5jb20KLnRpc3RvcnkuY29tCi52b3guY29tLwouY29tcGV0aXRpb25mb3JjZS5oawouY2hp
-bmdjaGVvbmcuY29tCi5sb25naGFpci5oawouZXhibG9nLmpwCmV0YWl3YW5uZXdzLmNvbQo=
+LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KCiEtLS0tLS0tLS0tLS0tWWFob28tLS0tLQpoay4qeWFo
+b28uY29tCnR3Lip5YWhvby5jb20KdXBjb21pbmcueWFob28uY29tCgp8aHR0cDovL2Jsb2cueWFt
+LmNvbS8Kbi55YW0uY29tCm5ld3MueWFtLmNvbQpmb3J1bS55b3JrYmJzLmNhCnxodHRwOi8vd3d3
+LnlvdXBhaS5vcmcvCnxodHRwOi8vd3d3LnlvdXItZnJlZWRvbS5uZXQvCnxodHRwczovL3d3dy55
+b3VyLWZyZWVkb20ubmV0Lwp5b3V0aGJhby5jb20KYmxvZy55b3V0aHdhbnQuY29tLnR3CnRvcGlj
+LnlvdXRod2FudC5jb20udHcKeW91dHViZS5jb20KIS0taGsueW91dHViZS5jb20KIS0tdHcueW91
+dHViZS5jb20KIS0tQEB5b3V0dWJlLmNvbS9nZXRfdmlkZW8KIS1Zb3V0dWJlIENETgoueXRpbWcu
+Y29tCnl0aHQubmV0LwoKIS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tWi0tLS0tLS0tLS0tLS0t
+LS0tLS0tLS0tLS0tCnxodHRwOi8vbHVudGFuLnphb2Jhby5jb20vCnd3dy56YXVydXMub3JnLnVr
+Ci56ZW5namlueWFuLm9yZwp5ZXppbWFyeS5zcGFjZXMubGl2ZS5jb20KemVuZ2ppbnlhbi5zcGFj
+ZXMubGl2ZS5jb20KemhvbmdndW90ZXNlLm5ldAp6dW9sYS5jb20KCiEtLS0tLS0tLS0tLS0tLS0t
+LS0tLS0tLS0tLU90aGVyLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpnZndQcm94eUVuYWJsZWQ9eWVz
+CnxodHRwOi8vKmZhbHVuCnxodHRwOi8vKmZyZWVnYXRlCnxodHRwOi8vKnNlYXJjaCpxKmNhY2hl
+CnxodHRwOi8vKnNlYXJjaCpxKnNhZmV3ZWIKfGh0dHA6Ly8qdWx0cmFyZWFjaAp8aHR0cDovLyp1
+bHRyYXN1cmYKCiEtLUlQIG9mIEh1YSBZdWFuIFdhbmcKNzIuNTIuODEuMjIKCiEtLWRvbmcgdGFp
+IHdhbmcKfGh0dHA6Ly8qJUU1JThBJUE4JUU2JTgwJTgxJUU3JUJEJTkxCiEtLWZhIGx1biBkYSBm
+YQp8aHR0cDovLyolRTYlQjMlOTUlRTglQkQlQUUlRTUlQTQlQTclRTYlQjMlOTUKIS0tRmEgTHVu
+IEdvbmc6IFRyYWRpdGlvbmFsIENoaW5lc2UKfGh0dHA6Ly8qJUU2JUIzJTk1JUU4JUJDJUFBJUU1
+JThBJTlGCiEtLUZhIEx1biBHb25nOiBTaW1wbGlmaWVkIENoaW5lc2UKfGh0dHA6Ly8qJUU2JUIz
+JTk1JUU4JUJEJUFFJUU1JThBJTlGCiEtLUppYW5nIExpdSBNYW5nCnxodHRwOi8vKnNlYXJjaCol
+RTYlQjElOUYlRTYlQjUlODElRTYlQjAlOTMKIS0tTGl1IFNpCnxodHRwOi8vKiVFNSU4NSVBRCVF
+NSU5QiU5QgohLS1MaXUgWGlhbyBCbwp8aHR0cDovLyolRTUlODglOTglRTYlOTklOTMlRTYlQjMl
+QTIKIS0tTWVpIEd1byBaaGkgWWluCnxodHRwOi8vKiVFNyVCRSU4RSVFNSU5QiVCRCVFNCVCOSU4
+QiVFOSU5RiVCMwohLS1NaW4gSmluIERhbmcKfGh0dHA6Ly8qJUU2JUIwJTkxJUU4JUJGJTlCJUU1
+JTg1JTlBCiEtLShOb25nKSBNaW4gWXVuIChEb25nIEh1aSkKfGh0dHA6Ly8qJUU2JUIwJTkxJUU4
+JUJGJTkwCiEtLVF1biBUaSBNaWUgSnVlCnxodHRwOi8vKnNlYXJjaColRTclQkUlQTQlRTQlQkQl
+OTMlRTclODElQUQlRTclQkIlOUQKIS0tVGlhbiBBbiBNZW4KZ29vZ2xlLmNvbSpzZWFyY2gqcSol
+RTUlQTQlQTklRTUlQUUlODklRTklOTclQTgKIS0tV2FuZyBEYW4KfGh0dHA6Ly8qJUU3JThFJThC
+JUU0JUI4JUI5CiEtLVd1IEppZQp8aHR0cDovLypzZWFyY2gqJUU2JTk3JUEwJUU3JTk1JThDCiEt
+LVhpZSBFCnxodHRwOi8vKnNlYXJjaColRTklODIlQUElRTYlODElQjYKIS0tWmhhbyBaaSBZYW5n
+CnxodHRwOi8vKiVFOCVCNSVCNSVFNyVCNCVBQiVFOSU5OCVCMwohLS1aaSBZb3UgTWVuCnxodHRw
+Oi8vd3d3Lmdvb2dsZS5jb20qJUU4JTg3JUFBJUU3JTk0JUIxJUU5JTk3JUE4CgoKIS0tLS0tLVVu
+U29ydGVkLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCgohLS0tLU5vdCBh
+IGtleXdvcmQsIG5lZWQgdG8gYmUgZWRpdGVkIGluIG5leHQgdmVyc2lvbiBvZiBBdXRvUHJveHkK
+aWNhbmhhc2NoZWV6YnVyZ2VyLmNvbQp0aW55cGFzdGUuY29tCnBsdXJrdGVtcGxhdGVzLmNvbQpn
+aWdhb20uY29tCnNzaGdmdy5jb20KdHZ1bmV0d29ya3MuY29tCm1pcm9ndWlkZS5jb20KdGhyb3Vn
+aG5pZ2h0c2ZpcmUuY29tCmltYWdlc2hhY2sudXMKbXVsdGlwbHkuY29tCmZyZWUtY3VsdHVyZS5j
+YwptYXJjby5vcmcKYmxvZy5raWNrc3RhcnRlci5jb20Kd2lraS5qcy1raXQuY29tCmdlZWthdGxh
+cy5jb20KbnVleHBvLmNvbQpwcmVzZW50YXRpb256ZW4uY29tCmVhc3lsaWZlLnR3CmZhaWxibG9n
+Lm9yZwoKCgp8aHR0cDovL2Rsc3RhdHVzYmFyLnByb2JvYXJkczQzLmNvbS8KfGh0dHA6Ly9tYW9t
+eS5tb3RpbWUuY29tLwp8aHR0cDovL2NoLnNodm9vbmcuY29tLwp8aHR0cDovL3d3dy55enprLmNv
+bS8KfGh0dHA6Ly93d3cud2Vla21hZy5pbmZvLwpiZW5kaWtlbi5uZXQKLmVjc3RhcnQuY29tLwp8
+aHR0cDovL2JzaWVnZWwuYXRoLmN4Lwp8aHR0cDovL3d3dy50eWNvb2wuY29tLwp3d3cubXNndWFu
+Y2hhLmNvbQp8aHR0cDovL3d3dy5tZWV0dXAuY29tLwp8aHR0cDovL3RydXZlby5jb20vCnxodHRw
+Oi8vZnVucC5jb20vCnxodHRwOi8vd3d3Lm94ZmFtLm9yZy5oay8KfGh0dHA6Ly93d3cuc2FsdmF0
+aW9uLm9yZy5oay8KfGh0dHA6Ly93d3cudGFjZW0ub3JnLwoucGl4bmV0Lm5ldC8KfGh0dHA6Ly9t
+eXNpbmFibG9nLmNvbS8KfGh0dHA6Ly93d3cua3dvbmd3YWguY29tLm15LwptaXRiYnMuY29tCmdh
+cmRlbm5ldHdvcmtzLmNvbQpkb25ndGFpd2FuZy5jb20KYm9saW4ubmV0ZmlybXMuY29tCnxodHRw
+Oi8vd3d3LnJmYS5vcmcvCmNvbWVmcm9tY2hpbmEuY29tCmdvcGV0aXRpb24uY29tCmR3bmV3cy5j
+b20KZmlyZW9mbGliZXJ0eS5vcmcKfGh0dHA6Ly93d3cudGVjaHJldmlld2NoaW5hLmNvbQp8aHR0
+cDovL3d3dy5kZW1vbm9pZC5jb20vCnxodHRwOi8vd3d3LndvcmxkYmJzLmluZm8vCmNoaW5lc2Vw
+ZW4ub3JnCmJsb2cuaXBob25lLWRldi5vcmcKYXZhdHJvbi5jb20KLmNhdGIub3JnCnpoLndpa2lw
+ZWRpYS5vcmcqd2lraSpHRlcKLmlzbGFtLm9yZy5oawp0aHVtYm5haWxzLnRydXZlby5jb20Kdmlk
+ZW8uYW9sLmNvbQouY3BqLm9yZwpoa2NjY2wub3JnLmhrCmNhdGhvbGljLm9yZy5oawouY29tbWl0
+dGVldG9wcm90ZWN0YmxvZ2dlcnMub3JnCi50cnV2ZW8uY29tLwouaHJ3Lm9yZwouYXNpYW5ld3Mu
+aXQKaHR0cDovL3d3dy5jYXRob2xpYy5vcmcudHcvCi5ldmFubGlmZS5vcmcuaGsKLmhranAub3Jn
+CmhranAuZWFzeXdlYi5oawoucm9vZG8uY29tCmhrLmdlb2NpdGllcy5jb20KLnRpc3RvcnkuY29t
+Ci52b3guY29tLwouY29tcGV0aXRpb25mb3JjZS5oawouY2hpbmdjaGVvbmcuY29tCi5sb25naGFp
+ci5oawouZXhibG9nLmpwCmV0YWl3YW5uZXdzLmNvbQo=