diff --git a/Clash/Outbound.yaml b/Clash/Outbound.yaml
index ce142dd..2527417 100644
--- a/Clash/Outbound.yaml
+++ b/Clash/Outbound.yaml
@@ -87,11 +87,15 @@ dns:
   # i.e. questions to these domain names will always be answered with their
   # real IP addresses
   fake-ip-filter:
-  #   - '*.lan'
-  #   - localhost.ptlogin2.qq.com
-    - 'dns.msftncsi.com'
-    - 'www.msftncsi.com'
-    - 'www.msftconnecttest.com'
+    - '*.lan'
+    - localhost.ptlogin2.qq.com
+    - '+.srv.nintendo.net'
+    - '+.stun.playstation.net'
+    - '+.msftconnecttest.com'
+    - '+.msftncsi.com'
+    - '+.xboxlive.com'
+    - 'msftconnecttest.com'
+    - 'xbox.*.microsoft.com'
   
   # Supports UDP, TCP, DoT, DoH. You can specify the port to connect to.
   # All DNS questions are sent directly to the nameserver, without proxies
diff --git a/Clash/RuleSet/Global.yaml b/Clash/RuleSet/Global.yaml
index e49f89d..d56092c 100644
--- a/Clash/RuleSet/Global.yaml
+++ b/Clash/RuleSet/Global.yaml
@@ -12,6 +12,7 @@ payload:
   - DOMAIN-KEYWORD,google
   - DOMAIN-KEYWORD,.blogspot.
   # > Microsoft
+  - DOMAIN-SUFFIX,aka.ms
   - DOMAIN-SUFFIX,onedrive.live.com
   - DOMAIN,az416426.vo.msecnd.net
   - DOMAIN,az668014.vo.msecnd.net
@@ -63,11 +64,15 @@ payload:
   - IP-CIDR,125.209.208.0/20,no-resolve
   - IP-CIDR,147.92.128.0/17,no-resolve
   - IP-CIDR,203.104.144.0/21,no-resolve
+  # > Amazon
+  - DOMAIN-SUFFIX,amazon.co.jp
+  - DOMAIN,d3c33hcgiwev3.cloudfront.net
+  - DOMAIN,payments-jp.amazon.com
+  - DOMAIN,s3-ap-northeast-1.amazonaws.com
+  - DOMAIN,s3-ap-southeast-2.amazonaws.com
   # > Akamai
   - DOMAIN,a248.e.akamai.net
   - DOMAIN,a771.dscq.akamai.net
-  # > Amazon CloudFront
-  - DOMAIN,d3c33hcgiwev3.cloudfront.net
   # > Others
   - DOMAIN-SUFFIX,4shared.com
   - DOMAIN-SUFFIX,9cache.com
@@ -75,7 +80,6 @@ payload:
   - DOMAIN-SUFFIX,abc.com
   - DOMAIN-SUFFIX,abc.net.au
   - DOMAIN-SUFFIX,abebooks.com
-  - DOMAIN-SUFFIX,amazon.co.jp
   - DOMAIN-SUFFIX,ao3.org
   - DOMAIN-SUFFIX,apigee.com
   - DOMAIN-SUFFIX,apkcombo.com
@@ -189,6 +193,7 @@ payload:
   - DOMAIN-SUFFIX,ftchinese.com
   - DOMAIN-SUFFIX,ftimg.net
   - DOMAIN-SUFFIX,gate.io
+  - DOMAIN-SUFFIX,genius.com
   - DOMAIN-SUFFIX,getlantern.org
   - DOMAIN-SUFFIX,getsync.com
   - DOMAIN-SUFFIX,github.com
@@ -352,6 +357,7 @@ payload:
   - DOMAIN-SUFFIX,steemit.com
   - DOMAIN-SUFFIX,steemitwallet.com
   - DOMAIN-SUFFIX,straitstimes.com
+  - DOMAIN-SUFFIX,streamable.com
   - DOMAIN-SUFFIX,streema.com
   - DOMAIN-SUFFIX,t66y.com
   - DOMAIN-SUFFIX,tapatalk.com
