diff --git a/config/dts-pontifex.yaml b/config/dts-pontifex.yaml
index b9d8d50..258a164 100644
--- a/config/dts-pontifex.yaml
+++ b/config/dts-pontifex.yaml
@@ -15,7 +15,6 @@ external-controller: 127.0.0.1:9090
 secret: '314159271828'
 external-ui: "/usr/share/openclash/ui"
 
-
 # ———————————————————————————————————— general ———————————————————————————————————
 mode: rule
 ipv6: false
@@ -92,11 +91,26 @@ dns:
      - '+.netbird.selfhosted'
      - '+.shamanlanding.org'
   nameserver:
-    - https://purpose.shamanlanding.org/dns-query/dts-pontifex
     - https://d.adguard-dns.com/dns-query/5ffb7de2
+    - 208.67.222.222
+    - 208.67.220.220
+    - 9.9.9.9
+    - 149.112.112.112
+    - 8.26.56.26
+    - 8.20.247.20
+    - 185.228.168.9
+    - 185.228.169.9
   fallback:
     - https://dns.google/dns-query
     - https://cloudflare-dns.com/dns-query
+    - 208.67.222.222
+    - 208.67.220.220
+    - 9.9.9.9
+    - 149.112.112.112
+    - 8.26.56.26
+    - 8.20.247.20
+    - 185.228.168.9
+    - 185.228.169.9
   # If IP addresses resolved with servers in `nameservers` are in the specified
   # subnets below, they are considered invalid and results from `fallback`
   # servers are used instead.
@@ -127,16 +141,16 @@ dns:
   health-check-for-providers: &health_check_for_providers
     enable: true
     interval: 600
-    url: http://www.gstatic.com/generate_204
+    url: https://www.gstatic.com/generate_204
   
   health-check-for-selectors: &health_check_for_selectors
-    url: https://cp.cloudflare.com/generate_204
     interval: 300
-  
+    url: https://www.gstatic.com/generate_204
+    
   health-check-for-load-balancers: &health_check_for_load_balancers
-    url: https://cp.cloudflare.com/generate_204
     interval: 300
-
+    url: https://www.gstatic.com/generate_204
+    
   default-rule-provider-config: &default_rule_provider_config
     type: http
     behavior: classical
@@ -147,6 +161,17 @@ dns:
     strategy: sticky-sessions
     use:
       - own
+  
+  p-vpn-list_smart_gr: &p_vpn_list_smart_gr
+    type: smart
+    # policy-priority: "" 
+    uselightgbm: true
+    collectdata: true
+    strategy: 'sticky-sessions'
+    sample-rate: 1
+    hidden: true
+    use:
+      - own
 
   p-vpn-list_selector: &p_vpn_list_selector
     type: select
@@ -160,18 +185,21 @@ dns:
       - xfizz
       - arza-1
       - Un1c4d3
+      - vezdehod
 
   np-vpn-list_smart_gr: &np_vpn_list_smart_gr
     type: smart
-    policy-priority: "Premium:0.9;SG:1.3" 
+    policy-priority: "" 
     uselightgbm: true
     collectdata: true
     strategy: 'sticky-sessions'
     sample-rate: 1
+    hidden: true
     use:
       - xfizz
       - arza-1
       - Un1c4d3
+      - vezdehod
 
   np-vpn-list_balancer: &np_vpn_list_balancer
     type: load-balance
@@ -180,18 +208,15 @@ dns:
       - xfizz
       - arza-1
       - Un1c4d3
+      - vezdehod
     
   np-vpn-list_selector: &np_vpn_list_selector
     type: select
     use:
       - xfizz
       - arza-1
-      - Un1c4d3  
-
-  default-private-proxies-lb-selector: &default_private_proxies_lb_selector
-    type: select
-    proxies:
-      - ⚖️ Personal VPN
+      - Un1c4d3
+      - vezdehod  
   
 # ————————————————————————————————— proxies list —————————————————————————————————
 proxies:
@@ -205,7 +230,7 @@ proxies:
     type: direct
     udp: true
     ip-version: ipv4
-    interface-name: eth2
+    interface-name: eth1
   #- name: "WAN C [Mobile]"
   #  type: direct
   #  udp: true
@@ -226,7 +251,7 @@ proxy-providers:
     interval: 3600
     proxy: DIRECT
     path: "./proxy_provider/own-1.txt"
-    exclude-filter: "(?i)xhttp"
+    exclude-filter: ""
     override:
       additional-prefix: "🔆 "
       additional-suffix: ""
@@ -234,29 +259,28 @@ proxy-providers:
       <<: *health_check_for_providers
   
   # ——————————————————— non-personal services ——————————————————
-  #https://sub-001.dns-on-fire.net/api/sub/Jfo_eg3X0NchfJ3_ 
+  #https://sub-001.dns-on-fire.net/api/sub/Jfo_eg3X0NchfJ3_
   vezdehod:
     type: http
     url: "https://sub-001.dns-on-fire.net/api/sub/Jfo_eg3X0NchfJ3_"
     interval: 3600
-    proxy: 🔢 Personal VPN
+    proxy: ▣ Personal
     path: "./proxy_provider/vezdehod.txt"
-    exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:"
+    exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:|Купить|🔜"
     override:
       additional-prefix: ""
       additional-suffix: "•𝓿"
     health-check:
       <<: *health_check_for_providers
   
-  
   #https://xfizz.cc/sublink/XzU0rRmBeOZtIPprW46f2ieNFcF8PJw9?name=1Y:2213
   xfizz:
     type: http
     url: "https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/proxy-provider/fizz-vpn.txt"
     interval: 3600
-    proxy: 🔢 Personal VPN
+    proxy: ▣ Personal
     path: "./proxy_provider/fizz-vpn.txt"
-    exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:"
+    exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:|Купить|🔜ь"
     override:
       additional-prefix: ""
       additional-suffix: "•𝓯"
@@ -268,9 +292,9 @@ proxy-providers:
     type: http
     url: "https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/proxy-provider/arza.txt"
     interval: 3600
-    proxy: 🔢 Personal VPN
+    proxy: ▣ Personal
     path: "./proxy_provider/arza.txt"
-    exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:"
+    exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:|Купить|🔜"
     override:
       additional-prefix: ""
       additional-suffix: "•𝓪"
@@ -282,7 +306,7 @@ proxy-providers:
     type: http
     url: "https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/proxy-provider/Un1c4d3.txt"
     interval: 3600
-    proxy: DIRECT
+    proxy: ▣ Personal
     path: "./proxy_provider/Un1c4d3.txt"
     exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:"
     override:
@@ -302,7 +326,7 @@ proxy-groups:
     interval: 300
   
   # ————————————————————— direct wan routes ————————————————————
-  - name: ⚖️ AB
+  - name: AB
     type: load-balance
     disable-udp: false
     proxies:
@@ -310,7 +334,7 @@ proxy-groups:
       - WAN B [РосТелеКом]
     hidden: true
 
-  # - name: ⚖️ ABC
+  # - name: ABC
   #  type: load-balance
   #  disable-udp: false
   #  proxies:
@@ -320,337 +344,536 @@ proxy-groups:
   #  hidden: true
   
   # ————————————————————— direct selectors —————————————————————
-  - name: 🖥️ LAN Clients
+  - name: LAN Clients
     type: select
     disable-udp: false
     proxies:
-      - ⚖️ AB
-  #   - ⚖️ ABC
+      - AB
+  #   - ABC
       - WAN A [Мегафон]
       - WAN B [РосТелеКом]
   #   - WAN C [Mobile]
 
-  - name: 🛋️ IOT Clients
+  - name: IOT Clients
     type: select
     disable-udp: false
     proxies:
-      - 🖥️ LAN Clients
-      - ⚖️ AB
-  #   - ⚖️ ABC
+      - LAN Clients
+      - AB
+  #   - ABC
       - WAN A [Мегафон]
       - WAN B [РосТелеКом]
   #   - WAN C [Mobile]
 
-  - name: 👾 Unprivileged Webway
+  - name: Unprivileged Webway
     type: select
     disable-udp: false
     proxies:
-      - 🖥️ LAN Clients
-      - ⚖️ AB
-  #   - ⚖️ ABC
+      - LAN Clients
+      - AB
+  #   - ABC
       - WAN A [Мегафон]
       - WAN B [РосТелеКом]
   #   - WAN C [Mobile]
 
-  - name: 🌟 Privileged Webway
+  - name: Privileged Webway
     type: select
     disable-udp: false
     proxies:
-      - 🖥️ LAN Clients
-      - ⚖️ AB
-  #   - ⚖️ ABC
+      - LAN Clients
+      - AB
+  #   - ABC
       - WAN A [Мегафон]
       - WAN B [РосТелеКом]
   #   - WAN C [Mobile]
   