@@ -427,9 +433,6 @@ payload:
 
   - DOMAIN,cc.tvbs.com.tw
   - DOMAIN,ocsp.int-x3.letsencrypt.org
-  - DOMAIN,payments-jp.amazon.com
-  - DOMAIN,s3-ap-northeast-1.amazonaws.com
-  - DOMAIN,s3-ap-southeast-2.amazonaws.com
   - DOMAIN,search.avira.com
   - DOMAIN,us.weibo.com
 
@@ -496,12 +499,7 @@ payload:
   - DOMAIN-SUFFIX,telegram.me
   - DOMAIN-SUFFIX,telesco.pe
   # > Facebook
-  - DOMAIN-SUFFIX,facebook.br
-  - DOMAIN-SUFFIX,facebook.design
-  - DOMAIN-SUFFIX,facebook.hu
-  - DOMAIN-SUFFIX,facebook.in
-  - DOMAIN-SUFFIX,facebook.nl
-  - DOMAIN-SUFFIX,facebook.se
+  - DOMAIN-KEYWORD,.facebook.
   - DOMAIN-SUFFIX,facebookmail.com
   # > Others
   - DOMAIN-SUFFIX,noxinfluencer.com
@@ -543,4 +541,5 @@ payload:
   - DOMAIN-SUFFIX,inkbunny.net
   - DOMAIN-SUFFIX,metapix.net
   - DOMAIN-SUFFIX,s3.amazonaws.com
-  - DOMAIN-SUFFIX,zaobao.com.sg
\ No newline at end of file
+  - DOMAIN-SUFFIX,zaobao.com.sg
+  - DOMAIN,ocsp.apple.com
\ No newline at end of file
diff --git a/Quantumult/Filter/Global.list b/Quantumult/Filter/Global.list
index a13d192..0ca5be4 100644
--- a/Quantumult/Filter/Global.list
+++ b/Quantumult/Filter/Global.list
@@ -11,6 +11,7 @@ DOMAIN-SUFFIX,xn--ngstr-lra8j.com,PROXY
 DOMAIN-KEYWORD,google,PROXY
 DOMAIN-KEYWORD,.blogspot.,PROXY
 # > Microsoft
+DOMAIN-SUFFIX,aka.ms,PROXY
 DOMAIN-SUFFIX,onedrive.live.com,PROXY
 DOMAIN,az416426.vo.msecnd.net,PROXY
 DOMAIN,az668014.vo.msecnd.net,PROXY
@@ -62,11 +63,15 @@ IP-CIDR,103.2.30.0/23,PROXY
 IP-CIDR,125.209.208.0/20,PROXY
 IP-CIDR,147.92.128.0/17,PROXY
 IP-CIDR,203.104.144.0/21,PROXY
+# > Amazon
+DOMAIN-SUFFIX,amazon.co.jp,PROXY
+DOMAIN,d3c33hcgiwev3.cloudfront.net,PROXY
+DOMAIN,payments-jp.amazon.com,PROXY
+DOMAIN,s3-ap-northeast-1.amazonaws.com,PROXY
+DOMAIN,s3-ap-southeast-2.amazonaws.com,PROXY
 # > Akamai
 DOMAIN,a248.e.akamai.net,PROXY
 DOMAIN,a771.dscq.akamai.net,PROXY
-# > Amazon CloudFront
-DOMAIN,d3c33hcgiwev3.cloudfront.net,PROXY
 # > Others
 DOMAIN-SUFFIX,4shared.com,PROXY
 DOMAIN-SUFFIX,9cache.com,PROXY
@@ -74,7 +79,6 @@ DOMAIN-SUFFIX,9gag.com,PROXY
 DOMAIN-SUFFIX,abc.com,PROXY
 DOMAIN-SUFFIX,abc.net.au,PROXY
 DOMAIN-SUFFIX,abebooks.com,PROXY