-  # —————————————— load balancers for personal vpn —————————————
-  - name: ⚖️ Personal VPN
+  # ——————————————— smart groups for personal vpn ———————————————
+  - name: ▣ Personal
     disable-udp: false
-    <<: [*p_vpn_list_balancer, *health_check_for_load_balancers]
-    
-  # —————————————— url tested for non-personal vpn —————————————
-  - name: ⌚ Europe 🌍
-    disable-udp: false
-    filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Spain|UK|Switzerland|Italy|Norway|Belgium"
-    <<: [*np_vpn_list_url_test, *health_check_for_load_balancers]
+    <<: [*p_vpn_list_smart_gr, *health_check_for_load_balancers]
 
   # ————————————— smart groups for non-personal vpn —————————————
-  - name: 🧠 Europe 🌍
+  - name: Europe 🇪🇺
     disable-udp: false
-    filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Spain|UK|Switzerland|Italy|Norway|Belgium"
+    filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Spain|UK|Switzerland|Italy|Norway|Belgium|Netherl|Poland|GREAT BRIATAIN|GREAT BRITAIN|Austria|Denmark|Lithuania|Latvia|MOLDOVA"
     <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
 
-  - name: 🧠 All non-personal
-    disable-udp: false
-    filter: ""
-    <<: [*np_vpn_list_smart_gr, *health_check_for_selectors]
-  
-  # ———————————— load balancers for non-personal vpn ———————————
-  - name: ⚖️ Asia 🌍
-    disable-udp: false
-    filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore"
-    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-    hidden: true
-  
-  - name: ⚖️ Europe 🌍
-    disable-udp: false
-    filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Spain|UK|Switzerland|Italy|Norway|Belgium"
-    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-    hidden: true
-  
-  - name: ⚖️ USA 🌍
-    disable-udp: false
-    filter: "(?i)USA|Canada"
-    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-    hidden: true
-  
-  - name: ⚖️ High Bandwidth
-    disable-udp: false
-    filter: "(?i)10 Gbit"
-    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-    hidden: true
-  
-  - name: ⚖️ Russian 🌍
+  - name: Russia 🇷🇺 
     disable-udp: false
     filter: "(?i)Russia"
-    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-    hidden: true
-  
-  - name: ⚖️ Fast Servers
+    <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
+
+  - name: Kazakhstan 🇰🇿
     disable-udp: false
-    filter: "(?i)Low Ping"
-    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-    hidden: true
+    filter: "(?i)Kazakhstan|KZ"
+    <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
   
+  - name: Turkey 🇹🇷
+    disable-udp: false
+    filter: "(?i)TURKEY"
+    <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
+
+  - name: ▣ Non-personal
+    disable-udp: false
+    filter: ""
+    <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
+
+  - name: Asia & ME 🇳🇵 
+    disable-udp: false
+    filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore|Egypt|Taiwan|UAE|India"
+    <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
+
+  - name: USA 🇺🇸
+    disable-udp: false
+    filter: "(?i)USA|Canada"
+    <<: [*np_vpn_list_smart_gr, *health_check_for_load_balancers]
+
   # ————————————— global selectors for personal vpn ————————————
-  - name: 🔢 Personal VPN
+  - name: Personal 1️⃣
+    disable-udp: false
+    <<: [*p_vpn_list_selector, *health_check_for_selectors]
+  
+  - name: Personal 2️⃣
     disable-udp: false
     <<: [*p_vpn_list_selector, *health_check_for_selectors]
   
   # ——————————— global selectors for non-personal vpn ——————————
-  - name: 🔢 Asia 🌍 
+  - name: Asia & ME 🇳🇵 🄪 
     disable-udp: false
-    filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore"
+    filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore|Egypt|Taiwan|UAE|India"
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
-  - name: 🔢 Europe 🌍
+  - name: Europe 🇪🇺 🄪
     disable-udp: false
     filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Spain|UK|Switzerland|Italy|Norway|Belgium|Moldova"
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
   
-  - name: 🔢 Kazakhstan 🌍
+  - name: Kazakhstan 🇰🇿 🄪
     disable-udp: false
     filter: "(?i)Kazakhstan|KZ"
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
   