-DOMAIN-SUFFIX,amazon.co.jp,PROXY
 DOMAIN-SUFFIX,ao3.org,PROXY
 DOMAIN-SUFFIX,apigee.com,PROXY
 DOMAIN-SUFFIX,apkcombo.com,PROXY
@@ -188,6 +192,7 @@ DOMAIN-SUFFIX,ft.com,PROXY
 DOMAIN-SUFFIX,ftchinese.com,PROXY
 DOMAIN-SUFFIX,ftimg.net,PROXY
 DOMAIN-SUFFIX,gate.io,PROXY
+DOMAIN-SUFFIX,genius.com,PROXY
 DOMAIN-SUFFIX,getlantern.org,PROXY
 DOMAIN-SUFFIX,getsync.com,PROXY
 DOMAIN-SUFFIX,github.com,PROXY
@@ -351,6 +356,7 @@ DOMAIN-SUFFIX,steamcommunity.com,PROXY
 DOMAIN-SUFFIX,steemit.com,PROXY
 DOMAIN-SUFFIX,steemitwallet.com,PROXY
 DOMAIN-SUFFIX,straitstimes.com,PROXY
+DOMAIN-SUFFIX,streamable.com,PROXY
 DOMAIN-SUFFIX,streema.com,PROXY
 DOMAIN-SUFFIX,t66y.com,PROXY
 DOMAIN-SUFFIX,tapatalk.com,PROXY
@@ -426,9 +432,6 @@ DOMAIN-SUFFIX,zoom.us,PROXY
 
 DOMAIN,cc.tvbs.com.tw,PROXY
 DOMAIN,ocsp.int-x3.letsencrypt.org,PROXY
-DOMAIN,payments-jp.amazon.com,PROXY
-DOMAIN,s3-ap-northeast-1.amazonaws.com,PROXY
-DOMAIN,s3-ap-southeast-2.amazonaws.com,PROXY
 DOMAIN,search.avira.com,PROXY
 DOMAIN,us.weibo.com,PROXY
 
@@ -527,4 +530,5 @@ DOMAIN-SUFFIX,cloudcone.com.cn,PROXY
 DOMAIN-SUFFIX,inkbunny.net,PROXY
 DOMAIN-SUFFIX,metapix.net,PROXY
 DOMAIN-SUFFIX,s3.amazonaws.com,PROXY
-DOMAIN-SUFFIX,zaobao.com.sg,PROXY
\ No newline at end of file
+DOMAIN-SUFFIX,zaobao.com.sg,PROXY
+DOMAIN,ocsp.apple.com,PROXY
\ No newline at end of file
diff --git a/Surge/OutboundLegacy.conf b/Surge/OutboundLegacy.conf
index 8e1119c..406006c 100644
--- a/Surge/OutboundLegacy.conf
+++ b/Surge/OutboundLegacy.conf
@@ -1172,6 +1172,7 @@ DOMAIN-SUFFIX,xn--ngstr-lra8j.com,🌑Proxy,force-remote-dns
 DOMAIN-KEYWORD,google,🌑Proxy,force-remote-dns
 DOMAIN-KEYWORD,.blogspot.,🌑Proxy,force-remote-dns
 # > Microsoft
+DOMAIN-SUFFIX,aka.ms,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,onedrive.live.com,🌑Proxy,force-remote-dns
 DOMAIN,az416426.vo.msecnd.net,🌑Proxy,force-remote-dns
 DOMAIN,az668014.vo.msecnd.net,🌑Proxy,force-remote-dns
@@ -1223,11 +1224,15 @@ IP-CIDR,103.2.30.0/23,🌑Proxy,no-resolve
 IP-CIDR,125.209.208.0/20,🌑Proxy,no-resolve
 IP-CIDR,147.92.128.0/17,🌑Proxy,no-resolve
 IP-CIDR,203.104.144.0/21,🌑Proxy,no-resolve
+# > Amazon
+DOMAIN-SUFFIX,amazon.co.jp,🌑Proxy,force-remote-dns
+DOMAIN,d3c33hcgiwev3.cloudfront.net,🌑Proxy,force-remote-dns
+DOMAIN,payments-jp.amazon.com,🌑Proxy,force-remote-dns
+DOMAIN,s3-ap-northeast-1.amazonaws.com,🌑Proxy,force-remote-dns
+DOMAIN,s3-ap-southeast-2.amazonaws.com,🌑Proxy,force-remote-dns
 # > Akamai
 DOMAIN,a248.e.akamai.net,🌑Proxy,force-remote-dns
 DOMAIN,a771.dscq.akamai.net,🌑Proxy,force-remote-dns
-# > Amazon CloudFront
-DOMAIN,d3c33hcgiwev3.cloudfront.net,🌑Proxy,force-remote-dns
 # > Others
 DOMAIN-SUFFIX,4shared.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,9cache.com,🌑Proxy,force-remote-dns
@@ -1235,7 +1240,6 @@ DOMAIN-SUFFIX,9gag.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,abc.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,abc.net.au,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,abebooks.com,🌑Proxy,force-remote-dns
-DOMAIN-SUFFIX,amazon.co.jp,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,ao3.org,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,apigee.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,apkcombo.com,🌑Proxy,force-remote-dns
@@ -1349,6 +1353,7 @@ DOMAIN-SUFFIX,ft.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,ftchinese.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,ftimg.net,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,gate.io,🌑Proxy,force-remote-dns
+DOMAIN-SUFFIX,genius.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,getlantern.org,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,getsync.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,github.com,🌑Proxy,force-remote-dns
@@ -1512,6 +1517,7 @@ DOMAIN-SUFFIX,steamcommunity.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,steemit.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,steemitwallet.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,straitstimes.com,🌑Proxy,force-remote-dns
+DOMAIN-SUFFIX,streamable.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,streema.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,t66y.com,🌑Proxy,force-remote-dns
 DOMAIN-SUFFIX,tapatalk.com,🌑Proxy,force-remote-dns
@@ -1587,9 +1593,6 @@ DOMAIN-SUFFIX,zoom.us,🌑Proxy,force-remote-dns
 
 DOMAIN,cc.tvbs.com.tw,🌑Proxy,force-remote-dns
 DOMAIN,ocsp.int-x3.letsencrypt.org,🌑Proxy,force-remote-dns
-DOMAIN,payments-jp.amazon.com,🌑Proxy,force-remote-dns
-DOMAIN,s3-ap-northeast-1.amazonaws.com,🌑Proxy,force-remote-dns
-DOMAIN,s3-ap-southeast-2.amazonaws.com,🌑Proxy,force-remote-dns
 DOMAIN,search.avira.com,🌑Proxy,force-remote-dns
 DOMAIN,us.weibo.com,🌑Proxy,force-remote-dns
 
@@ -1704,6 +1707,7 @@ DOMAIN-SUFFIX,inkbunny.net,🌑Proxy
 DOMAIN-SUFFIX,metapix.net,🌑Proxy
 DOMAIN-SUFFIX,s3.amazonaws.com,🌑Proxy
 DOMAIN-SUFFIX,zaobao.com.sg,🌑Proxy
+DOMAIN,ocsp.apple.com,🌑Proxy
 
 # China Area Network
 # > 360
diff --git a/Surge/Ruleset/Global.list b/Surge/Ruleset/Global.list
index 9af6d39..6719a92 100644
--- a/Surge/Ruleset/Global.list
+++ b/Surge/Ruleset/Global.list
@@ -11,6 +11,7 @@ DOMAIN-SUFFIX,xn--ngstr-lra8j.com
 DOMAIN-KEYWORD,google
 DOMAIN-KEYWORD,.blogspot.
 # > Microsoft
+DOMAIN-SUFFIX,aka.ms
 DOMAIN-SUFFIX,onedrive.live.com
 DOMAIN,az416426.vo.msecnd.net
 DOMAIN,az668014.vo.msecnd.net