-  - name: 🔢 Russian 🌍
+  - name: Turkey 🇹🇷 🄪
+    disable-udp: false
+    filter: "(?i)TURKEY"
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
+  
+  - name: Russia 🇷🇺 🄪
     disable-udp: false
     filter: "(?i)Russia"
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
-  - name: 🔢 USA 🌍
+  - name: USA 🇺🇸 🄪
     disable-udp: false
     filter: "(?i)USA|Canada"
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
-  - name: 🔢 All non-personal
+  - name: Non-personal 1️⃣
+    disable-udp: false
+    filter: ""
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
+  
+  - name: Non-personal 2️⃣
     disable-udp: false
     filter: ""
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
-  - name: 🔢 TOR Compliant
+  - name: Non-personal 3️⃣
     disable-udp: false
-    filter: "(?i)TOR✅"
+    filter: ""
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
+  
+  - name: Non-personal 4️⃣
+    disable-udp: false
+    filter: ""
     <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
-  
-  # ——————— selectors for local rules ——————
-  - name: ✳️ YouTube
+# ——————— selectors for local rules ——————
+# PUBLIC LISTS - https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-lists-public/
+
+  - name: Adblock
     type: select
     proxies:
-      - 🔢 Russian 🌍
-      - 🧠 Europe 🌍
-      - ⚖️ Europe 🌍
-      - ⚖️ Russian 🌍
-      - ⚖️ Personal VPN
+      - DIRECT
+      - REJECT
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+    <<: *health_check_for_selectors
+
+  - name: Antifilter
+    type: select
+    proxies:
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Europe 🇪🇺
+      - Europe 🇪🇺 🄪
+    <<: *health_check_for_selectors
+
+# PRIVATE LISTS - https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-lists-private/
+
+  - name: Adaptaion
+    type: select
+    proxies:
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Europe 🇪🇺
+      - Europe 🇪🇺 🄪
+    <<: *health_check_for_selectors
+
+  - name: Testzone 🅰
+    type: select
+    proxies:
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+    <<: *health_check_for_selectors
+
+  - name: Testzone 🅱
+    type: select
+    proxies:
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+    <<: *health_check_for_selectors
+
+# CONSOLIDATED SERVICES - https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/
+  - name: AI Stuff
+    type: select
+    proxies:
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Europe 🇪🇺
+      - Turkey 🇹🇷
+      - Asia & ME 🇳🇵 
+      - USA 🇺🇸
+      - Europe 🇪🇺 🄪
+      - Turkey 🇹🇷 🄪
+      - Asia & ME 🇳🇵 🄪
+      - USA 🇺🇸 🄪
     <<: *health_check_for_selectors
   
-  - name: ✳️ Discord
+  - name: USA Services
     type: select
     disable-udp: false
     proxies:
-      - 🔢 Fast Servers
-      - 🔢 Personal VPN
-      - 🔢 Europe 🌍
-      - ⌚ Europe 🌍
-      - 🧠 Europe 🌍
-      - ⚖️ Personal VPN
-      - ⚖️ Europe 🌍
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - USA 🇺🇸
+      - USA 🇺🇸 🄪
     <<: *health_check_for_selectors
 
-  - name: ✳️ USA Services
+# SERVICES - https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/
+  - name: Discord
     type: select
     disable-udp: false
     proxies:
-      - 🔢 USA 🌍
-      - 🔢 Personal VPN
-      - ⚖️ USA 🌍
-      - ⚖️ Personal VPN
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Russia 🇷🇺
+      - Europe 🇪🇺
+      - USA 🇺🇸
+      - Russia 🇷🇺 🄪
+      - Europe 🇪🇺 🄪
+      - USA 🇺🇸 🄪
     <<: *health_check_for_selectors
 
-  - name: ✳️ Adaptaion
+  - name: Notion
     type: select
     proxies:
-      - 🔢 Personal VPN
-      - 🔢 Europe 🌍
-      - ⌚ Europe 🌍
-      - 🧠 Europe 🌍
-      - 🧠 All non-personal
-      - ⚖️ Personal VPN
-      - ⚖️ Europe 🌍
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Europe 🇪🇺
+      - Europe 🇪🇺 🄪
     <<: *health_check_for_selectors
 
-  - name: ✳️ Antifilter
+  - name: Steam
     type: select
     proxies:
-      - 🔢 Personal VPN
-      - 🔢 Europe 🌍
-      - ⌚ Europe 🌍
-      - 🧠 Europe 🌍
-      - 🧠 All non-personal
-      - ⚖️ Personal VPN
-      - ⚖️ Europe 🌍
+      - DIRECT
+      - REJECT
+      - Kazakhstan 🇰🇿
+      - Kazakhstan 🇰🇿 🄪
+      - Turkey
+      - Turkey 🇹🇷 🄪 
+      - USA 🇺🇸
+      - USA 🇺🇸 🄪
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
     <<: *health_check_for_selectors
 
-  - name: ✳️ Notion
+  - name: Telegram
     type: select
     proxies:
-      - 🔢 Personal VPN
-      - 🔢 Europe 🌍
-      - ⌚ Europe 🌍
-      - 🧠 Europe 🌍
-      - ⚖️ Personal VPN
-      - ⚖️ Europe 🌍
+      - DIRECT
+      - REJECT
+      - ▣ Personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Russia 🇷🇺
+      - Europe 🇪🇺
+      - USA 🇺🇸
+      - Russia 🇷🇺 🄪
+      - Europe 🇪🇺 🄪
+      - USA 🇺🇸 🄪
     <<: *health_check_for_selectors
 
-  - name: ✳️ AI Stuff (Western)
+  - name: WeChat
     type: select
     proxies:
-      - 🔢 Personal VPN
-      - 🔢 Europe 🌍
-      - ⌚ Europe 🌍
-      - 🧠 Europe 🌍
-      - ⚖️ Personal VPN
-      - ⚖️ Europe 🌍
+      - DIRECT
+      - REJECT
+      - ▣ Personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Asia & ME 🇳🇵
+      - Europe 🇪🇺
+      - Russia 🇷🇺
+      - USA 🇺🇸
+      - Asia & ME 🇳🇵 🄪
+      - Europe 🇪🇺 🄪
+      - Russia 🇷🇺 🄪
+      - USA 🇺🇸 🄪
     <<: *health_check_for_selectors
 
-  - name: ✳️ Testzone A
+  - name: WhatsApp
     type: select
     proxies:
-      - 🔢 All non-personal
-      - 🔢 Russian 🌍
-      - 🔢 Europe 🌍
-      - 🔢 USA 🌍
-      - 🔢 Asia 🌍 
-      - 🔢 Kazakhstan 🌍
-      - 🔢 Personal VPN
-      - ⌚ Europe 🌍
-      - 🧠 Europe 🌍
-      - 🧠 All non-personal
-      - ⚖️ Russian 🌍
-      - ⚖️ Europe 🌍
-      - ⚖️ USA 🌍 
-      - ⚖️ Asia 🌍 
-      - ⚖️ Personal VPN
+      - DIRECT
+      - REJECT
+      - ▣ Personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Europe 🇪🇺
+      - Russia 🇷🇺
+      - USA 🇺🇸
+      - Europe 🇪🇺 🄪
+      - Russia 🇷🇺 🄪
+      - USA 🇺🇸 🄪
     <<: *health_check_for_selectors
 
+  - name: XBox
+    type: select
+    proxies:
+      - DIRECT
+      - REJECT
+      - Kazakhstan 🇰🇿
+      - Kazakhstan 🇰🇿 🄪
+      - Turkey
+      - Turkey 🇹🇷 🄪 
+      - USA 🇺🇸
+      - USA 🇺🇸 🄪
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+    <<: *health_check_for_selectors
+
+  - name: YouTube
+    type: select
+    proxies:
+      - DIRECT
+      - REJECT
+      - ▣ Personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Russia 🇷🇺
+      - Europe 🇪🇺
+      - USA 🇺🇸
+      - Russia 🇷🇺 🄪
+      - Europe 🇪🇺 🄪
+      - USA 🇺🇸 🄪
+    <<: *health_check_for_selectors
+  
+
 # ———————————————————————————————— rule providers ————————————————————————————————
 rule-providers:
   