@@ -62,11 +63,15 @@ IP-CIDR,103.2.30.0/23,no-resolve
 IP-CIDR,125.209.208.0/20,no-resolve
 IP-CIDR,147.92.128.0/17,no-resolve
 IP-CIDR,203.104.144.0/21,no-resolve
+# > Amazon
+DOMAIN-SUFFIX,amazon.co.jp
+DOMAIN,d3c33hcgiwev3.cloudfront.net
+DOMAIN,payments-jp.amazon.com
+DOMAIN,s3-ap-northeast-1.amazonaws.com
+DOMAIN,s3-ap-southeast-2.amazonaws.com
 # > Akamai
 DOMAIN,a248.e.akamai.net
 DOMAIN,a771.dscq.akamai.net
-# > Amazon CloudFront
-DOMAIN,d3c33hcgiwev3.cloudfront.net
 # > Others
 DOMAIN-SUFFIX,4shared.com
 DOMAIN-SUFFIX,9cache.com
@@ -74,7 +79,6 @@ DOMAIN-SUFFIX,9gag.com
 DOMAIN-SUFFIX,abc.com
 DOMAIN-SUFFIX,abc.net.au
 DOMAIN-SUFFIX,abebooks.com
-DOMAIN-SUFFIX,amazon.co.jp
 DOMAIN-SUFFIX,ao3.org
 DOMAIN-SUFFIX,apigee.com
 DOMAIN-SUFFIX,apkcombo.com
@@ -188,6 +192,7 @@ DOMAIN-SUFFIX,ft.com
 DOMAIN-SUFFIX,ftchinese.com
 DOMAIN-SUFFIX,ftimg.net
 DOMAIN-SUFFIX,gate.io
+DOMAIN-SUFFIX,genius.com
 DOMAIN-SUFFIX,getlantern.org
 DOMAIN-SUFFIX,getsync.com
 DOMAIN-SUFFIX,github.com
@@ -351,6 +356,7 @@ DOMAIN-SUFFIX,steamcommunity.com
 DOMAIN-SUFFIX,steemit.com
 DOMAIN-SUFFIX,steemitwallet.com
 DOMAIN-SUFFIX,straitstimes.com
+DOMAIN-SUFFIX,streamable.com
 DOMAIN-SUFFIX,streema.com
 DOMAIN-SUFFIX,t66y.com
 DOMAIN-SUFFIX,tapatalk.com
@@ -426,9 +432,6 @@ DOMAIN-SUFFIX,zoom.us
 
 DOMAIN,cc.tvbs.com.tw
 DOMAIN,ocsp.int-x3.letsencrypt.org
-DOMAIN,payments-jp.amazon.com
-DOMAIN,s3-ap-northeast-1.amazonaws.com
-DOMAIN,s3-ap-southeast-2.amazonaws.com
 DOMAIN,search.avira.com
 DOMAIN,us.weibo.com
 
@@ -495,12 +498,7 @@ DOMAIN-SUFFIX,tdesktop.com
 DOMAIN-SUFFIX,telegram.me
 DOMAIN-SUFFIX,telesco.pe
 # > Facebook
-DOMAIN-SUFFIX,facebook.br
-DOMAIN-SUFFIX,facebook.design
-DOMAIN-SUFFIX,facebook.hu
-DOMAIN-SUFFIX,facebook.in
-DOMAIN-SUFFIX,facebook.nl
-DOMAIN-SUFFIX,facebook.se
+DOMAIN-KEYWORD,.facebook.
 DOMAIN-SUFFIX,facebookmail.com
 # > Others
 DOMAIN-SUFFIX,noxinfluencer.com
@@ -542,4 +540,5 @@ DOMAIN-SUFFIX,cloudcone.com.cn
 DOMAIN-SUFFIX,inkbunny.net
 DOMAIN-SUFFIX,metapix.net
 DOMAIN-SUFFIX,s3.amazonaws.com
-DOMAIN-SUFFIX,zaobao.com.sg
\ No newline at end of file
+DOMAIN-SUFFIX,zaobao.com.sg
+DOMAIN,ocsp.apple.com
\ No newline at end of file