-  # ———————————————————————— gitea lists ———————————————————————
-  AI Stuff (Western):
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/ai-stuff-western.yaml       # AI Stuff
-    path: "./rule_provider/ai-stuff-western.yaml"                                                                                 
-    <<: *default_rule_provider_config
-
-  Discord:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/discord.yaml       # AI Stuff
-    path: "./rule_provider/discord.yaml"                                                                                 
-    <<: *default_rule_provider_config
-  
-  Notion:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/notion.yaml                 # Notion
-    path: "./rule_provider/notion.yaml"
-    <<: *default_rule_provider_config
-  
-  Youtube:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/youtube.yaml                # Youtube
-    path: "./rule_provider/youtube.yaml"
-    <<: *default_rule_provider_config
-  
-  Testzone A:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/testzone-a.yaml
-    path: "./rule_provider/testzone-a.yaml"
-    <<: *default_rule_provider_config
-  
-  USA Services:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/usa-services.yaml
-    path: "./rule_provider/usa-services.yaml"
-    <<: *default_rule_provider_config
-  
-    # —————————————————————— adaptaion lists —————————————————————
+# ——————————————————— consolidated-lists-private ————————————————————
+  # http://purpose.shamanlanding.org:9999/
   General Direct Domain List:
     url: http://purpose.shamanlanding.org:9999/direct-domain.yaml
-    path: "./rule_provider/direct-domain.yaml"
+    path: "./rule_provider/consolidated-lists-private/direct-domain.yaml"
     <<: *default_rule_provider_config
-  
   General Direct IP List:
     url: http://purpose.shamanlanding.org:9999/direct-ip.yaml
-    path: "./rule_provider/direct-ip.yaml"
+    path: "./rule_provider/consolidated-lists-private/direct-ip.yaml"
     <<: *default_rule_provider_config
- 
   General Proxy Domain List:
     url: http://purpose.shamanlanding.org:9999/proxy-domain.yaml
-    path: "./rule_provider/adaptation-domain-proxy.yaml"
+    path: "./rule_provider/consolidated-lists-private/adaptation-domain-proxy.yaml"
     <<: *default_rule_provider_config
-  
   General Proxy IP List:
     url: http://purpose.shamanlanding.org:9999/proxy-ip.yaml
-    path: "./rule_provider/adaptation-ip-proxy.yaml"
+    path: "./rule_provider/consolidated-lists-private/adaptation-ip-proxy.yaml"
     <<: *default_rule_provider_config
   
-  # ————————————————— antifilter community list ————————————————
-  Antifilter IP List:
-    url: http://purpose.shamanlanding.org:9999/antifilter-ip.yaml
-    path: "./rule_provider/antifilter-ip-proxy.yaml"
+  # /clash-rules/raw/branch/main/rule-provider/consolidated-lists-private/
+  Testzone A:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-lists-private/testzone-a.yaml
+    path: "./rule_provider/services/consolidated-lists-private/testzone-a.yaml"
     <<: *default_rule_provider_config
+  Testzone B:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-lists-private/testzone-b.yaml
+    path: "./rule_provider/services/consolidated-lists-private/testzone-b.yaml"
+    <<: *default_rule_provider_config
+
+# ——————————————————— consolidated-lists-public ————————————————————
+  # /clash-rules/raw/branch/main/rule-provider/consolidated-lists-private/
+  🚫 Adblock List:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-lists-private/adblock.yaml
+    path: "./rule_provider/consolidated-lists-public/adblock.yaml"
+    <<: *default_rule_provider_config
+
+  # http://purpose.shamanlanding.org:9999/
   Antifilter Community IP List:
     url: http://purpose.shamanlanding.org:9999/antifilter-community-ip.yaml
-    path: "./rule_provider/antifilter-community-ip-proxy.yaml"
+    path: "./rule_provider/consolidated-lists-public/antifilter-community-ip-proxy.yaml"
     <<: *default_rule_provider_config
   Antifilter Community Domain List:
     url: http://purpose.shamanlanding.org:9999/antifilter-community-domain.yaml
-    path: "./rule_provider/antifilter-domain-proxy.yaml"
+    path: "./rule_provider/consolidated-lists-public/antifilter-domain-proxy.yaml"
     <<: *default_rule_provider_config
-
+  Antifilter IP List:
+    url: http://purpose.shamanlanding.org:9999/antifilter-ip.yaml
+    path: "./rule_provider/consolidated-lists-public/antifilter-ip-proxy.yaml"
+    <<: *default_rule_provider_config
+      
+# ——————————————————— consolidated-services ————————————————————
+  # /clash-rules/raw/branch/main/rule-provider/consolidated-services/  
+  AI Stuff:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/ai-stuff-western.yaml
+    path: "./rule_provider/consolidated-services/ai-stuff-western.yaml"                                                                                 
+    <<: *default_rule_provider_config
+  USA Services:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/usa-services.yaml
+    path: "./rule_provider/consolidated-services/usa-services.yaml"
+    <<: *default_rule_provider_config
+  
+# ——————————————————— services ————————————————————
+  # /clash-rules/raw/branch/main/rule-provider/services/    
+  Discord:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/discord.yaml                
+    path: "./rule_provider/services/discord.yaml"                                                                                 
+    <<: *default_rule_provider_config
+  Notion:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/notion.yaml                 
+    path: "./rule_provider/services/notion.yaml"
+    <<: *default_rule_provider_config
+  Steam:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/steam.yaml                 
+    path: "./rule_provider/services/steam.yaml"
+    <<: *default_rule_provider_config
+  Telegram:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/telegram.yaml                 
+    path: "./rule_provider/services/telegram.yaml"
+    <<: *default_rule_provider_config
+  WeChat:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/wechat.yaml                 
+    path: "./rule_provider/services/wechat.yaml"
+    <<: *default_rule_provider_config
+  WhatsApp:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/whatsapp.yaml                 
+    path: "./rule_provider/services/whatsapp.yaml"
+    <<: *default_rule_provider_config
+  XBox:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/xbox.yaml                 
+    path: "./rule_provider/services/xbox.yaml"
+    <<: *default_rule_provider_config
+  Youtube:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/youtube.yaml                
+    path: "./rule_provider/services/youtube.yaml"
+    <<: *default_rule_provider_config
+  
 # ————————————————————————————————————— rules ————————————————————————————————————
 rules:
 
-# —————————————————————— by application ——————————————————————
-- RULE-SET,Youtube,✳️ YouTube
-- RULE-SET,Notion,✳️ Notion
-- RULE-SET,Testzone A,✳️ Testzone A
-- RULE-SET,AI Stuff (Western),✳️ Testzone A
-- RULE-SET,Discord,✳️ Discord
-- RULE-SET,USA Services,✳️ USA Services
-
-# —————————————————————— adaptaion lists —————————————————————
+# —————————————————————— direct first ——————————————————————
 - RULE-SET,General Direct Domain List,DIRECT
 - RULE-SET,General Direct IP List,DIRECT
-- RULE-SET,General Proxy Domain List,✳️ Adaptaion
-- RULE-SET,General Proxy IP List,✳️ Adaptaion
-- RULE-SET,Antifilter IP List,✳️ Antifilter
-- RULE-SET,Antifilter Community IP List,✳️ Antifilter
-- RULE-SET,Antifilter Community Domain List,✳️ Antifilter
 
-- MATCH,🖥️ LAN Clients
\ No newline at end of file
+# ———————————————————————— adblocker ———————————————————————
+- RULE-SET,🚫 Adblock List,Adblock
+
+# ——————————————————————— by service ———————————————————————
+- RULE-SET,Discord,Discord
+- RULE-SET,Notion,Notion
+- RULE-SET,Steam,Steam
+- RULE-SET,Telegram,Telegram
+- RULE-SET,WeChat,WeChat
+- RULE-SET,WhatsApp,WhatsApp
+- RULE-SET,XBox,XBox
+- RULE-SET,Youtube,YouTube
+
+# ——————————————————— by private lists ————————————————————— 
+- RULE-SET,Testzone A,Testzone 🅰
+- RULE-SET,Testzone B,Testzone 🅱 
+- RULE-SET,General Proxy Domain List,Adaptaion
+- RULE-SET,General Proxy IP List,Adaptaion
+
+# —————————————————— check russian geoip ———————————————————
+- GEOIP,RU,DIRECT
+
+# ——————————————————— by service group —————————————————————
+- RULE-SET,AI Stuff,AI Stuff
+- RULE-SET,USA Services,USA Services
+
+# ————————————————————— adaptaion lists ————————————————————
+- RULE-SET,Antifilter Community IP List,Antifilter
+- RULE-SET,Antifilter Community Domain List,Antifilter
+- RULE-SET,Antifilter IP List,Antifilter
+
+- MATCH,LAN Clients
\ No newline at end of file
diff --git a/rule-provider/consolidated-services/testzone-a.yaml b/rule-provider/consolidated-lists-private/testzone-a.yaml
similarity index 100%
rename from rule-provider/consolidated-services/testzone-a.yaml
rename to rule-provider/consolidated-lists-private/testzone-a.yaml
diff --git a/rule-provider/consolidated-services/testzone-b.yaml b/rule-provider/consolidated-lists-private/testzone-b.yaml
similarity index 100%
rename from rule-provider/consolidated-services/testzone-b.yaml
rename to rule-provider/consolidated-lists-private/testzone-b.yaml