diff --git a/.github/update.log b/.github/update.log
index 201bd2c738..93c08b626c 100644
--- a/.github/update.log
+++ b/.github/update.log
@@ -793,3 +793,4 @@ Update On Thu Oct 10 20:36:48 CEST 2024
 Update On Fri Oct 11 20:34:02 CEST 2024
 Update On Sat Oct 12 20:32:54 CEST 2024
 Update On Sun Oct 13 20:32:23 CEST 2024
+Update On Mon Oct 14 20:35:11 CEST 2024
diff --git a/clash-meta-android/design/src/main/res/values-vi/strings.xml b/clash-meta-android/design/src/main/res/values-vi/strings.xml
new file mode 100644
index 0000000000..2ff4f708ce
--- /dev/null
+++ b/clash-meta-android/design/src/main/res/values-vi/strings.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="geofile_import_failed">Nhập thất bại</string>
+    <string name="toast_profile_updated_complete">Cập nhật thành công</string>
+    <string name="toast_profile_updated_failed">Cập nhật không thành công</string>
+    <string name="press_to_import">Chạm để nhập...</string>
+    <string name="meta_features">Tính năng của Clash Meta</string>
+    <string name="allow_ipv6">Cho phép Ipv6</string>
+    <string name="allow_ipv6_summary">Cho phép lưu lượng ipv6 qua hệ thống Vpn</string>
+    <string name="tun_stack_gvisor">Gvisor</string>
+    <string name="tun_stack_mixed">Mixed</string>
+    <string name="tun_stack_mode">Chế độ xếp chồng dữ liệu</string>
+    <string name="tun_stack_system">Hệ thống</string>
+    <string name="application_name_alpha">Clash Meta</string>
+    <string name="application_name_meta">Clash Meta</string>
+    <string name="clash_meta_core">Clash Meta Core</string>
+    <string name="clash_meta_for_android">Clash Meta</string>
+    <string name="clash_meta_wiki">Clash Meta Wiki</string>
+    <string name="launch_name_alpha">Clash Meta</string>
+    <string name="launch_name_meta">Clash Meta</string>
+    <string name="_new">Mới</string>
+    <string name="about">Thông tin</string>
+    <string name="accept_http_content">Chỉ chấp nhận http(s)</string>
+    <string name="access_control_mode">Chế độ kiểm soát truy cập</string>
+    <string name="access_control_packages">Các gói kiểm soát truy cập</string>
+    <string name="access_control_packages_summary">Định cấu hình quyền truy cập cho các ứng dụng</string>
+    <string name="active_unsaved_tips">Hồ sơ cần được lưu trước khi kích hoạt</string>
+    <string name="allow_all_apps">Cho phép tất cả các ứng dụng</string>
+    <string name="allow_bypass">Cho phép bỏ qua</string>
+    <string name="allow_bypass_summary">Cho phép tất cả các ứng dụng bỏ qua kết nối VPN này</string>
+    <string name="allow_clash_auto_restart">Cho phép Clash tự khởi động lại</string>
+    <string name="allow_lan">Cho phép mạng LAN</string>
+    <string name="allow_selected_apps">Cho phép các ứng dụng đã chọn</string>
+    <string name="always_dark">Luôn tối</string>
+    <string name="always_light">Luôn sáng</string>
+    <string name="app">Ứng dụng</string>
+    <string name="append_system_dns">Nối hệ thống DNS</string>
+    <string name="application_broken">Ứng dụng bị lỗi</string>
+    <string name="application_broken_tips">Ứng dụng thiếu các thành phần cần thiết, nguyên nhân thường là do tải xuống apk không đầy đủ.</string>
+    <string name="application_crashed">Ứng dụng bị dừng</string>
+    <string name="at_least_15_minutes">Ít nhất 15 phút hoặc để trống</string>
+    <string name="authentication">Xác thực</string>
+    <string name="auto_restart">Khởi động lại tự động</string>
+    <string name="auto_update">Thời gian tự động cập nhật</string>
+    <string name="auto_update_minutes">Tự động cập nhật (Phút)</string>
+    <string name="behavior">Điều hướng</string>
+    <string name="bind_address">Địa chỉ ràng buộc</string>
+    <string name="block_loopback">Chặn lặp</string>
+    <string name="block_loopback_summary">Chặn kết nối lặp lại</string>
+    <string name="browse_configuration_providers">Duyệt qua tệp cấu hình và nhà cung cấp</string>
+    <string name="browse_files">Duyệt qua tệp</string>
+    <string name="bypass_private_network">Bỏ qua mạng riêng</string>
+    <string name="bypass_private_network_summary">Bỏ qua các địa chỉ mạng riêng</string>
+    <string name="cancel">Huỷ bỏ</string>
+    <string name="clash_logcat">Nhật ký Clash</string>
+    <string name="close">Đóng</string>
+    <string name="compatible">Tương thích</string>
+    <string name="copied">Đã sao chép</string>
+    <string name="create_profile">Tạo cấu hình</string>
+    <string name="dark_mode">Chế độ tối</string>
+    <string name="debug">Gỡ lỗi</string>
+    <string name="default_">Mặc định</string>
+    <string name="default_name_server">Máy chủ định danh mặc định</string>
+    <string name="delay">Độ trễ</string>
+    <string name="delay_test">Kiểm tra độ trễ</string>
+    <string name="delete">Xoá</string>
+    <string name="delete_all_logs">Xóa tất cả nhật ký</string>
+    <string name="delete_all_logs_warn">Tất cả nhật ký lịch sử sẽ *MẤT*</string>
+    <string name="deny_selected_apps">Từ chối các ứng dụng đã chọn</string>
+    <string name="detail">Chi tiết</string>
+    <string name="direct_mode">Chế độ trực tiếp</string>
+    <string name="disabled">Vô hiệu hóa</string>
+    <string name="dns">DNS</string>
+    <string name="dns_hijacking">Định tuyến qua DNS</string>
+    <string name="dns_hijacking_summary">Xử lý tất cả gói DNS</string>
+    <string name="document">Tài liệu</string>
+    <string name="domain_fallback">Dự phòng miền</string>
+    <string name="donate">Quyên góp</string>
+    <string name="dont_modify">Chưa sửa đổi</string>
+    <string name="duplicate">Tạo bản sao</string>
+    <string name="edit">Sửa</string>
+    <string name="empty">Trống</string>
+    <string name="empty_name">Tên trống</string>
+    <string name="enabled">Bật</string>
+    <string name="enhanced_mode">Chế độ nâng cao</string>
+    <string name="error">Lỗi</string>
+    <string name="exit_without_save">Thoát mà không lưu</string>
+    <string name="exit_without_save_warning">Tất cả thay đổi sẽ *MẤT*</string>
+    <string name="export">Xuất</string>
+    <string name="export_to_clipboard">Nhập từ khay nhớ tạm</string>
+    <string name="external">Bên ngoài</string>
+    <string name="fakeip">Fake-IP thành ánh xạ miền</string>
+    <string name="fakeip_filter">Bộ lọc Fake-IP</string>
+    <string name="fallback">Máy chủ tên dự phòng</string>
+    <string name="feedback">Phản hồi</string>
+    <string name="file">Tệp</string>
+    <string name="file_exported">Tệp đã xuất</string>
+    <string name="file_name">Tên tệp</string>
+    <string name="files">Tệp</string>
+    <string name="filter">Bộ lọc</string>
+    <string name="follow_system_android_10">Theo hệ thống (Android 10+)</string>
+    <string name="force_enable">Buộc bật</string>
+    <string name="format_days_ago">%d ngày trước</string>
+    <string name="format_elements">%d elements</string>
+    <string name="format_fetching_configuration">Tìm nạp cấu hình từ \'%s\'</string>
+    <string name="format_fetching_provider">Nhà cung cấp tìm nạp \'%s\'</string>
+    <string name="format_hours_ago">%d giờ trước</string>
+    <string name="format_minutes">%d phút</string>
+    <string name="format_minutes_ago">%d phút trước</string>
+    <string name="format_months_ago">%d tháng trước</string>
+    <string name="format_profile_activated">%s đang sử dụng</string>
+    <string name="format_provider_type">%1$s(%2$s)</string>
+    <string name="format_traffic_forwarded">%s được sử dụng</string>
+    <string name="format_type_unsaved">%s (Chưa lưu)</string>
+    <string name="format_update_complete">Cập nhật %s thành công</string>
+    <string name="format_update_failure">Cập nhật %1$s: %2$s</string>
+    <string name="format_update_provider_failure">Cập nhật %1$s: %2$s</string>
+    <string name="format_years_ago">%d năm trước</string>
+    <string name="general">Chung</string>
+    <string name="geoip_fallback">Dự phòng GeoIP</string>
+    <string name="geoip_fallback_code">Mã dự phòng GeoIP</string>
+    <string name="github_issues">Sự cố trên Github</string>
+    <string name="github_releases">Bản phát hành trên Github</string>
+    <string name="global_mode">Chế độ toàn cầu</string>
+    <string name="help">Trợ giúp</string>
+    <string name="history">Lịch sử</string>
+    <string name="hosts">Hosts</string>
+    <string name="http">HTTP</string>
+    <string name="http_port">Cổng HTTP</string>
+    <string name="import_">Nhập</string>
+    <string name="import_from_clipboard">Nhập từ khay nhớ tạm</string>
+    <string name="import_from_file">Nhập từ tệp</string>
+    <string name="import_from_url">Nhập từ liên kết URL</string>
+    <string name="info">Thông tin</string>
+    <string name="initializing">Khởi tạo</string>
+    <string name="install_time">Thời gian cài đặt</string>
+    <string name="interface_">Giao diện</string>
+    <string name="invalid_file_name">Tên tệp không hợp lệ</string>
+    <string name="invalid_log_file">Tệp nhật ký không hợp lệ</string>
+    <string name="invalid_url">Liên kết URL không hợp lệ</string>
+    <string name="ipcidr_fallback">Dự phòng IPCIDR</string>
+    <string name="ipv6">IPv6</string>
+    <string name="key">Khoá</string>
+    <string name="keyword">Từ khoá</string>
+    <string name="layout">Bố cục</string>
+    <string name="listen">Nghe</string>
+    <string name="loading">Đang tải</string>
+    <string name="log_level">Mức nhật ký</string>
+    <string name="logcat">Nhật ký</string>
+    <string name="logs">Nhật ký</string>
+    <string name="mapping">IP thực với ánh xạ miền</string>
+    <string name="mixed_port">Cổng Mixed</string>
+    <string name="mode">Chế độ</string>
+    <string name="mode_switch_tips">Chỉ hợp lệ cho phiên hiện tại</string>
+    <string name="more">Thêm</string>
+    <string name="multiple">Nhiều</string>
+    <string name="name">Tên</string>
+    <string name="name_server">Tên máy chủ</string>
+    <string name="name_server_policy">Chính sách máy chủ định danh</string>
+    <string name="network">Mạng</string>
+    <string name="new_profile">Cấu hình mới</string>
+    <string name="no_profile_selected">Không có cấu hình</string>
+    <string name="not_selectable">Không thể chọn</string>
+    <string name="not_selected">Trống. Nhấn vào để thêm</string>
+    <string name="ok">OK</string>
+    <string name="options_unavailable">Tùy chọn không khả dụng cho đến khi Clash ngắt kết nối</string>
+    <string name="override">Cài đặt thêm</string>
+    <string name="package_name">Tên gói</string>
+    <string name="profile">Cấu hình</string>
+    <string name="profile_name">Tên cấu hình</string>
+    <string name="profile_process_result">Kết quả xử lý cấu hình</string>
+    <string name="profile_process_status">Trạng thái xử lý cấu hình</string>
+    <string name="profile_service_status">Trạng thái dịch vụ cấu hình</string>
+    <string name="profile_updater">Trình cập nhật cấu hình</string>
+    <string name="profile_updating">Cập nhật cấu hình</string>
+    <string name="profile_url">Liên kết URL cấu hình</string>
+    <string name="profiles">Cấu hình</string>
+    <string name="properties">Thuộc tính</string>
+    <string name="provider_files">Tệp nhà cung cấp</string>
+    <string name="providers">Nhà cung cấp</string>
+    <string name="proxy">Proxy</string>
+    <string name="proxy_empty_tips">Không có nhóm nào được hiển thị</string>
+    <string name="recently">Vừa xong</string>
+    <string name="redirect_port">Cổng Redirect</string>
+    <string name="reinstall">Cài đặt lại</string>
+    <string name="rename">Đổi tên</string>
+    <string name="reset">Đặt lại</string>
+    <string name="reset_override_settings">Đặt lại cài đặt ghi đè</string>
+    <string name="reset_override_settings_message">Tất cả cài đặt ghi đè sẽ bị hủy</string>
+    <string name="reverse">Đảo ngược</string>
+    <string name="route_system_traffic">Định tuyến lưu lượng hệ thống</string>
+    <string name="routing_via_vpn_service">Tự động định tuyến tất cả lưu lượng hệ thống qua VpnService</string>
+    <string name="rule">Quy tắc</string>
+    <string name="rule_mode">Chế độ quy tắc</string>
+    <string name="running">Đang kết nối</string>
+    <string name="save">Lưu</string>
+    <string name="script_mode">Chế độ tập lệnh</string>
+    <string name="search">Tìm kiếm</string>
+    <string name="select_all">Chọn tất cả</string>
+    <string name="select_invert">Chọn Đảo ngược</string>
+    <string name="select_none">Không chọn</string>
+    <string name="service">Dịch vụ</string>
+    <string name="settings">Cài đặt</string>
+    <string name="should_not_be_blank">Không được để trống</string>
+    <string name="show_traffic">Hiển thị lưu lượng truy cập</string>
+    <string name="show_traffic_summary">Tự động làm mới lưu lượng truy cập trong thông báo</string>
+    <string name="sideload_geoip">Sideload GEOIP</string>
+    <string name="sideload_geoip_summary">Cơ sở dữ liệu GEOIP bên ngoài</string>
+    <string name="silent">Im lặng</string>
+    <string name="single">Đơn</string>
+    <string name="socks_port">Cổng Socks</string>
+    <string name="sort">Sắp xếp theo</string>
+    <string name="sources">Nguồn</string>
+    <string name="stopped">Đã ngắt kết nối</string>
+    <string name="strategy">Strategy</string>
+    <string name="system_apps">Ứng dụng hệ thống</string>
+    <string name="system_proxy">Proxy hệ thống</string>
+    <string name="system_proxy_summary">Đính kèm proxy,http vào hệ thống Vpn</string>
+    <string name="tap_to_start">Chạm để kết nối</string>
+    <string name="tips_help">Clash Meta là một phần mềm miễn phí và chúng tôi KHÔNG cung cấp bất kỳ dịch vụ trả phí nào cho nó</string>
+    <string name="tips_properties">Chỉ chấp nhận cấu hình Clash bao gồm Proxy và Quy tắc</string>
+    <string name="tproxy_port">Cổng TProxy</string>
+    <string name="unable_to_start_vpn">Không thể khởi động thành phần VPN</string>
+    <string name="unavailable">Không có sẵn</string>
+    <string name="update">Cập nhật</string>
+    <string name="update_all">Cập nhật tất cả</string>
+    <string name="update_failure">Cập nhật thất bại</string>
+    <string name="update_successfully">Cập nhật thành công</string>
+    <string name="update_time">Thời gian cập nhật</string>
+    <string name="url">Liên kết URL</string>
+    <string name="use_built_in">Sử dụng tích hợp</string>
+    <string name="use_hosts">Sử dụng Hosts</string>
+    <string name="value">Giá trị</string>
+    <string name="verifying">Đang xác minh</string>
+    <string name="version_updated">Đã cập nhật ứng dụng</string>
+    <string name="version_updated_tips">Các cài đặt đã được đặt lại và các cấu hình cũ cần được lưu lại.</string>
+    <string name="vpn_service_options">Tuỳ chọn VpnService</string>
+    <string name="warning">Cảnh báo</string>
+</resources>
diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json
index 125433869d..4886e3f7b4 100644
--- a/clash-nyanpasu/frontend/nyanpasu/package.json
+++ b/clash-nyanpasu/frontend/nyanpasu/package.json
@@ -29,7 +29,7 @@
     "country-code-emoji": "2.3.0",
     "dayjs": "1.11.13",
     "framer-motion": "12.0.0-alpha.1",
-    "i18next": "23.15.2",
+    "i18next": "23.16.0",
     "jotai": "2.10.0",
     "json-schema": "0.4.0",
     "material-react-table": "3.0.1",
@@ -52,7 +52,7 @@
     "@csstools/normalize.css": "12.1.1",
     "@emotion/babel-plugin": "11.12.0",
     "@emotion/react": "11.13.3",
-    "@iconify/json": "2.2.259",
+    "@iconify/json": "2.2.260",
     "@monaco-editor/react": "4.6.0",
     "@tanstack/react-router": "1.65.0",
     "@tanstack/router-devtools": "1.65.0",
diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml
index c8bc462d11..a0ebc62a40 100644
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -166,16 +166,16 @@ importers:
         version: 2.0.2
       ahooks:
         specifier: 3.8.1
-        version: 3.8.1(react@19.0.0-rc-09111202-20241011)
+        version: 3.8.1(react@19.0.0-rc-cd22717c-20241013)
       ofetch:
         specifier: 1.4.1
         version: 1.4.1
       react:
         specifier: rc
-        version: 19.0.0-rc-09111202-20241011
+        version: 19.0.0-rc-cd22717c-20241013
       swr:
         specifier: 2.2.5
-        version: 2.2.5(react@19.0.0-rc-09111202-20241011)
+        version: 2.2.5(react@19.0.0-rc-cd22717c-20241013)
     devDependencies:
       '@types/react':
         specifier: npm:types-react@rc
@@ -185,16 +185,16 @@ importers:
     dependencies:
       '@dnd-kit/core':
         specifier: 6.1.0
-        version: 6.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 6.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       '@dnd-kit/sortable':
         specifier: 8.0.0
-        version: 8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       '@dnd-kit/utilities':
         specifier: 3.2.2
-        version: 3.2.2(react@19.0.0-rc-09111202-20241011)
+        version: 3.2.2(react@19.0.0-rc-cd22717c-20241013)
       '@emotion/styled':
         specifier: 11.13.0
-        version: 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@juggle/resize-observer':
         specifier: 3.4.0
         version: 3.4.0
@@ -203,13 +203,13 @@ importers:
         version: 0.3.0
       '@mui/icons-material':
         specifier: 6.1.3
-        version: 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@mui/lab':
         specifier: 6.0.0-beta.11
-        version: 6.0.0-beta.11(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 6.0.0-beta.11(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@mui/material':
         specifier: 6.1.3
-        version: 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@nyanpasu/interface':
         specifier: workspace:^
         version: link:../interface
@@ -218,7 +218,7 @@ importers:
         version: link:../ui
       '@tanstack/router-zod-adapter':
         specifier: 1.65.0
-        version: 1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011))(zod@3.23.8)
+        version: 1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013))(zod@3.23.8)
       '@tauri-apps/api':
         specifier: 2.0.2
         version: 2.0.2
@@ -227,10 +227,10 @@ importers:
         version: 7.0.15
       ahooks:
         specifier: 3.8.1
-        version: 3.8.1(react@19.0.0-rc-09111202-20241011)
+        version: 3.8.1(react@19.0.0-rc-cd22717c-20241013)
       allotment:
         specifier: 1.20.2
-        version: 1.20.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 1.20.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       country-code-emoji:
         specifier: 2.3.0
         version: 2.3.0
@@ -239,58 +239,58 @@ importers:
         version: 1.11.13
       framer-motion:
         specifier: 12.0.0-alpha.1
-        version: 12.0.0-alpha.1(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 12.0.0-alpha.1(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       i18next:
-        specifier: 23.15.2
-        version: 23.15.2
+        specifier: 23.16.0
+        version: 23.16.0
       jotai:
         specifier: 2.10.0
-        version: 2.10.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 2.10.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       json-schema:
         specifier: 0.4.0
         version: 0.4.0
       material-react-table:
         specifier: 3.0.1
-        version: 3.0.1(ddtozfjxwylixfiwxy7ptqpqna)
+        version: 3.0.1(2oi5dao5k6acau5jeicyle5flm)
       monaco-editor:
         specifier: 0.52.0
         version: 0.52.0
       mui-color-input:
         specifier: 4.0.1
-        version: 4.0.1(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 4.0.1(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       react:
         specifier: rc
-        version: 19.0.0-rc-09111202-20241011
+        version: 19.0.0-rc-cd22717c-20241013
       react-dom:
         specifier: rc
-        version: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+        version: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
       react-error-boundary:
         specifier: 4.0.13
-        version: 4.0.13(react@19.0.0-rc-09111202-20241011)
+        version: 4.0.13(react@19.0.0-rc-cd22717c-20241013)
       react-fast-marquee:
         specifier: 1.6.5
-        version: 1.6.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 1.6.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       react-hook-form-mui:
         specifier: 7.3.1
-        version: 7.3.1(ys6qyhmibdgj3aiegp2mknsmkq)
+        version: 7.3.1(agt453dwgyjunypjf6prbgqys4)
       react-i18next:
         specifier: 15.0.3
-        version: 15.0.3(i18next@23.15.2)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 15.0.3(i18next@23.16.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       react-markdown:
         specifier: 9.0.1
-        version: 9.0.1(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 9.0.1(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       react-split-grid:
         specifier: 1.0.4
-        version: 1.0.4(react@19.0.0-rc-09111202-20241011)
+        version: 1.0.4(react@19.0.0-rc-cd22717c-20241013)
       react-use:
         specifier: 17.5.1
-        version: 17.5.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 17.5.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       swr:
         specifier: 2.2.5
-        version: 2.2.5(react@19.0.0-rc-09111202-20241011)
+        version: 2.2.5(react@19.0.0-rc-cd22717c-20241013)
       virtua:
         specifier: 0.35.1
-        version: 0.35.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 0.35.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       vite-bundle-visualizer:
         specifier: 1.2.1
         version: 1.2.1(rollup@4.21.0)
@@ -303,19 +303,19 @@ importers:
         version: 11.12.0
       '@emotion/react':
         specifier: 11.13.3
-        version: 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@iconify/json':
-        specifier: 2.2.259
-        version: 2.2.259
+        specifier: 2.2.260
+        version: 2.2.260
       '@monaco-editor/react':
         specifier: 4.6.0
-        version: 4.6.0(monaco-editor@0.52.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 4.6.0(monaco-editor@0.52.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       '@tanstack/react-router':
         specifier: 1.65.0
-        version: 1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       '@tanstack/router-devtools':
         specifier: 1.65.0
-        version: 1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011))(csstype@3.1.3)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013))(csstype@3.1.3)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       '@tanstack/router-plugin':
         specifier: 1.65.0
         version: 1.65.0(vite@5.4.8(@types/node@22.7.5)(less@4.2.0)(sass-embedded@1.78.0)(sass@1.79.5)(stylus@0.62.0))(webpack-sources@3.2.3)
@@ -417,19 +417,19 @@ importers:
         version: 0.3.0
       '@mui/icons-material':
         specifier: 6.1.3
-        version: 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@mui/lab':
         specifier: 6.0.0-beta.11
-        version: 6.0.0-beta.11(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 6.0.0-beta.11(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@mui/material':
         specifier: 6.1.3
-        version: 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@radix-ui/react-portal':
         specifier: 1.1.2
-        version: 1.1.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 1.1.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@radix-ui/react-scroll-area':
         specifier: 1.2.0
-        version: 1.2.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 1.2.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@tauri-apps/api':
         specifier: 2.0.2
         version: 2.0.2
@@ -444,28 +444,28 @@ importers:
         version: 4.3.2(vite@5.4.8(@types/node@22.7.5)(less@4.2.0)(sass-embedded@1.78.0)(sass@1.79.5)(stylus@0.62.0))
       ahooks:
         specifier: 3.8.1
-        version: 3.8.1(react@19.0.0-rc-09111202-20241011)
+        version: 3.8.1(react@19.0.0-rc-cd22717c-20241013)
       d3:
         specifier: 7.9.0
         version: 7.9.0
       framer-motion:
         specifier: 12.0.0-alpha.1
-        version: 12.0.0-alpha.1(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 12.0.0-alpha.1(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       react:
         specifier: rc
-        version: 19.0.0-rc-09111202-20241011
+        version: 19.0.0-rc-cd22717c-20241013
       react-dom:
         specifier: rc
-        version: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+        version: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
       react-error-boundary:
         specifier: 4.0.13
-        version: 4.0.13(react@19.0.0-rc-09111202-20241011)
+        version: 4.0.13(react@19.0.0-rc-cd22717c-20241013)
       react-i18next:
         specifier: 15.0.3
-        version: 15.0.3(i18next@23.15.2)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 15.0.3(i18next@23.16.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       react-use:
         specifier: 17.5.1
-        version: 17.5.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+        version: 17.5.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       vite:
         specifier: 5.4.8
         version: 5.4.8(@types/node@22.7.5)(less@4.2.0)(sass-embedded@1.78.0)(sass@1.79.5)(stylus@0.62.0)
@@ -475,7 +475,7 @@ importers:
     devDependencies:
       '@emotion/react':
         specifier: 11.13.3
-        version: 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+        version: 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@types/d3-interpolate-path':
         specifier: 2.0.3
         version: 2.0.3
@@ -1377,8 +1377,8 @@ packages:
       '@vue/compiler-sfc':
         optional: true
 
-  '@iconify/json@2.2.259':
-    resolution: {integrity: sha512-QA5chdx3Jw/jpPv6NrABJIbG6++572KocO/hyebEpSx0KYPc1f5dWkGG1tFu6v9NB7Xls8bXZHXak011Gvoiiw==}
+  '@iconify/json@2.2.260':
+    resolution: {integrity: sha512-0vVJBAJ8GOoS07b8yC6c8NHfFx1GJnM8xtebtyynQYZ0/60dxKi86imdNftq5oY/cFfvVUGlmBi/2HS+sxWsWA==}
 
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
@@ -4437,8 +4437,8 @@ packages:
   hyphenate-style-name@1.1.0:
     resolution: {integrity: sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==}
 
-  i18next@23.15.2:
-    resolution: {integrity: sha512-zcPSWzCvw6uKnuYHIqs4W7hTuB9e3AFcSdZgvCWoPXIZsBjBd4djN2/2uOHIB+1DFFkQnMBXvhNg7J3WyCuywQ==}
+  i18next@23.16.0:
+    resolution: {integrity: sha512-Ni3CG6c14teOogY19YNRl+kYaE/Rb59khy0VyHVn4uOZ97E2E/Yziyi6r3C3s9+wacjdLZiq/LLYyx+Cgd+FCw==}
 
   iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
@@ -5895,10 +5895,10 @@ packages:
     resolution: {integrity: sha512-FqHzVpsWddE5j0BtvjPiPGYiXWDat5EQWGl2oG8xVQs2zJ1KH0zHcu5a7ZdGVgKJWGvYl731J0/k/oOtFSiWfg==}
     hasBin: true
 
-  react-dom@19.0.0-rc-09111202-20241011:
-    resolution: {integrity: sha512-iGX/aJR6YjAHHUtmPNf2YmR8e2pYmlRL28tR/PO6VdIGBqNzzLMNnTEcgjlPPQ0rXBjI0IL7SJnOFYWmk3ZGjw==}
+  react-dom@19.0.0-rc-cd22717c-20241013:
+    resolution: {integrity: sha512-NzjTBOXygonUxLRQuUUW5V2QLGkAcyUwJoS8+UWxs089paMvQQfoRD51w65Ovgd2OEQ8Rm3HWx+82fvXiT0czQ==}
     peerDependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
 
   react-error-boundary@4.0.13:
     resolution: {integrity: sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==}
@@ -5987,8 +5987,8 @@ packages:
       react: '*'
       react-dom: '*'
 
-  react@19.0.0-rc-09111202-20241011:
-    resolution: {integrity: sha512-kAz5u4PAPQJI2VJzUrYC/p82CoPcl/KD7i1tHe+nu3RezaAvHGCZY339bLFMBzY91jnJoo07JQZ6UsqivtQ2vQ==}
+  react@19.0.0-rc-cd22717c-20241013:
+    resolution: {integrity: sha512-k28GszmyQ1tX/JmeLGZINq5KXiNy/MmN0fCAtcwF8a9INDyVYG0zATCRGJwaPB9WixmkuwPv1BfB1QBfJC7cNg==}
     engines: {node: '>=0.10.0'}
 
   read-cache@1.0.0:
@@ -6287,8 +6287,8 @@ packages:
   sax@1.3.0:
     resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
 
-  scheduler@0.25.0-rc-09111202-20241011:
-    resolution: {integrity: sha512-XIsordE2/I3s52ujwT5PZIxHMQca8L2ca6Gu3o0YHXDVTYucwXQW6m8/2fVKqfzoJRH1ne7/49M7/5Wick8qOA==}
+  scheduler@0.25.0-rc-cd22717c-20241013:
+    resolution: {integrity: sha512-MnsFR57bKcrYslnbCUsaUG0qBuAArk92VxE0zu6A2Usz38iIuL2uZLunqKlP1W47MF33GrRGDj1sXdPbFKIZfw==}
 
   screenfull@5.2.0:
     resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
@@ -7813,29 +7813,29 @@ snapshots:
 
   '@ctrl/tinycolor@4.1.0': {}
 
-  '@dnd-kit/accessibility@3.1.0(react@19.0.0-rc-09111202-20241011)':
+  '@dnd-kit/accessibility@3.1.0(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       tslib: 2.7.0
 
-  '@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
-      '@dnd-kit/accessibility': 3.1.0(react@19.0.0-rc-09111202-20241011)
-      '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-09111202-20241011)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@dnd-kit/accessibility': 3.1.0(react@19.0.0-rc-cd22717c-20241013)
+      '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-cd22717c-20241013)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
       tslib: 2.7.0
 
-  '@dnd-kit/sortable@8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@dnd-kit/sortable@8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
-      '@dnd-kit/core': 6.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
-      '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-09111202-20241011)
-      react: 19.0.0-rc-09111202-20241011
+      '@dnd-kit/core': 6.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
+      '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-cd22717c-20241013)
+      react: 19.0.0-rc-cd22717c-20241013
       tslib: 2.7.0
 
-  '@dnd-kit/utilities@3.2.2(react@19.0.0-rc-09111202-20241011)':
+  '@dnd-kit/utilities@3.2.2(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       tslib: 2.7.0
 
   '@dual-bundle/import-meta-resolve@4.1.0': {}
@@ -7884,17 +7884,17 @@ snapshots:
 
   '@emotion/memoize@0.9.0': {}
 
-  '@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@emotion/babel-plugin': 11.12.0
       '@emotion/cache': 11.13.1
       '@emotion/serialize': 1.3.1
-      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-09111202-20241011)
+      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-cd22717c-20241013)
       '@emotion/utils': 1.4.0
       '@emotion/weak-memoize': 0.4.0
       hoist-non-react-statics: 3.3.2
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
@@ -7924,16 +7924,16 @@ snapshots:
 
   '@emotion/sheet@1.4.0': {}
 
-  '@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@emotion/babel-plugin': 11.12.0
       '@emotion/is-prop-valid': 1.3.0
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@emotion/serialize': 1.3.1
-      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-09111202-20241011)
+      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-cd22717c-20241013)
       '@emotion/utils': 1.4.0
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
@@ -7941,9 +7941,9 @@ snapshots:
 
   '@emotion/unitless@0.9.0': {}
 
-  '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@19.0.0-rc-09111202-20241011)':
+  '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
 
   '@emotion/utils@1.4.0': {}
 
@@ -8126,11 +8126,11 @@ snapshots:
       '@floating-ui/core': 1.6.1
       '@floating-ui/utils': 0.2.2
 
-  '@floating-ui/react-dom@2.1.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@floating-ui/react-dom@2.1.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@floating-ui/dom': 1.6.5
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
   '@floating-ui/utils@0.2.2': {}
 
@@ -8163,7 +8163,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@iconify/json@2.2.259':
+  '@iconify/json@2.2.260':
     dependencies:
       '@iconify/types': 2.0.0
       pathe: 1.1.2
@@ -8256,105 +8256,105 @@ snapshots:
       monaco-editor: 0.52.0
       state-local: 1.0.7
 
-  '@monaco-editor/react@4.6.0(monaco-editor@0.52.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@monaco-editor/react@4.6.0(monaco-editor@0.52.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@monaco-editor/loader': 1.4.0(monaco-editor@0.52.0)
       monaco-editor: 0.52.0
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
-  '@mui/base@5.0.0-beta.58(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/base@5.0.0-beta.58(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@floating-ui/react-dom': 2.1.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      '@floating-ui/react-dom': 2.1.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
-      '@mui/utils': 6.0.0-rc.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 6.0.0-rc.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@popperjs/core': 2.11.8
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
   '@mui/core-downloads-tracker@6.1.3': {}
 
-  '@mui/icons-material@6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/icons-material@6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
+      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/lab@6.0.0-beta.11(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/lab@6.0.0-beta.11(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/base': 5.0.0-beta.58(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/system': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/base': 5.0.0-beta.58(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/system': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
-      '@mui/utils': 6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@mui/core-downloads-tracker': 6.1.3
-      '@mui/system': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/system': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
-      '@mui/utils': 6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@popperjs/core': 2.11.8
       '@types/react-transition-group': 4.4.11
       clsx: 2.1.1
       csstype: 3.1.3
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
       react-is: 18.3.1
-      react-transition-group: 4.4.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      react-transition-group: 4.4.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/private-theming@5.16.6(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/private-theming@5.16.6(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/utils': 5.16.6(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 5.16.6(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/private-theming@6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/private-theming@6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/utils': 6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/styled-engine@5.16.6(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)':
+  '@mui/styled-engine@5.16.6(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@emotion/cache': 11.13.1
       csstype: 3.1.3
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
 
-  '@mui/styled-engine@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)':
+  '@mui/styled-engine@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@emotion/cache': 11.13.1
@@ -8362,99 +8362,99 @@ snapshots:
       '@emotion/sheet': 1.4.0
       csstype: 3.1.3
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
 
-  '@mui/system@5.16.7(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/system@5.16.7(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/private-theming': 5.16.6(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/styled-engine': 5.16.6(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)
+      '@mui/private-theming': 5.16.6(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/styled-engine': 5.16.6(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
-      '@mui/utils': 5.16.6(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 5.16.6(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       clsx: 2.1.1
       csstype: 3.1.3
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/system@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/system@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/private-theming': 6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/styled-engine': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)
+      '@mui/private-theming': 6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/styled-engine': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
-      '@mui/utils': 6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/utils': 6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       clsx: 2.1.1
       csstype: 3.1.3
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@types/react': types-react@19.0.0-rc.1
 
   '@mui/types@7.2.18(types-react@19.0.0-rc.1)':
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/utils@5.16.6(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/utils@5.16.6(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
       '@types/prop-types': 15.7.13
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       react-is: 18.3.1
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/utils@6.0.0-rc.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/utils@6.0.0-rc.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
       '@types/prop-types': 15.7.12
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       react-is: 18.3.1
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/utils@6.1.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/utils@6.1.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
       '@mui/types': 7.2.18(types-react@19.0.0-rc.1)
       '@types/prop-types': 15.7.13
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       react-is: 18.3.1
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@mui/x-date-pickers@7.9.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(dayjs@1.11.13)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@mui/x-date-pickers@7.9.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(dayjs@1.11.13)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@babel/runtime': 7.25.6
-      '@mui/base': 5.0.0-beta.58(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/system': 5.16.7(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/utils': 5.16.6(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/base': 5.0.0-beta.58(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/system': 5.16.7(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/utils': 5.16.6(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@types/react-transition-group': 4.4.11
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
-      react-transition-group: 4.4.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
+      react-transition-group: 4.4.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       dayjs: 1.11.13
     transitivePeerDependencies:
       - '@types/react'
@@ -8741,82 +8741,82 @@ snapshots:
 
   '@radix-ui/primitive@1.1.0': {}
 
-  '@radix-ui/react-compose-refs@1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-compose-refs@1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-context@1.1.1(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-context@1.1.1(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-direction@1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-direction@1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-portal@1.1.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-portal@1.1.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@radix-ui/react-primitive': 2.0.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-presence@1.1.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-presence@1.1.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-primitive@2.0.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-primitive@2.0.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      '@radix-ui/react-slot': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@radix-ui/react-slot': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-scroll-area@1.2.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-scroll-area@1.2.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
       '@radix-ui/number': 1.1.0
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-context': 1.1.1(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-direction': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-presence': 1.1.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-primitive': 2.0.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-use-callback-ref': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-context': 1.1.1(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-direction': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-presence': 1.1.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-primitive': 2.0.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-use-callback-ref': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-slot@1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-slot@1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
+      '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-use-callback-ref@1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-use-callback-ref@1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
-  '@radix-ui/react-use-layout-effect@1.1.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)':
+  '@radix-ui/react-use-layout-effect@1.1.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)':
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
@@ -9079,43 +9079,43 @@ snapshots:
     dependencies:
       remove-accents: 0.5.0
 
-  '@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@tanstack/history': 1.61.1
-      '@tanstack/react-store': 0.5.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@tanstack/react-store': 0.5.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
     optionalDependencies:
       '@tanstack/router-generator': 1.65.0
 
-  '@tanstack/react-store@0.5.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@tanstack/react-store@0.5.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@tanstack/store': 0.5.5
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
-      use-sync-external-store: 1.2.2(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
+      use-sync-external-store: 1.2.2(react@19.0.0-rc-cd22717c-20241013)
 
-  '@tanstack/react-table@8.20.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@tanstack/react-table@8.20.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@tanstack/table-core': 8.20.5
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
-  '@tanstack/react-virtual@3.10.6(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@tanstack/react-virtual@3.10.6(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
       '@tanstack/virtual-core': 3.10.6
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
-  '@tanstack/router-devtools@1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011))(csstype@3.1.3)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)':
+  '@tanstack/router-devtools@1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013))(csstype@3.1.3)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)':
     dependencies:
-      '@tanstack/react-router': 1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      '@tanstack/react-router': 1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       clsx: 2.1.1
       goober: 2.1.14(csstype@3.1.3)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     transitivePeerDependencies:
       - csstype
 
@@ -9152,9 +9152,9 @@ snapshots:
       - supports-color
       - webpack-sources
 
-  '@tanstack/router-zod-adapter@1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011))(zod@3.23.8)':
+  '@tanstack/router-zod-adapter@1.65.0(@tanstack/react-router@1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013))(zod@3.23.8)':
     dependencies:
-      '@tanstack/react-router': 1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      '@tanstack/react-router': 1.65.0(@tanstack/router-generator@1.65.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       zod: 3.23.8
 
   '@tanstack/store@0.5.5': {}
@@ -9707,14 +9707,14 @@ snapshots:
       clean-stack: 5.2.0
       indent-string: 5.0.0
 
-  ahooks@3.8.1(react@19.0.0-rc-09111202-20241011):
+  ahooks@3.8.1(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@babel/runtime': 7.25.6
       dayjs: 1.11.13
       intersection-observer: 0.12.2
       js-cookie: 3.0.5
       lodash: 4.17.21
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       react-fast-compare: 3.2.2
       resize-observer-polyfill: 1.5.1
       screenfull: 5.2.0
@@ -9756,16 +9756,16 @@ snapshots:
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
-  allotment@1.20.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  allotment@1.20.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       classnames: 2.5.1
       eventemitter3: 5.0.1
       lodash.clamp: 4.0.3
       lodash.debounce: 4.0.8
       lodash.isequal: 4.5.0
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
-      use-resize-observer: 9.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
+      use-resize-observer: 9.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
 
   ansi-align@2.0.0:
     dependencies:
@@ -11236,13 +11236,13 @@ snapshots:
 
   fraction.js@4.3.7: {}
 
-  framer-motion@12.0.0-alpha.1(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  framer-motion@12.0.0-alpha.1(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       tslib: 2.7.0
     optionalDependencies:
       '@emotion/is-prop-valid': 1.3.0
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
   fs-extra@11.2.0:
     dependencies:
@@ -11567,7 +11567,7 @@ snapshots:
 
   hyphenate-style-name@1.1.0: {}
 
-  i18next@23.15.2:
+  i18next@23.16.0:
     dependencies:
       '@babel/runtime': 7.25.6
 
@@ -11856,10 +11856,10 @@ snapshots:
 
   jju@1.4.0: {}
 
-  jotai@2.10.0(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1):
+  jotai@2.10.0(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1):
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
 
   js-cookie@2.2.1: {}
 
@@ -12108,19 +12108,19 @@ snapshots:
       escape-string-regexp: 4.0.0
     optional: true
 
-  material-react-table@3.0.1(ddtozfjxwylixfiwxy7ptqpqna):
+  material-react-table@3.0.1(2oi5dao5k6acau5jeicyle5flm):
     dependencies:
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/icons-material': 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(dayjs@1.11.13)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/icons-material': 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(dayjs@1.11.13)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
       '@tanstack/match-sorter-utils': 8.19.4
-      '@tanstack/react-table': 8.20.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
-      '@tanstack/react-virtual': 3.10.6(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
+      '@tanstack/react-table': 8.20.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
+      '@tanstack/react-virtual': 3.10.6(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
       highlight-words: 1.2.2
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
   mathml-tag-names@2.1.3: {}
 
@@ -12453,14 +12453,14 @@ snapshots:
 
   muggle-string@0.4.1: {}
 
-  mui-color-input@4.0.1(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1):
+  mui-color-input@4.0.1(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1):
     dependencies:
       '@ctrl/tinycolor': 4.1.0
-      '@emotion/react': 11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      '@emotion/react': 11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@emotion/styled': 11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
       '@types/react': types-react@19.0.0-rc.1
 
@@ -12470,15 +12470,15 @@ snapshots:
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  nano-css@5.6.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  nano-css@5.6.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
       css-tree: 1.1.3
       csstype: 3.1.3
       fastest-stable-stringify: 2.0.2
       inline-style-prefixer: 7.0.1
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
       rtl-css-js: 1.16.1
       stacktrace-js: 2.0.2
       stylis: 4.3.2
@@ -13018,50 +13018,50 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011):
+  react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
-      scheduler: 0.25.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
+      scheduler: 0.25.0-rc-cd22717c-20241013
 
-  react-error-boundary@4.0.13(react@19.0.0-rc-09111202-20241011):
+  react-error-boundary@4.0.13(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@babel/runtime': 7.25.6
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
 
   react-fast-compare@3.2.2: {}
 
-  react-fast-marquee@1.6.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  react-fast-marquee@1.6.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
-  react-hook-form-mui@7.3.1(ys6qyhmibdgj3aiegp2mknsmkq):
+  react-hook-form-mui@7.3.1(agt453dwgyjunypjf6prbgqys4):
     dependencies:
-      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      react: 19.0.0-rc-09111202-20241011
-      react-hook-form: 7.52.1(react@19.0.0-rc-09111202-20241011)
+      '@mui/material': 6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-hook-form: 7.52.1(react@19.0.0-rc-cd22717c-20241013)
     optionalDependencies:
-      '@mui/icons-material': 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
-      '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1))(dayjs@1.11.13)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1)
+      '@mui/icons-material': 6.1.3(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
+      '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@mui/material@6.1.3(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1))(dayjs@1.11.13)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1)
 
-  react-hook-form@7.52.1(react@19.0.0-rc-09111202-20241011):
+  react-hook-form@7.52.1(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
 
-  react-i18next@15.0.3(i18next@23.15.2)(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  react-i18next@15.0.3(i18next@23.16.0)(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@babel/runtime': 7.25.6
       html-parse-stringify: 3.0.1
-      i18next: 23.15.2
-      react: 19.0.0-rc-09111202-20241011
+      i18next: 23.16.0
+      react: 19.0.0-rc-cd22717c-20241013
     optionalDependencies:
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
   react-is@16.13.1: {}
 
   react-is@18.3.1: {}
 
-  react-markdown@9.0.1(react@19.0.0-rc-09111202-20241011)(types-react@19.0.0-rc.1):
+  react-markdown@9.0.1(react@19.0.0-rc-cd22717c-20241013)(types-react@19.0.0-rc.1):
     dependencies:
       '@types/hast': 3.0.4
       '@types/react': types-react@19.0.0-rc.1
@@ -13069,7 +13069,7 @@ snapshots:
       hast-util-to-jsx-runtime: 2.3.0
       html-url-attributes: 3.0.0
       mdast-util-to-hast: 13.1.0
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       remark-parse: 11.0.0
       remark-rehype: 11.1.0
       unified: 11.0.4
@@ -13080,27 +13080,27 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
-  react-split-grid@1.0.4(react@19.0.0-rc-09111202-20241011):
+  react-split-grid@1.0.4(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       split-grid: 1.0.11
 
-  react-transition-group@4.4.5(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  react-transition-group@4.4.5(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@babel/runtime': 7.25.6
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
-  react-universal-interface@0.6.2(react@19.0.0-rc-09111202-20241011)(tslib@2.7.0):
+  react-universal-interface@0.6.2(react@19.0.0-rc-cd22717c-20241013)(tslib@2.7.0):
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
       tslib: 2.7.0
 
-  react-use@17.5.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  react-use@17.5.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@types/js-cookie': 2.2.7
       '@xobotyi/scrollbar-width': 1.9.5
@@ -13108,10 +13108,10 @@ snapshots:
       fast-deep-equal: 3.1.3
       fast-shallow-equal: 1.0.0
       js-cookie: 2.2.1
-      nano-css: 5.6.2(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011)
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
-      react-universal-interface: 0.6.2(react@19.0.0-rc-09111202-20241011)(tslib@2.7.0)
+      nano-css: 5.6.2(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
+      react-universal-interface: 0.6.2(react@19.0.0-rc-cd22717c-20241013)(tslib@2.7.0)
       resize-observer-polyfill: 1.5.1
       screenfull: 5.2.0
       set-harmonic-interval: 1.0.1
@@ -13119,7 +13119,7 @@ snapshots:
       ts-easing: 0.2.0
       tslib: 2.7.0
 
-  react@19.0.0-rc-09111202-20241011: {}
+  react@19.0.0-rc-cd22717c-20241013: {}
 
   read-cache@1.0.0:
     dependencies:
@@ -13416,7 +13416,7 @@ snapshots:
 
   sax@1.3.0: {}
 
-  scheduler@0.25.0-rc-09111202-20241011: {}
+  scheduler@0.25.0-rc-cd22717c-20241013: {}
 
   screenfull@5.2.0: {}
 
@@ -13822,11 +13822,11 @@ snapshots:
 
   svg-tags@1.0.0: {}
 
-  swr@2.2.5(react@19.0.0-rc-09111202-20241011):
+  swr@2.2.5(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       client-only: 0.0.1
-      react: 19.0.0-rc-09111202-20241011
-      use-sync-external-store: 1.2.2(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      use-sync-external-store: 1.2.2(react@19.0.0-rc-cd22717c-20241013)
 
   synckit@0.9.1:
     dependencies:
@@ -14263,15 +14263,15 @@ snapshots:
     dependencies:
       prepend-http: 1.0.4
 
-  use-resize-observer@9.1.0(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  use-resize-observer@9.1.0(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
       '@juggle/resize-observer': 3.4.0
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
-  use-sync-external-store@1.2.2(react@19.0.0-rc-09111202-20241011):
+  use-sync-external-store@1.2.2(react@19.0.0-rc-cd22717c-20241013):
     dependencies:
-      react: 19.0.0-rc-09111202-20241011
+      react: 19.0.0-rc-cd22717c-20241013
 
   utf-8-validate@5.0.10:
     dependencies:
@@ -14294,10 +14294,10 @@ snapshots:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  virtua@0.35.1(react-dom@19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011))(react@19.0.0-rc-09111202-20241011):
+  virtua@0.35.1(react-dom@19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013))(react@19.0.0-rc-cd22717c-20241013):
     optionalDependencies:
-      react: 19.0.0-rc-09111202-20241011
-      react-dom: 19.0.0-rc-09111202-20241011(react@19.0.0-rc-09111202-20241011)
+      react: 19.0.0-rc-cd22717c-20241013
+      react-dom: 19.0.0-rc-cd22717c-20241013(react@19.0.0-rc-cd22717c-20241013)
 
   vite-bundle-visualizer@1.2.1(rollup@4.21.0):
     dependencies:
diff --git a/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
index 3fcae81fa4..4b3b3fe98c 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -23,6 +23,16 @@ struct dentry;
 struct inode;
 struct file;
 
+typedef enum rtl8367b_chip_e {
+	RTL8367B_CHIP_UNKNOWN,
+ /* Family B */
+	RTL8367B_CHIP_RTL8367RB,
+	RTL8367B_CHIP_RTL8367R_VB, /* chip with exception in extif assignment */
+/* Family C */
+	RTL8367B_CHIP_RTL8367RB_VB,
+	RTL8367B_CHIP_RTL8367S
+} rtl8367b_chip_t;
+
 struct rtl8366_mib_counter {
 	unsigned	base;
 	unsigned	offset;
@@ -64,6 +74,7 @@ struct rtl8366_smi {
 	u8			dbg_vlan_4k_page;
 #endif
 	u32			phy_id;
+	rtl8367b_chip_t		rtl8367b_chip;
 	struct mii_bus		*ext_mbus;
 };
 
diff --git a/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c b/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c
index 5d3496ca3e..8eb0ca61d4 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -1,5 +1,6 @@
 /*
- * Platform driver for the Realtek RTL8367R-VB ethernet switches
+ * Platform driver for Realtek RTL8367B family chips, i.e. RTL8367RB and RTL8367R-VB
+ * extended with support for RTL8367C family chips, i.e. RTL8367RB-VB and RTL8367S
  *
  * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
  *
@@ -515,28 +516,19 @@ static int rtl8367b_write_phy_reg(struct rtl8366_smi *smi,
 static int rtl8367b_init_regs(struct rtl8366_smi *smi)
 {
 	const struct rtl8367b_initval *initvals;
-	u32 chip_num;
-	u32 chip_ver;
 	int count;
-	int err;
 
-	REG_WR(smi, RTL8367B_RTL_MAGIC_ID_REG, RTL8367B_RTL_MAGIC_ID_VAL);
-	REG_RD(smi, RTL8367B_CHIP_NUMBER_REG, &chip_num);
-	REG_RD(smi, RTL8367B_CHIP_VER_REG, &chip_ver);
-
-	switch (chip_ver) {
-	case 0x1000:
-	case 0x1010:
+	switch (smi->rtl8367b_chip) {
+	case RTL8367B_CHIP_RTL8367RB:
+	case RTL8367B_CHIP_RTL8367R_VB:
 		initvals = rtl8367b_initvals;
 		count = ARRAY_SIZE(rtl8367b_initvals);
 		break;
-	case 0x0020:
-	case 0x00A0: 
-		if (chip_num == 0x6367)  {
-			initvals = rtl8367c_initvals;
-			count = ARRAY_SIZE(rtl8367c_initvals);
-		} else 	return -ENODEV;
-		break
+	case RTL8367B_CHIP_RTL8367RB_VB:
+	case RTL8367B_CHIP_RTL8367S:
+		initvals = rtl8367c_initvals;
+		count = ARRAY_SIZE(rtl8367c_initvals);
+		break;
 	default:
 		return -ENODEV;
 	}
@@ -1308,10 +1300,10 @@ static int rtl8367b_detect(struct rtl8366_smi *smi)
 	const char *chip_name = NULL;
 	u32 chip_num;
 	u32 chip_ver;
-	u32 chip_mode;
 	int ret;
 
-	/* TODO: improve chip detection */
+	smi->rtl8367b_chip = RTL8367B_CHIP_UNKNOWN;
+
 	rtl8366_smi_write_reg(smi, RTL8367B_RTL_MAGIC_ID_REG,
 			      RTL8367B_RTL_MAGIC_ID_VAL);
 
@@ -1329,41 +1321,41 @@ static int rtl8367b_detect(struct rtl8366_smi *smi)
 		return ret;
 	}
 
-	ret = rtl8366_smi_read_reg(smi, RTL8367B_CHIP_MODE_REG, &chip_mode);
-	if (ret) {
-		dev_err(smi->parent, "unable to read %s register\n",
-			"chip mode");
-		return ret;
-	}
-
 	switch (chip_ver) {
 	case 0x0020:
-		if (chip_num == 0x6367)
+		if (chip_num == 0x6367) {
 			chip_name = "8367RB-VB";
+			smi->rtl8367b_chip = RTL8367B_CHIP_RTL8367RB_VB;
+		}
 		break;
 	case 0x00A0:
-		if (chip_num == 0x6367)
+		if (chip_num == 0x6367) {
 			chip_name = "8367S";
+			smi->rtl8367b_chip = RTL8367B_CHIP_RTL8367S;
+		}
 		break;
 	case 0x1000:
 		chip_name = "8367RB";
+		smi->rtl8367b_chip = RTL8367B_CHIP_RTL8367RB;
 		break;
 	case 0x1010:
 		chip_name = "8367R-VB";
+		smi->rtl8367b_chip = RTL8367B_CHIP_RTL8367R_VB;
 	}
 
 	if (!chip_name) {
 		dev_err(smi->parent,
-			"unknown chip num:%04x ver:%04x, mode:%04x\n",
-			chip_num, chip_ver, chip_mode);
+			"unknown chip (num:%04x ver:%04x)\n",
+			chip_num, chip_ver);
 		return -ENODEV;
 	}
 
-	dev_info(smi->parent, "RTL%s chip found\n", chip_name);
+	dev_info(smi->parent, "RTL%s chip found (num:%04x ver:%04x)\n", chip_name, chip_num, chip_ver);
 
+	/* for the RTL8367R-VB chip, extif1 corresponds to cpu_port 5 */
 	if (of_property_present(smi->parent->of_node, "realtek,extif2"))
 		smi->cpu_port = RTL8367B_CPU_PORT_NUM + 2;
-	else if (of_property_present(smi->parent->of_node, "realtek,extif1") && (chip_ver != 0x1010)) /* for the RTL8367R-VB chip, extif1 corresponds to cpu_port 5 */ 
+	else if (of_property_present(smi->parent->of_node, "realtek,extif1") && (smi->rtl8367b_chip != RTL8367B_CHIP_RTL8367R_VB))
 		smi->cpu_port = RTL8367B_CPU_PORT_NUM + 1;
 
 	dev_info(smi->parent, "CPU port: %u\n", smi->cpu_port);
diff --git a/openwrt-packages/luci-app-filebrowser/Makefile b/openwrt-packages/luci-app-filebrowser/Makefile
index 5f54825852..3abe46bba8 100644
--- a/openwrt-packages/luci-app-filebrowser/Makefile
+++ b/openwrt-packages/luci-app-filebrowser/Makefile
@@ -1,6 +1,8 @@
-# Copyright (C) 2018-2020 Lienol <lawlienol@gmail.com>
 #
-# This is free software, licensed under the Apache License, Version 2.0 .
+# Copyright (C) 2021 ImmortalWrt
+# <https://immortalwrt.org>
+#
+# This is free software, licensed under the GNU General Public License v3.
 #
 
 include $(TOPDIR)/rules.mk
@@ -9,6 +11,11 @@ LUCI_TITLE:=LuCI Support for FileBrowser
 LUCI_DEPENDS:=+filebrowser
 LUCI_PKGARCH:=all
 
+PKG_NAME:=luci-app-filebrowser
+PKG_VERSION:=snapshot
+PKG_RELEASE:=118071b
+
+PKG_LICENSE:=GPLv3
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/controller/filebrowser.lua b/openwrt-packages/luci-app-filebrowser/luasrc/controller/filebrowser.lua
index aa62649fb5..c6ca9085b1 100644
--- a/openwrt-packages/luci-app-filebrowser/luasrc/controller/filebrowser.lua
+++ b/openwrt-packages/luci-app-filebrowser/luasrc/controller/filebrowser.lua
@@ -1,59 +1,19 @@
--- Copyright 2018-2020 Lienol <lawlienol@gmail.com>
--- Improve by xiaozhuai <xiaozhuai7@gmail.com>
-module("luci.controller.filebrowser", package.seeall)
-
-local http = require "luci.http"
-local api = require "luci.model.cbi.filebrowser.api"
-
-function index()
-    if not nixio.fs.access("/etc/config/filebrowser") then return end
-
-    entry({"admin", "services"}, firstchild(), "Services", 44).dependent = false
-    entry({"admin", "services", "filebrowser"}, cbi("filebrowser/settings"),
-          _("File Browser"), 2).dependent = true
-
-    entry({"admin", "services", "filebrowser", "check"}, call("action_check")).leaf =
-        true
-    entry({"admin", "services", "filebrowser", "download"}, call("action_download")).leaf =
-        true
-    entry({"admin", "services", "filebrowser", "status"}, call("act_status")).leaf =
-        true
-    entry({"admin", "services", "filebrowser", "get_log"}, call("get_log")).leaf =
-        true
-    entry({"admin", "services", "filebrowser", "clear_log"}, call("clear_log")).leaf =
-        true
-end
-
-local function http_write_json(content)
-    http.prepare_content("application/json")
-    http.write_json(content or {code = 1})
-end
-
-function act_status()
-    local e = {}
-    e.status = luci.sys.call("ps -w | grep -v grep | grep 'filebrowser -a' >/dev/null") == 0
-    http_write_json(e)
-end
-
-function action_check()
-    local json = api.to_check()
-    http_write_json(json)
-end
-
-function action_download()
-    local json = nil
-    local task = http.formvalue("task")
-    if task == "extract" then
-        json = api.to_extract(http.formvalue("file"))
-    elseif task == "move" then
-        json = api.to_move(http.formvalue("file"))
-    else
-        json = api.to_download(http.formvalue("url"))
-    end
-    http_write_json(json)
-end
-
-function get_log()
-    luci.http.write(luci.sys.exec("[ -f '/var/log/filebrowser.log' ] && cat /var/log/filebrowser.log"))
-end
-function clear_log() luci.sys.call("echo '' > /var/log/filebrowser.log") end
+module("luci.controller.filebrowser", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/filebrowser") then
+		return
+	end
+	entry({"admin", "nas"}, firstchild(), _("NAS") , 45).dependent = false
+	local page
+	page = entry({"admin", "nas", "filebrowser"}, cbi("filebrowser"), _("文件管理器"), 100)
+	page.dependent = true
+	entry({"admin","nas","filebrowser","status"},call("act_status")).leaf=true
+end
+
+function act_status()
+	local e={}
+	e.running=luci.sys.call("pgrep filebrowser >/dev/null")==0
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua b/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua
new file mode 100644
index 0000000000..0a12e9cf72
--- /dev/null
+++ b/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua
@@ -0,0 +1,42 @@
+m = Map("filebrowser", translate("文件管理器"), translate("FileBrowser是一个基于Go的在线文件管理器，助您方便的管理设备上的文件。"))
+
+m:section(SimpleSection).template  = "filebrowser/filebrowser_status"
+
+s = m:section(TypedSection, "filebrowser")
+s.addremove = false
+s.anonymous = true
+
+enable = s:option(Flag, "enabled", translate("启用"))
+enable.rmempty = false
+
+o = s:option(ListValue, "addr_type", translate("监听地址"))
+o:value("local", translate("监听本机地址"))
+o:value("lan", translate("监听局域网地址"))
+o:value("wan", translate("监听全部地址"))
+o.default = "lan"
+o.rmempty = false
+
+o = s:option(Value, "port", translate("监听端口"))
+o.placeholder = 8989
+o.default     = 8989
+o.datatype    = "port"
+o.rmempty     = false
+
+o = s:option(Value, "root_dir", translate("开放目录"))
+o.placeholder = "/"
+o.default     = "/"
+o.rmempty     = false
+
+o = s:option(Value, "db_dir", translate("数据库目录"))
+o.placeholder = "/etc"
+o.default     = "/etc"
+o.rmempty     = false
+o.description = translate("普通用户请勿随意更改")
+
+o = s:option(Value, "db_name", translate("数据库名"))
+o.placeholder = "filebrowser.db"
+o.default     = "filebrowser.db"
+o.rmempty     = false
+o.description = translate("普通用户请勿随意更改")
+
+return m
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser/api.lua b/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser/api.lua
deleted file mode 100644
index f47785f112..0000000000
--- a/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser/api.lua
+++ /dev/null
@@ -1,338 +0,0 @@
-local fs = require "nixio.fs"
-local sys = require "luci.sys"
-local uci = require"luci.model.uci".cursor()
-local util = require "luci.util"
-local i18n = require "luci.i18n"
-
-module("luci.model.cbi.filebrowser.api", package.seeall)
-
-local appname = "filebrowser"
-local api_url =
-    "https://api.github.com/repos/filebrowser/filebrowser/releases/latest"
-
-local wget = "/usr/bin/wget"
-local wget_args = {
-    "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2"
-}
-local command_timeout = 300
-
-local LEDE_BOARD = nil
-local DISTRIB_TARGET = nil
-
-function uci_get_type(type, config, default)
-    value = uci:get_first(appname, type, config, default) or sys.exec(
-                "echo -n `uci -q get " .. appname .. ".@" .. type .. "[0]." ..
-                    config .. "`")
-    if (value == nil or value == "") and (default and default ~= "") then
-        value = default
-    end
-    return value
-end
-
-local function _unpack(t, i)
-    i = i or 1
-    if t[i] ~= nil then return t[i], _unpack(t, i + 1) end
-end
-
-local function exec(cmd, args, writer, timeout)
-    local os = require "os"
-    local nixio = require "nixio"
-
-    local fdi, fdo = nixio.pipe()
-    local pid = nixio.fork()
-
-    if pid > 0 then
-        fdo:close()
-
-        if writer or timeout then
-            local starttime = os.time()
-            while true do
-                if timeout and os.difftime(os.time(), starttime) >= timeout then
-                    nixio.kill(pid, nixio.const.SIGTERM)
-                    return 1
-                end
-
-                if writer then
-                    local buffer = fdi:read(2048)
-                    if buffer and #buffer > 0 then
-                        writer(buffer)
-                    end
-                end
-
-                local wpid, stat, code = nixio.waitpid(pid, "nohang")
-
-                if wpid and stat == "exited" then return code end
-
-                if not writer and timeout then nixio.nanosleep(1) end
-            end
-        else
-            local wpid, stat, code = nixio.waitpid(pid)
-            return wpid and stat == "exited" and code
-        end
-    elseif pid == 0 then
-        nixio.dup(fdo, nixio.stdout)
-        fdi:close()
-        fdo:close()
-        nixio.exece(cmd, args, nil)
-        nixio.stdout:close()
-        os.exit(1)
-    end
-end
-
-local function compare_versions(ver1, comp, ver2)
-    local table = table
-
-    local av1 = util.split(ver1, "[%.%-]", nil, true)
-    local av2 = util.split(ver2, "[%.%-]", nil, true)
-
-    local max = table.getn(av1)
-    local n2 = table.getn(av2)
-    if (max < n2) then max = n2 end
-
-    for i = 1, max, 1 do
-        local s1 = av1[i] or ""
-        local s2 = av2[i] or ""
-
-        if comp == "~=" and (s1 ~= s2) then return true end
-        if (comp == "<" or comp == "<=") and (s1 < s2) then return true end
-        if (comp == ">" or comp == ">=") and (s1 > s2) then return true end
-        if (s1 ~= s2) then return false end
-    end
-
-    return not (comp == "<" or comp == ">")
-end
-
-local function auto_get_arch()
-    local arch = nixio.uname().machine or ""
-    if fs.access("/usr/lib/os-release") then
-        LEDE_BOARD = sys.exec(
-                         "echo -n `grep 'LEDE_BOARD' /usr/lib/os-release | awk -F '[\\042\\047]' '{print $2}'`")
-    end
-    if fs.access("/etc/openwrt_release") then
-        DISTRIB_TARGET = sys.exec(
-                             "echo -n `grep 'DISTRIB_TARGET' /etc/openwrt_release | awk -F '[\\042\\047]' '{print $2}'`")
-    end
-
-    if arch == "mips" then
-        if LEDE_BOARD and LEDE_BOARD ~= "" then
-            if string.match(LEDE_BOARD, "ramips") == "ramips" then
-                arch = "ramips"
-            else
-                arch = sys.exec("echo '" .. LEDE_BOARD ..
-                                    "' | grep -oE 'ramips|ar71xx'")
-            end
-        elseif DISTRIB_TARGET and DISTRIB_TARGET ~= "" then
-            if string.match(DISTRIB_TARGET, "ramips") == "ramips" then
-                arch = "ramips"
-            else
-                arch = sys.exec("echo '" .. DISTRIB_TARGET ..
-                                    "' | grep -oE 'ramips|ar71xx'")
-            end
-        end
-    end
-
-    return util.trim(arch)
-end
-
-local function get_file_info(arch)
-    local file_tree = ""
-    local sub_version = ""
-
-    if arch == "x86_64" then
-        file_tree = "amd64"
-    elseif arch == "aarch64" then
-        file_tree = "arm64"
-    elseif arch == "ramips" then
-        file_tree = "mipsle"
-    elseif arch == "ar71xx" then
-        file_tree = "mips"
-    elseif arch:match("^i[%d]86$") then
-        file_tree = "386"
-    elseif arch:match("^armv[5-8]") then
-        file_tree = "armv"
-        sub_version = arch:match("[5-8]")
-        if LEDE_BOARD and string.match(LEDE_BOARD, "bcm53xx") == "bcm53xx" then
-            sub_version = "5"
-        elseif DISTRIB_TARGET and string.match(DISTRIB_TARGET, "bcm53xx") ==
-            "bcm53xx" then
-            sub_version = "5"
-        end
-        sub_version = "5"
-    end
-
-    return file_tree, sub_version
-end
-
-local function get_api_json(url)
-    local jsonc = require "luci.jsonc"
-
-    local output = {}
-    -- exec(wget, { "-O-", url, _unpack(wget_args) },
-    --	function(chunk) output[#output + 1] = chunk end)
-    -- local json_content = util.trim(table.concat(output))
-
-    local json_content = luci.sys.exec(wget ..
-                                           " --no-check-certificate --timeout=10 -t 1 -O- " ..
-                                           url)
-
-    if json_content == "" then return {} end
-
-    return jsonc.parse(json_content) or {}
-end
-
-function get_version() return uci_get_type("global", "version", "0") end
-
-function to_check(arch)
-    if not arch or arch == "" then arch = auto_get_arch() end
-
-    local file_tree, sub_version = get_file_info(arch)
-
-    if file_tree == "" then
-        return {
-            code = 1,
-            error = i18n.translate(
-                "Can't determine ARCH, or ARCH not supported.")
-        }
-    end
-
-    local json = get_api_json(api_url)
-
-    if json.tag_name == nil then
-        return {
-            code = 1,
-            error = i18n.translate("Get remote version info failed.")
-        }
-    end
-
-    local remote_version = json.tag_name:match("[^v]+")
-
-    local needs_update = compare_versions(get_version(), "<", remote_version)
-    local html_url, download_url
-
-    if needs_update then
-        html_url = json.html_url
-        for _, v in ipairs(json.assets) do
-            if v.name and v.name:match("linux%-" .. file_tree .. sub_version) then
-                download_url = v.browser_download_url
-                break
-            end
-        end
-    end
-
-    if needs_update and not download_url then
-        return {
-            code = 1,
-            version = remote_version,
-            html_url = html_url,
-            error = i18n.translate(
-                "New version found, but failed to get new version download url.")
-        }
-    end
-
-    return {
-        code = 0,
-        update = needs_update,
-        version = remote_version,
-        url = {html = html_url, download = download_url}
-    }
-end
-
-function to_download(url)
-    if not url or url == "" then
-        return {code = 1, error = i18n.translate("Download url is required.")}
-    end
-
-    sys.call("/bin/rm -f /tmp/filebrowser_download.*")
-
-    local tmp_file = util.trim(util.exec(
-                                   "mktemp -u -t filebrowser_download.XXXXXX"))
-
-    local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil,
-                        command_timeout) == 0
-
-    if not result then
-        exec("/bin/rm", {"-f", tmp_file})
-        return {
-            code = 1,
-            error = i18n.translatef("File download failed or timed out: %s", url)
-        }
-    end
-
-    return {code = 0, file = tmp_file}
-end
-
-function to_extract(file, subfix)
-    if not file or file == "" or not fs.access(file) then
-        return {code = 1, error = i18n.translate("File path required.")}
-    end
-
-    sys.call("/bin/rm -rf /tmp/filebrowser_extract.*")
-    local tmp_dir = util.trim(util.exec(
-                                  "mktemp -d -t filebrowser_extract.XXXXXX"))
-
-    local output = {}
-    exec("/bin/tar", {"-C", tmp_dir, "-zxvf", file},
-         function(chunk) output[#output + 1] = chunk end)
-
-    local files = util.split(table.concat(output))
-
-    exec("/bin/rm", {"-f", file})
-
-    if not new_file then
-        for _, f in pairs(files) do
-            if f:match("filebrowser") then
-                new_file = tmp_dir .. "/" .. util.trim(f)
-                break
-            end
-        end
-    end
-
-    if not new_file then
-        exec("/bin/rm", {"-rf", tmp_dir})
-        return {
-            code = 1,
-            error = i18n.translatef("Can't find client in file: %s", file)
-        }
-    end
-
-    return {code = 0, file = new_file}
-end
-
-function to_move(file)
-    if not file or file == "" or not fs.access(file) then
-        sys.call("/bin/rm -rf /tmp/filebrowser_extract.*")
-        return {code = 1, error = i18n.translate("Client file is required.")}
-    end
-    local executable_directory =
-        uci_get_type("global", "executable_directory", "/tmp")
-    luci.sys.exec("mkdir -p " .. executable_directory)
-    local client_path = executable_directory .. "/" .. appname
-    local client_path_bak
-
-    if fs.access(client_path) then
-        client_path_bak = "/tmp/" .. appname .. ".bak"
-        exec("/bin/mv", {"-f", client_path, client_path_bak})
-    end
-
-    local result = exec("/bin/mv", {"-f", file, client_path}, nil,
-                        command_timeout) == 0
-
-    if not result or not fs.access(client_path) then
-        if client_path_bak then
-            exec("/bin/mv", {"-f", client_path_bak, client_path})
-        end
-        return {
-            code = 1,
-            error = i18n.translatef("Can't move new file to path: %s",
-                                    client_path)
-        }
-    end
-
-    exec("/bin/chmod", {"755", client_path})
-
-    if client_path_bak then exec("/bin/rm", {"-f", client_path_bak}) end
-
-    sys.call("/bin/rm -rf /tmp/filebrowser_extract.*")
-
-    return {code = 0}
-end
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser/settings.lua b/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser/settings.lua
deleted file mode 100644
index 2a26870cb6..0000000000
--- a/openwrt-packages/luci-app-filebrowser/luasrc/model/cbi/filebrowser/settings.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-m = Map("filebrowser", translate("FileBrowser"), translate(
-            "File explorer is software that creates your own cloud that you can install on a server, point it to a path, and then access your files through a beautiful web interface. You have many features available!"))
-m:append(Template("filebrowser/status"))
-
-s = m:section(TypedSection, "global", translate("Global Settings"))
-s.anonymous = true
-s.addremove = false
-
-o = s:option(Flag, "enable", translate("Enable"))
-o.rmempty = false
-
-o = s:option(Value, "address", translate("Listen address"))
-o.default = "0.0.0.0"
-o.rmempty = false
-
-o = s:option(Value, "port", translate("Listen port"))
-o.datatype = "port"
-o.default = 8088
-o.rmempty = false
-
-o = s:option(Value, "database", translate("Database path"))
-o.default = "/etc/filebrowser.db"
-o.rmempty = false
-
-o = s:option(Value, "username", translate("Initial username"))
-o.default = "admin"
-o.rmempty = false
-
-o = s:option(Value, "password", translate("Initial password"))
-o.default = "admin"
-o.rmempty = false
-
-o = s:option(Value, "ssl_cert", translate("SSL cert"))
-o.default = ""
-
-o = s:option(Value, "ssl_key", translate("SSL key"))
-o.default = ""
-
-o = s:option(Value, "root_path", translate("Root path"), translate(
-                 "Point to a path to access your files in the web interface, default is /root"))
-o.default = "/root"
-o.rmempty = false
-
-o = s:option(Value, "executable_directory", translate("Executable directory"),
-             translate(
-                 "The file size is large, requiring at least 32M space. It is recommended to insert a usb flash drive or hard disk, or use it in the tmp directory<br />For example, /mnt/sda1<br />For example, /tmp"))
-o.default = "/tmp"
-o.rmempty = false
-
-o = s:option(Button, "_download", translate("Manually download"), translate(
-                 "Make sure you have enough space. <br /><font style='color:red'>Be sure to fill out the executable storage directory the first time you run it, and then save the application. Then manually download, otherwise can not use!</font>"))
-o.template = "filebrowser/download"
-o.inputstyle = "apply"
-o.btnclick = "downloadClick(this);"
-o.id = "download_btn"
-
-m:append(Template("filebrowser/log"))
-
-return m
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/download.htm b/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/download.htm
deleted file mode 100644
index c6c07cb342..0000000000
--- a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/download.htm
+++ /dev/null
@@ -1,169 +0,0 @@
-<%
-local dsp = require "luci.dispatcher"
--%>
-
-<script type="text/javascript">//<![CDATA[
-  var msgInfo;
-
-  var tokenStr = '<%=token%>';
-  var clickToDownloadText = '<%:Click to download%>';
-  var inProgressText = '<%:Downloading...%>';
-  var downloadInProgressNotice = '<%:Download, are you sure to close?%>';
-  var downloadSuccessText = '<%:Download successful%>';
-  var unexpectedErrorText = '<%:Unexpected error%>';
-
-  function addPageNotice() {
-    window.onbeforeunload = function(e) {
-      e.returnValue = downloadInProgressNotice;
-      return downloadInProgressNotice;
-    };
-  }
-
-  function removePageNotice() {
-    window.onbeforeunload = undefined;
-  }
-
-  function onUpdateSuccess(btn) {
-    alert(downloadSuccessText);
-
-    if (btn) {
-      btn.value = downloadSuccessText;
-      btn.placeholder = downloadSuccessText;
-      btn.disabled = true;
-    }
-
-    window.setTimeout(function () {
-      window.location.reload();
-    }, 1000);
-  }
-
-  function onRequestError(btn, errorMessage) {
-    btn.disabled = false;
-    btn.value = btn.placeholder;
-
-    if (errorMessage) {
-      alert(errorMessage);
-    }
-  }
-
-  function doAjaxGet(url, data, onResult) {
-    new XHR().get(url, data, function(_, json) {
-      var resultJson = json || {
-        'code': 1,
-        'error': unexpectedErrorText
-      };
-
-      if (typeof onResult === 'function') {
-        onResult(resultJson);
-      }
-    })
-  }
-
-  function downloadClick(btn) {
-      if (msgInfo === undefined) {
-        checkUpdate(btn);
-      } else {
-        doDownload(btn);
-      }
-  }
-
-  function checkUpdate(btn) {
-    btn.disabled = true;
-    btn.value = inProgressText;
-
-    addPageNotice();
-
-    var ckeckDetailElm = document.getElementById(btn.id + '-detail');
-
-    doAjaxGet('<%=dsp.build_url("admin/services/filebrowser/check")%>/', {
-      token: tokenStr
-    }, function (json) {
-      removePageNotice();
-      if (json.code) {
-        eval('Info = undefined');
-        onRequestError(btn, json.error);
-      } else {
-          eval('Info = json');
-          btn.disabled = false;
-          btn.value = clickToDownloadText;
-          btn.placeholder = clickToDownloadText;
-      }
-
-      if (ckeckDetailElm) {
-        var urlNode = '';
-        if (json.version) {
-          urlNode = '<em style="color:red;"><%:The latest version:%>' + json.version + '</em>';
-          if (json.url && json.url.html) {
-            urlNode = '<a href="' + json.url.html + '" target="_blank">' + urlNode + '</a>';
-          }
-        }
-        ckeckDetailElm.innerHTML = urlNode;
-      }
-	  msgInfo = json;
-    });
-  }
-
-  function doDownload(btn) {
-    btn.disabled = true;
-    btn.value = '<%:Downloading...%>';
-
-    addPageNotice();
-
-    var UpdateUrl = '<%=dsp.build_url("admin/services/filebrowser/download")%>';
-    // Download file
-    doAjaxGet(UpdateUrl, {
-      token: tokenStr,
-      url: msgInfo ? msgInfo.url.download : ''
-    }, function (json) {
-      if (json.code) {
-        removePageNotice();
-        onRequestError(btn, json.error);
-      } else {
-        btn.value = '<%:Unpacking...%>';
-
-        // Extract file
-        doAjaxGet(UpdateUrl, {
-          token: tokenStr,
-          task: 'extract',
-          file: json.file
-        }, function (json) {
-          if (json.code) {
-            removePageNotice();
-            onRequestError(btn, json.error);
-          } else {
-            btn.value = '<%:Moving...%>';
-
-            // Move file to target dir
-            doAjaxGet(UpdateUrl, {
-              token: tokenStr,
-              task: 'move',
-              file: json.file
-            }, function (json) {
-              removePageNotice();
-              if (json.code) {
-                onRequestError(btn, json.error);
-              } else {
-                onUpdateSuccess(btn);
-              }
-            })
-          }
-        })
-      }
-    })
-  }
-//]]></script>
-
-<%+cbi/valueheader%>
-	<% if self:cfgvalue(section) ~= false then %>
-		<input class="cbi-button cbi-input-<%=self.inputstyle or "button" %>" type="button"<%=
-			attr("name", cbid) ..
-			attr("id", self.id or cbid) ..
-			attr("value", self.inputtitle or self.title) ..
-			ifattr(self.btnclick, "onclick", self.btnclick) ..
-			ifattr(self.placeholder, "placeholder")
-		%> />
-		<span id="<%=self.id or cbid%>-detail"></span>
-	<% else %>
-		-
-	<% end %>
-<%+cbi/valuefooter%>
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/filebrowser_status.htm b/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/filebrowser_status.htm
new file mode 100644
index 0000000000..ef96cf77c3
--- /dev/null
+++ b/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/filebrowser_status.htm
@@ -0,0 +1,32 @@
+<script type="text/javascript">//<![CDATA[
+XHR.poll(1, '<%=url([[admin]], [[nas]], [[filebrowser]], [[status]])%>', null,
+	function(x, data) {
+		var tb = document.getElementById('filebrowser_status');
+		if (data && tb) {
+			if (data.running) {
+				var links = '<font color=green>Filebrowser <%:运行中%></font><input class="cbi-button mar-10" type="button" value="<%:打开管理界面%>" onclick="openClient();" />';
+				tb.innerHTML = links;
+			} else {
+				tb.innerHTML = '<font color=red>Filebrowser <%:未运行%></font>';
+			}
+		}
+	}
+);
+
+function openClient() {
+	var curWwwPath = window.document.location.href;
+	var pathName = window.document.location.pathname;
+	var pos = curWwwPath.indexOf(pathName);
+	var localhostPath = curWwwPath.substring(0, pos);
+	var clientPort = window.document.getElementById("cbid.filebrowser.config.port").value
+	var url = localhostPath + ":" + clientPort;
+	window.open(url)
+};
+//]]>
+</script>
+<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
+<fieldset class="cbi-section">
+	<p id="filebrowser_status">
+		<em><%:Collecting data...%></em>
+	</p>
+</fieldset>
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/log.htm b/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/log.htm
deleted file mode 100644
index 17a22c31ff..0000000000
--- a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/log.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<script type="text/javascript">
-	//<![CDATA[
-	function clear_log(btn) {
-		XHR.get('<%=url([[admin]], [[services]], [[filebrowser]], [[clear_log]])%>', null,
-			function(x, data) {
-				if(x && x.status == 200) {
-					var log_textarea = document.getElementById('log_textarea');
-					log_textarea.innerHTML = "";
-					log_textarea.scrollTop = log_textarea.scrollHeight;
-				}
-			}
-		);
-	}
-	XHR.poll(3, '<%=url([[admin]], [[services]], [[filebrowser]], [[get_log]])%>', null,
-		function(x, data) {
-			if(x && x.status == 200) {
-				var log_textarea = document.getElementById('log_textarea');
-				log_textarea.innerHTML = x.responseText;
-				log_textarea.scrollTop = log_textarea.scrollHeight;
-			}
-		}
-	);
-	//]]>
-</script>
-<fieldset class="cbi-section" id="_log_fieldset">
-	<legend>
-		<%:Logs%>
-	</legend>
-	<input class="cbi-button cbi-input-remove" type="button" onclick="clear_log()" value="<%:Clear logs%>" style="margin-left: 10px;">
-	<textarea id="log_textarea" class="cbi-input-textarea" style="width: calc(100% - 20px); margin: 10px;" data-update="change" rows="5" wrap="off" readonly="readonly"></textarea>
-</fieldset>
diff --git a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/status.htm b/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/status.htm
deleted file mode 100644
index 727d3e19d8..0000000000
--- a/openwrt-packages/luci-app-filebrowser/luasrc/view/filebrowser/status.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-local dsp = require "luci.dispatcher"
--%>
-
-<fieldset class="cbi-section">
-	<legend><%:Running Status%></legend>
-	<fieldset class="cbi-section">
-		<div class="cbi-value">
-			<label class="cbi-value-title"><%:Status%></label>
-			<div class="cbi-value-field" id="_status"><p><span><%:Collecting data...%></span></p></div>
-		</div>
-	</fieldset>
-</fieldset>
-
-<script type="text/javascript">//<![CDATA[
-	var _status = document.getElementById('_status');
-	XHR.poll(3,'<%=dsp.build_url("admin/services/filebrowser/status")%>', null,
-		function(x, json) {
-			if (x && x.status == 200) {
-				if (_status)
-					_status.innerHTML = json.status ? '<p><span style="color:green;"><%:RUNNING%></span> <input type="button" class="cbi-button cbi-input-apply" value="<%:Enter interface%>" onclick="openwebui()" /></p>' : '<p><span style="color:red;"><%:NOT RUNNING%></span></p>';
-			}
-		});
-		
-	function openwebui(){
-		
-		var url = window.location.host;
-		if (url.indexOf(':')) {
-			url = url.split(':')[0];
-		}
-		ssl_cert = "<%=luci.sys.exec("uci get filebrowser.@global[0].ssl_cert"):gsub("^%s*(.-)%s*$", "%1")%>";
-		ssl_key = "<%=luci.sys.exec("uci get filebrowser.@global[0].ssl_key"):gsub("^%s*(.-)%s*$", "%1")%>";
-		port = "<%=luci.sys.exec("uci get filebrowser.@global[0].port"):gsub("^%s*(.-)%s*$", "%1")%>";
-		protocol = 'http';
-		if (ssl_cert !== '' && ssl_key !== '') protocol = 'https';
-		window.open(protocol+'://'+url+':'+port,'target','');
-	}
-//]]></script>
diff --git a/openwrt-packages/luci-app-filebrowser/po/zh-cn/filebrowser.po b/openwrt-packages/luci-app-filebrowser/po/zh-cn/filebrowser.po
deleted file mode 100644
index 4dd920ef11..0000000000
--- a/openwrt-packages/luci-app-filebrowser/po/zh-cn/filebrowser.po
+++ /dev/null
@@ -1,125 +0,0 @@
-msgid "File Browser"
-msgstr "文件浏览器"
-
-msgid "File explorer is software that creates your own cloud that you can install on a server, point it to a path, and then access your files through a beautiful web interface. You have many features available!"
-msgstr "文件浏览器是一种创建你自己的云的软件，你可以在服务器上安装它，将它指向一个路径，然后通过一个漂亮的web界面访问你的文件。您有许多可用的特性！"
-
-msgid "RUNNING"
-msgstr "运行中"
-
-msgid "NOT RUNNING"
-msgstr "未运行"
-
-msgid "Enter interface"
-msgstr "进入界面"
-
-msgid "Global Settings"
-msgstr "全局设置"
-
-msgid "Enable"
-msgstr "启用"
-
-msgid "Listen address"
-msgstr "监听地址"
-
-msgid "Listen port"
-msgstr "监听端口"
-
-msgid "Initial username"
-msgstr "初始账户"
-
-msgid "Initial password"
-msgstr "初始密码"
-
-msgid "SSL cert"
-msgstr "SSL 证书"
-
-msgid "SSL key"
-msgstr "SSL 私钥"
-
-msgid "Database path"
-msgstr "数据库路径"
-
-msgid "Root path"
-msgstr "指向路径"
-
-msgid "Point to a path to access your files in the web interface, default is /root"
-msgstr "指向一个路径，可在web界面访问你的文件，默认为 /root"
-
-msgid "Executable directory"
-msgstr "可执行文件存放目录"
-
-msgid "The file size is large, requiring at least 32M space. It is recommended to insert a usb flash drive or hard disk, or use it in the tmp directory<br />For example, /mnt/sda1<br />For example, /tmp"
-msgstr "文件较大，至少需要32M空间。建议插入U盘或硬盘，或放入tmp目录里使用<br />例如：/mnt/sda1<br />例如：/tmp"
-
-msgid "Manually download"
-msgstr "手动下载"
-
-msgid "Make sure you have enough space. <br /><font style='color:red'>Be sure to fill out the executable storage directory the first time you run it, and then save the application. Then manually download, otherwise can not use!</font>"
-msgstr "请确保具有足够的空间。<br /><font style='color:red'>第一次运行务必填好项目存放目录，然后保存应用。再手动下载，否则无法使用！</font>"
-
-msgid "Logs"
-msgstr "日志"
-
-msgid "Clear logs"
-msgstr "清空日志"
-
-msgid "It is the latest version"
-msgstr "已是最新版本"
-
-msgid "Download successful"
-msgstr "下载成功"
-
-msgid "Click to download"
-msgstr "点击下载"
-
-msgid "Updating..."
-msgstr "更新中"
-
-msgid "Unexpected error"
-msgstr "意外错误"
-
-msgid "Download, are you sure to close?"
-msgstr "正在下载，你确认要关闭吗？"
-
-msgid "Downloading..."
-msgstr "下载中"
-
-msgid "Unpacking..."
-msgstr "解压中"
-
-msgid "Moving..."
-msgstr "移动中"
-
-msgid "The latest version:"
-msgstr "最新版本："
-
-msgid "Can't determine ARCH, or ARCH not supported."
-msgstr "无法确认ARCH架构，或是不支持。"
-
-msgid "Get remote version info failed."
-msgstr "获取远程版本信息失败。"
-
-msgid "New version found, but failed to get new version download url."
-msgstr "发现新版本，但未能获得新版本的下载地址。"
-
-msgid "Download url is required."
-msgstr "请指定下载地址。"
-
-msgid "File download failed or timed out: %s"
-msgstr "文件下载失败或超时：%s"
-
-msgid "File path required."
-msgstr "请指定文件路径。"
-
-msgid "Can't find client in file: %s"
-msgstr "无法在文件中找到客户端：%s"
-
-msgid "Client file is required."
-msgstr "请指定客户端文件。"
-
-msgid "The client file is not suitable for current device."
-msgstr "客户端文件不适合当前设备。"
-
-msgid "Can't move new file to path: %s"
-msgstr "无法移动新文件到：%s"
diff --git a/openwrt-packages/luci-app-filebrowser/root/etc/config/filebrowser b/openwrt-packages/luci-app-filebrowser/root/etc/config/filebrowser
deleted file mode 100644
index 8cc2b3a0f2..0000000000
--- a/openwrt-packages/luci-app-filebrowser/root/etc/config/filebrowser
+++ /dev/null
@@ -1,13 +0,0 @@
-
-config global
-	option address '0.0.0.0'
-	option port '8088'
-	option database '/etc/filebrowser.db'
-	option username 'admin'
-	option password 'admin'
-	option ssl_cert ''
-	option ssl_key ''
-	option root_path '/root'
-	option executable_directory '/tmp'
-	option enable '0'
-
diff --git a/openwrt-packages/luci-app-filebrowser/root/etc/init.d/filebrowser b/openwrt-packages/luci-app-filebrowser/root/etc/init.d/filebrowser
deleted file mode 100755
index be23925304..0000000000
--- a/openwrt-packages/luci-app-filebrowser/root/etc/init.d/filebrowser
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2018-2020 Lienol <lawlienol@gmail.com>
-# Improve by xiaozhuai <xiaozhuai7@gmail.com>
-
-START=99
-
-LOG_PATH="/var/log/filebrowser.log"
-
-echolog() {
-	echo -e "$(date "+%Y-%m-%d %H:%M:%S"): $1" >> $LOG_PATH
-}
-
-config_t_get() {
-	local index=0
-	[ -n "$4" ] && index=$4
-	local ret=$(uci get filebrowser.@$1[$index].$2 2>/dev/null)
-	echo ${ret:=$3}
-}
-start() {
-	ENABLED=$(config_t_get global enable 0)
-	[ "$ENABLED" = "0" ] && return
-	ADDRESS=$(config_t_get global address 0.0.0.0)
-	PORT=$(config_t_get global port 8088)
-	DATABASE=$(config_t_get global database /etc/filebrowser.db)
-	USERNAME=$(config_t_get global username admin)
-	PASSWORD=$(config_t_get global password admin)
-	SSL_CERT=$(config_t_get global ssl_cert)
-	SSL_KEY=$(config_t_get global ssl_key)
-	ROOT_PATH=$(config_t_get global root_path /root)
-	executable_directory=$(config_t_get global executable_directory /tmp)
-	[ ! -f "$executable_directory/filebrowser" ] && echolog "$executable_directory/filebrowser not exists, please download first" && exit
-	
-	SSL_PARAMS=""
-	[ -n "$SSL_CERT" ] && [ -n "$SSL_KEY" ] && SSL_PARAMS="-t $SSL_CERT -k $SSL_KEY"
-	PASSWORD="$($executable_directory/filebrowser hash "$PASSWORD")"
-	$executable_directory/filebrowser -a $ADDRESS -p $PORT -r $ROOT_PATH -d "$DATABASE" --username $USERNAME --password $PASSWORD $SSL_PARAMS -l $LOG_PATH >/dev/null 2>&1 &
-}
-
-stop() {
-	ps -w | grep -v "grep" | grep "$executable_directory/filebrowser -a" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
-	rm -rf $LOG_PATH
-}
-
-restart() {
-	stop
-	sleep 1
-	start
-}
diff --git a/openwrt-packages/luci-app-filebrowser/root/etc/uci-defaults/luci-app-filebrowser b/openwrt-packages/luci-app-filebrowser/root/etc/uci-defaults/luci-filebrowser
old mode 100644
new mode 100755
similarity index 92%
rename from openwrt-packages/luci-app-filebrowser/root/etc/uci-defaults/luci-app-filebrowser
rename to openwrt-packages/luci-app-filebrowser/root/etc/uci-defaults/luci-filebrowser
index df11e72220..8fece8810e
--- a/openwrt-packages/luci-app-filebrowser/root/etc/uci-defaults/luci-app-filebrowser
+++ b/openwrt-packages/luci-app-filebrowser/root/etc/uci-defaults/luci-filebrowser
@@ -1,11 +1,11 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@filebrowser[-1]
-	add ucitrack filebrowser
-	set ucitrack.@filebrowser[-1].init=filebrowser
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@filebrowser[-1]
+	add ucitrack filebrowser
+	set ucitrack.@filebrowser[-1].init=filebrowser
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
\ No newline at end of file
diff --git a/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json b/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json
deleted file mode 100644
index e01bde3d4a..0000000000
--- a/openwrt-packages/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"luci-app-filebrowser": {
-		"description": "Grant UCI access for luci-app-filebrowser",
-		"read": {
-			"uci": [ "filebrowser" ]
-		},
-		"write": {
-			"uci": [ "filebrowser" ]
-		}
-	}
-}
diff --git a/openwrt-packages/luci-app-gost/luasrc/controller/gost.lua b/openwrt-packages/luci-app-gost/luasrc/controller/gost.lua
index 37f8af1f19..1105b08700 100644
--- a/openwrt-packages/luci-app-gost/luasrc/controller/gost.lua
+++ b/openwrt-packages/luci-app-gost/luasrc/controller/gost.lua
@@ -12,7 +12,6 @@ function index()
 	local page
 	page = entry({"admin", "services", "gost"}, cbi("gost"), _("Gost"), 100)
 	page.dependent = true
-	page.acl_depends = { "luci-app-gost" }
 	entry({"admin", "services", "gost", "status"},call("act_status")).leaf=true
 end
 
diff --git a/openwrt-packages/luci-app-gost/po/zh-cn b/openwrt-packages/luci-app-gost/po/zh-cn
deleted file mode 120000
index 8d69574ddd..0000000000
--- a/openwrt-packages/luci-app-gost/po/zh-cn
+++ /dev/null
@@ -1 +0,0 @@
-zh_Hans
\ No newline at end of file
diff --git a/openwrt-packages/luci-app-gost/po/zh_Hans/gost.po b/openwrt-packages/luci-app-gost/po/zh-cn/gost.po
similarity index 100%
rename from openwrt-packages/luci-app-gost/po/zh_Hans/gost.po
rename to openwrt-packages/luci-app-gost/po/zh-cn/gost.po
diff --git a/openwrt-packages/luci-app-filebrowser/po/zh_Hans b/openwrt-packages/luci-app-gost/po/zh_Hans
similarity index 100%
rename from openwrt-packages/luci-app-filebrowser/po/zh_Hans
rename to openwrt-packages/luci-app-gost/po/zh_Hans
diff --git a/openwrt-packages/luci-app-gost/root/usr/share/rpcd/acl.d/luci-app-gost.json b/openwrt-packages/luci-app-gost/root/usr/share/rpcd/acl.d/luci-app-gost.json
deleted file mode 100644
index f5adf7e5cd..0000000000
--- a/openwrt-packages/luci-app-gost/root/usr/share/rpcd/acl.d/luci-app-gost.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"luci-app-gost": {
-		"description": "Grant UCI access for luci-app-gost",
-		"read": {
-			"uci": [ "gost" ]
-		},
-		"write": {
-			"uci": [ "gost" ]
-		}
-	}
-}
diff --git a/sing-box/go.mod b/sing-box/go.mod
index ab3048ce85..eb098803c6 100644
--- a/sing-box/go.mod
+++ b/sing-box/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/sagernet/sing-shadowsocks v0.2.7
 	github.com/sagernet/sing-shadowsocks2 v0.2.0
 	github.com/sagernet/sing-shadowtls v0.1.4
-	github.com/sagernet/sing-tun v0.4.0-rc.3
+	github.com/sagernet/sing-tun v0.4.0-rc.3.0.20241014141023-07278fb4705b
 	github.com/sagernet/sing-vmess v0.1.12
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7
 	github.com/sagernet/utls v1.6.7
diff --git a/sing-box/go.sum b/sing-box/go.sum
index 31b29b6d6b..6c2b1b23e0 100644
--- a/sing-box/go.sum
+++ b/sing-box/go.sum
@@ -129,8 +129,8 @@ github.com/sagernet/sing-shadowsocks2 v0.2.0 h1:wpZNs6wKnR7mh1wV9OHwOyUr21VkS3wK
 github.com/sagernet/sing-shadowsocks2 v0.2.0/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
 github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
-github.com/sagernet/sing-tun v0.4.0-rc.3 h1:W/Odc87dGXkRhwRo2jhsKYHypNbajIcsGlIzDatmMKA=
-github.com/sagernet/sing-tun v0.4.0-rc.3/go.mod h1:+lQdWhqD4atzrCgRhoyrxBCg1OBru/hAv2BT3kdgmGM=
+github.com/sagernet/sing-tun v0.4.0-rc.3.0.20241014141023-07278fb4705b h1:a2VWOxv7uvIThhJyW6bB+D+bciLSkkqzq4bC4yg3U0g=
+github.com/sagernet/sing-tun v0.4.0-rc.3.0.20241014141023-07278fb4705b/go.mod h1:+lQdWhqD4atzrCgRhoyrxBCg1OBru/hAv2BT3kdgmGM=
 github.com/sagernet/sing-vmess v0.1.12 h1:2gFD8JJb+eTFMoa8FIVMnknEi+vCSfaiTXTfEYAYAPg=
 github.com/sagernet/sing-vmess v0.1.12/go.mod h1:luTSsfyBGAc9VhtCqwjR+dt1QgqBhuYBCONB/POhF8I=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
diff --git a/small/luci-app-ssr-plus/Makefile b/small/luci-app-ssr-plus/Makefile
index d07f167d83..fdc6a092b7 100644
--- a/small/luci-app-ssr-plus/Makefile
+++ b/small/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=188
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \
diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
index 0f8cd034bc..9353f35e5b 100644
--- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
+++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
@@ -109,6 +109,10 @@ o:depends("shunt_dns_mode", "2")
 o.rmempty = false
 o.default = "0"
 
+o = s:option(Flag, "apple_optimization", translate("Apple domains optimization"), translate("For Apple domains equipped with Chinese mainland CDN, always responsive to Chinese CDN IP addresses"))
+o.rmempty = false
+o.default = "1"
+
 o = s:option(Flag, "adblock", translate("Enable adblock"))
 o.rmempty = false
 
diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index c55e0ff096..1048aa495a 100644
--- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -927,7 +927,6 @@ if is_finded("xray") then
 		o:value(v, translate(v))
 	end
 	o.rmempty = true
-	o:depends("xtls", true)
 	o:depends({type = "v2ray", v2ray_protocol = "vless", transport = "tcp", tls = true})
 	o:depends({type = "v2ray", v2ray_protocol = "vless", transport = "tcp", reality = true})
 
diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua
index 3b91739dc3..26de9baa40 100644
--- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua
+++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua
@@ -134,7 +134,7 @@ o.description = translate("Custom DNS Server for mosdns")
 o = s:option(Flag, "mosdns_ipv6", translate("Disable IPv6 in MOSDNS query mode"))
 o:depends("pdnsd_enable", "3")
 o.rmempty = false
-o.default = "0"
+o.default = "1"
 
 if is_finded("chinadns-ng") then
 	o = s:option(Value, "chinadns_forward", translate("Domestic DNS Server"))
diff --git a/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
index 8184bee7d7..453848ab1f 100644
--- a/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
+++ b/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
@@ -459,6 +459,12 @@ msgstr "切换检查超时时间（秒）"
 msgid "Check Try Count"
 msgstr "切换检查重试次数"
 
+msgid "Apple domains optimization"
+msgstr "Apple 域名解析优化"
+
+msgid "For Apple domains equipped with Chinese mainland CDN, always responsive to Chinese CDN IP addresses"
+msgstr "配备中国大陆 CDN 的 Apple 域名，始终应答中国大陆 CDN 地址"
+
 msgid "Enable adblock"
 msgstr "启用广告屏蔽"
 
diff --git a/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index b1570aaafd..d62f5ab37c 100755
--- a/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -246,6 +246,12 @@ start_dns() {
 			fi
 		fi
 	fi
+	
+	if [ "$(uci_get_by_type global apple_optimization 1)" == "1" ]; then
+		echolog "Apple 域名中国大陆 CDN 的 优化规则正在加载。"
+		cp -f /etc/ssrplus/applechina.conf $TMP_DNSMASQ_PATH/
+		echolog "Apple 域名中国大陆 CDN 的 优化规则加载完毕。"
+	fi
 }
 
 gen_service_file() { #1-server.type 2-cfgname 3-file_path
diff --git a/small/luci-app-ssr-plus/root/etc/ssrplus/applechina.conf b/small/luci-app-ssr-plus/root/etc/ssrplus/applechina.conf
new file mode 100644
index 0000000000..bc8a7658fb
--- /dev/null
+++ b/small/luci-app-ssr-plus/root/etc/ssrplus/applechina.conf
@@ -0,0 +1,173 @@
+server=/a1.mzstatic.com/114.114.114.114
+server=/a2.mzstatic.com/114.114.114.114
+server=/a3.mzstatic.com/114.114.114.114
+server=/a4.mzstatic.com/114.114.114.114
+server=/a5.mzstatic.com/114.114.114.114
+server=/adcdownload.apple.com.akadns.net/114.114.114.114
+server=/adcdownload.apple.com/114.114.114.114
+server=/amp-api-updates.apps.apple.com/114.114.114.114
+server=/amp-api.media.apple.com/114.114.114.114
+server=/api-p-ap-c.smoot.apple.com/114.114.114.114
+server=/api-p-ap-d.smoot.apple.com/114.114.114.114
+server=/api-p-ap-e.smoot.apple.com/114.114.114.114
+server=/app-site-association.cdn-apple.com/114.114.114.114
+server=/appldnld.apple.com/114.114.114.114
+server=/appldnld.g.aaplimg.com/114.114.114.114
+server=/appleid.cdn-apple.com/114.114.114.114
+server=/apps.apple.com/114.114.114.114
+server=/apps.mzstatic.com/114.114.114.114
+server=/bag-cdn.itunes-apple.com.akadns.net/114.114.114.114
+server=/cdn-cn1.apple-mapkit.com/114.114.114.114
+server=/cdn-cn2.apple-mapkit.com/114.114.114.114
+server=/cdn-cn3.apple-mapkit.com/114.114.114.114
+server=/cdn-cn4.apple-mapkit.com/114.114.114.114
+server=/cdn.apple-mapkit.com/114.114.114.114
+server=/cdn1.apple-mapkit.com/114.114.114.114
+server=/cdn2.apple-mapkit.com/114.114.114.114
+server=/cdn3.apple-mapkit.com/114.114.114.114
+server=/cdn4.apple-mapkit.com/114.114.114.114
+server=/cds-cdn.v.aaplimg.com/114.114.114.114
+server=/cds.apple.com.akadns.net/114.114.114.114
+server=/cds.apple.com/114.114.114.114
+server=/cdsassets.apple.com/114.114.114.114
+server=/cl1-cdn.origin-apple.com.akadns.net/114.114.114.114
+server=/cl1.apple.com/114.114.114.114
+server=/cl2-cn.apple.com/114.114.114.114
+server=/cl2.apple.com/114.114.114.114
+server=/cl3-cdn.origin-apple.com.akadns.net/114.114.114.114
+server=/cl3.apple.com/114.114.114.114
+server=/cl4-cdn.origin-apple.com.akadns.net/114.114.114.114
+server=/cl4-cn.apple.com/114.114.114.114
+server=/cl4.apple.com/114.114.114.114
+server=/cl5-cdn.origin-apple.com.akadns.net/114.114.114.114
+server=/cl5.apple.com/114.114.114.114
+server=/clientflow.apple.com.akadns.net/114.114.114.114
+server=/clientflow.apple.com/114.114.114.114
+server=/cn-smp-paymentservices.apple.com/114.114.114.114
+server=/configuration.apple.com.akadns.net/114.114.114.114
+server=/configuration.apple.com/114.114.114.114
+server=/crl.apple.com/114.114.114.114
+server=/cstat.apple.com/114.114.114.114
+server=/cstat.cdn-apple.com/114.114.114.114
+server=/dd-cdn.origin-apple.com.akadns.net/114.114.114.114
+server=/dejavu.apple.com/114.114.114.114
+server=/devstreaming-cdn.apple.com/114.114.114.114
+server=/download.developer.apple.com/114.114.114.114
+server=/experiments.apple.com/114.114.114.114
+server=/gs-loc-cn.apple.com/114.114.114.114
+server=/gs-loc.apple.com/114.114.114.114
+server=/gsp10-ssl-cn.ls.apple.com/114.114.114.114
+server=/gsp12-cn.ls.apple.com/114.114.114.114
+server=/gsp13-cn.ls.apple.com/114.114.114.114
+server=/gsp4-cn.ls.apple.com.edgekey.net.globalredir.akadns.net/114.114.114.114
+server=/gsp4-cn.ls.apple.com.edgekey.net/114.114.114.114
+server=/gsp4-cn.ls.apple.com/114.114.114.114
+server=/gsp5-cn.ls.apple.com/114.114.114.114
+server=/gsp85-cn-ssl.ls.apple.com/114.114.114.114
+server=/gspe19-2-cn-ssl.ls-apple.com.akadns.net/114.114.114.114
+server=/gspe19-2-cn-ssl.ls.apple.com/114.114.114.114
+server=/gspe19-cn-ssl.ls.apple.com/114.114.114.114
+server=/gspe19-cn.ls-apple.com.akadns.net/114.114.114.114
+server=/gspe19-cn.ls.apple.com/114.114.114.114
+server=/gspe21-ssl.ls.apple.com/114.114.114.114
+server=/gspe21.ls.apple.com/114.114.114.114
+server=/gspe35-ssl.ls.apple.com/114.114.114.114
+server=/gspe79-cn-ssl.ls.apple.com/114.114.114.114
+server=/guzzoni-apple-com.v.aaplimg.com/114.114.114.114
+server=/guzzoni.apple.com/114.114.114.114
+server=/guzzoni.smoot.apple.com/114.114.114.114
+server=/iadsdk.apple.com/114.114.114.114
+server=/icloud-cdn.icloud.com.akadns.net/114.114.114.114
+server=/icloud.cdn-apple.com/114.114.114.114
+server=/images.apple.com.akadns.net/114.114.114.114
+server=/images.apple.com.edgekey.net.globalredir.akadns.net/114.114.114.114
+server=/images.apple.com/114.114.114.114
+server=/init-kt.apple.com/114.114.114.114
+server=/init-p01md-lb.push-apple.com.akadns.net/114.114.114.114
+server=/init-p01md.apple.com/114.114.114.114
+server=/init-p01st-lb.push-apple.com.akadns.net/114.114.114.114
+server=/init-p01st.push.apple.com/114.114.114.114
+server=/init-s01st-lb.push-apple.com.akadns.net/114.114.114.114
+server=/init-s01st.push.apple.com/114.114.114.114
+server=/init.ess.apple.com/114.114.114.114
+server=/iosapps.itunes.g.aaplimg.com/114.114.114.114
+server=/ipcdn.apple.com/114.114.114.114
+server=/iphone-ld.apple.com/114.114.114.114
+server=/iphone-ld.origin-apple.com.akadns.net/114.114.114.114
+server=/is-ssl.mzstatic.com-cn-lb.itunes-apple.com.akadns.net/114.114.114.114
+server=/is1-ssl.mzstatic.com/114.114.114.114
+server=/is1.mzstatic.com/114.114.114.114
+server=/is2-ssl.mzstatic.com/114.114.114.114
+server=/is2.mzstatic.com/114.114.114.114
+server=/is3-ssl.mzstatic.com/114.114.114.114
+server=/is3.mzstatic.com/114.114.114.114
+server=/is4-ssl.mzstatic.com/114.114.114.114
+server=/is4.mzstatic.com/114.114.114.114
+server=/is5-ssl.mzstatic.com/114.114.114.114
+server=/is5.mzstatic.com/114.114.114.114
+server=/itunes-apple.com.akadns.net/114.114.114.114
+server=/itunes.apple.com/114.114.114.114
+server=/itunesconnect.apple.com/114.114.114.114
+server=/mesu-cdn.apple.com.akadns.net/114.114.114.114
+server=/mesu-china.apple.com.akadns.net/114.114.114.114
+server=/mesu.apple.com/114.114.114.114
+server=/ml.cdn-apple.com/114.114.114.114
+server=/music.apple.com/114.114.114.114
+server=/ocsp-lb.apple.com.akadns.net/114.114.114.114
+server=/ocsp.apple.com/114.114.114.114
+server=/ocsp2-lb.apple.com.akadns.net/114.114.114.114
+server=/ocsp2.apple.com/114.114.114.114
+server=/oscdn.apple.com/114.114.114.114
+server=/oscdn.origin-apple.com.akadns.net/114.114.114.114
+server=/osxapps.itunes.g.aaplimg.com/114.114.114.114
+server=/pancake.apple.com/114.114.114.114
+server=/pancake.cdn-apple.com.akadns.net/114.114.114.114
+server=/pba0.apple.com/114.114.114.114
+server=/probe.siri.apple.com/114.114.114.114
+server=/prod-support.apple-support.akadns.net/114.114.114.114
+server=/publicassets.cdn-apple.com/114.114.114.114
+server=/reserve-prime.apple.com/114.114.114.114
+server=/s.mzstatic.com/114.114.114.114
+server=/seed-sequoia.siri.apple.com/114.114.114.114
+server=/seed-swallow.siri.apple.com/114.114.114.114
+server=/seed.siri.apple.com/114.114.114.114
+server=/sequoia.apple.com/114.114.114.114
+server=/sh-pod2-smp-device.apple.com/114.114.114.114
+server=/shazam-insights.cdn-apple.com/114.114.114.114
+server=/smp-device-content.apple.com/114.114.114.114
+server=/static.gc.apple.com/114.114.114.114
+server=/stocks-sparkline-lb.apple.com.akadns.net/114.114.114.114
+server=/stocks-sparkline.apple.com/114.114.114.114
+server=/store.apple.com.edgekey.net.globalredir.akadns.net/114.114.114.114
+server=/store.apple.com.edgekey.net/114.114.114.114
+server=/store.apple.com/114.114.114.114
+server=/store.storeimages.apple.com.akadns.net/114.114.114.114
+server=/store.storeimages.cdn-apple.com/114.114.114.114
+server=/support-china.apple-support.akadns.net/114.114.114.114
+server=/support.apple.com/114.114.114.114
+server=/swallow-apple-com.v.aaplimg.com/114.114.114.114
+server=/swallow.apple.com/114.114.114.114
+server=/swcatalog-cdn.apple.com.akadns.net/114.114.114.114
+server=/swcatalog.apple.com/114.114.114.114
+server=/swcdn.apple.com/114.114.114.114
+server=/swcdn.g.aaplimg.com/114.114.114.114
+server=/swdist.apple.com.akadns.net/114.114.114.114
+server=/swdist.apple.com/114.114.114.114
+server=/swscan-cdn.apple.com.akadns.net/114.114.114.114
+server=/swscan.apple.com/114.114.114.114
+server=/sylvan.apple.com/114.114.114.114
+server=/tj-pod1-smp-device.apple.com/114.114.114.114
+server=/updates-http.cdn-apple.com.akadns.net/114.114.114.114
+server=/updates-http.cdn-apple.com/114.114.114.114
+server=/updates.cdn-apple.com/114.114.114.114
+server=/valid.apple.com/114.114.114.114
+server=/valid.origin-apple.com.akadns.net/114.114.114.114
+server=/weather-data.apple.com.akadns.net/114.114.114.114
+server=/weather-data.apple.com/114.114.114.114
+server=/weather-map.apple.com/114.114.114.114
+server=/weather-map2.apple.com/114.114.114.114
+server=/weatherkit.apple.com/114.114.114.114
+server=/www.apple.com.edgekey.net.globalredir.akadns.net/114.114.114.114
+server=/www.apple.com.edgekey.net/114.114.114.114
+server=/www.apple.com/114.114.114.114
+server=/xp.apple.com/114.114.114.114
diff --git a/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
index a6c2f7c601..34b0950432 100755
--- a/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
+++ b/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
@@ -362,10 +362,9 @@ local function processData(szType, content)
 		result.vmess_id = url.user
 		result.vless_encryption = params.encryption or "none"
 		result.transport = params.type or "tcp"
-		result.tls = (params.security == "tls") and "1" or "0"
+		result.tls = (params.security == "tls" or params.security == "xtls") and "1" or "0"
 		result.tls_host = params.sni
-		result.xtls = (params.security == "xtls") and "1" or nil
-		result.tls_flow = (result.tls == "1" or result.xtls == "1" or result.reality == "1") and params.flow or nil
+		result.tls_flow = (params.security == "tls" or params.security == "reality") and params.flow or nil
 		result.fingerprint = params.fp
 		result.reality = (params.security == "reality") and "1" or "0"
 		result.reality_publickey = params.pbk and UrlDecode(params.pbk) or nil
diff --git a/small/v2ray-core/Makefile b/small/v2ray-core/Makefile
index 3496148823..9f623d18ff 100644
--- a/small/v2ray-core/Makefile
+++ b/small/v2ray-core/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-core
-PKG_VERSION:=5.20.0
+PKG_VERSION:=5.21.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=2de8ac3429705f594ca1a75a2a0fca09820938c94e912370902f87bd72680693
+PKG_HASH:=880a929caff7b72ef9d3b9a3262cec0dff6566c2481989822a6b27fdaaeed975
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
diff --git a/small/v2ray-geodata/Makefile b/small/v2ray-geodata/Makefile
index 5a1542bffa..6cd475b336 100644
--- a/small/v2ray-geodata/Makefile
+++ b/small/v2ray-geodata/Makefile
@@ -30,13 +30,13 @@ define Download/geosite
   HASH:=f820556ed3aa02eb7eadba7a3743d7e6df8e9234785d0d82d2d1edce20fe4b3c
 endef
 
-GEOSITE_IRAN_VER:=202410070035
+GEOSITE_IRAN_VER:=202410140035
 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER)
 define Download/geosite-ir
   URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/
   URL_FILE:=iran.dat
   FILE:=$(GEOSITE_IRAN_FILE)
-  HASH:=be31e14b61dc3e98c9ac518686bc932b45aa04dd2f9491d18456417ba28f3b70
+  HASH:=97d1efd7ce4e5318f9f44039f5945a6253d5a42f7f3b432d3da124703d4cda28
 endef
 
 define Package/v2ray-geodata/template
diff --git a/v2rayn/v2rayN/ServiceLib/Common/DownloaderHelper.cs b/v2rayn/v2rayN/ServiceLib/Common/DownloaderHelper.cs
index fe468566f0..2aaa2371d6 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/DownloaderHelper.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/DownloaderHelper.cs
@@ -36,7 +36,7 @@ namespace ServiceLib.Common
                 }
             };
 
-            using var downloader = new Downloader.DownloadService(downloadOpt);
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
             downloader.DownloadFileCompleted += (sender, value) =>
             {
                 if (value.Error != null)
@@ -46,12 +46,12 @@ namespace ServiceLib.Common
             };
 
             using var cts = new CancellationTokenSource();
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
+            await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
             using StreamReader reader = new(stream);
 
             downloadOpt = null;
 
-            return reader.ReadToEnd();
+            return await reader.ReadToEndAsync(cts.Token);
         }
 
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
@@ -72,11 +72,11 @@ namespace ServiceLib.Common
                 }
             };
 
-            DateTime totalDatetime = DateTime.Now;
-            int totalSecond = 0;
+            var totalDatetime = DateTime.Now;
+            var totalSecond = 0;
             var hasValue = false;
             double maxSpeed = 0;
-            using var downloader = new Downloader.DownloadService(downloadOpt);
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
             //downloader.DownloadStarted += (sender, value) =>
             //{
             //    if (progress != null)
@@ -86,7 +86,7 @@ namespace ServiceLib.Common
             //};
             downloader.DownloadProgressChanged += (sender, value) =>
             {
-                TimeSpan ts = (DateTime.Now - totalDatetime);
+                var ts = (DateTime.Now - totalDatetime);
                 if (progress != null && ts.Seconds > totalSecond)
                 {
                     hasValue = true;
@@ -112,7 +112,7 @@ namespace ServiceLib.Common
             //progress.Report("......");
             using var cts = new CancellationTokenSource();
             cts.CancelAfter(timeout * 1000);
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
+            await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
 
             downloadOpt = null;
         }
@@ -145,7 +145,7 @@ namespace ServiceLib.Common
 
             var progressPercentage = 0;
             var hasValue = false;
-            using var downloader = new Downloader.DownloadService(downloadOpt);
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
             downloader.DownloadStarted += (sender, value) =>
             {
                 progress?.Report(0);
diff --git a/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs b/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs
index 4eb97a517e..70b093146a 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs
@@ -23,7 +23,7 @@ namespace ServiceLib.Common
         {
             try
             {
-                using FileStream fs = File.Create(fileName);
+                using var fs = File.Create(fileName);
                 using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
                 input.CopyTo(fs);
             }
@@ -38,8 +38,8 @@ namespace ServiceLib.Common
             try
             {
                 FileInfo fileInfo = new(fileName);
-                using FileStream originalFileStream = fileInfo.OpenRead();
-                using FileStream decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
+                using var originalFileStream = fileInfo.OpenRead();
+                using var decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
                 using GZipStream decompressionStream = new(originalFileStream, CompressionMode.Decompress);
                 decompressionStream.CopyTo(decompressedFileStream);
             }
@@ -54,7 +54,7 @@ namespace ServiceLib.Common
             return NonExclusiveReadAllText(path, Encoding.Default);
         }
 
-        public static string NonExclusiveReadAllText(string path, Encoding encoding)
+        private static string NonExclusiveReadAllText(string path, Encoding encoding)
         {
             try
             {
@@ -73,8 +73,8 @@ namespace ServiceLib.Common
         {
             try
             {
-                using ZipArchive archive = ZipFile.OpenRead(fileName);
-                foreach (ZipArchiveEntry entry in archive.Entries)
+                using var archive = ZipFile.OpenRead(fileName);
+                foreach (var entry in archive.Entries)
                 {
                     if (entry.Length == 0)
                     {
@@ -110,7 +110,7 @@ namespace ServiceLib.Common
             }
             try
             {
-                using ZipArchive archive = ZipFile.OpenRead(fileName);
+                using var archive = ZipFile.OpenRead(fileName);
                 return archive.Entries.Select(entry => entry.FullName).ToList();
             }
             catch (Exception ex)
@@ -149,13 +149,13 @@ namespace ServiceLib.Common
                 throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
 
             // Cache directories before we start copying
-            DirectoryInfo[] dirs = dir.GetDirectories();
+            var dirs = dir.GetDirectories();
 
             // Create the destination directory
             Directory.CreateDirectory(destinationDir);
 
             // Get the files in the source directory and copy to the destination directory
-            foreach (FileInfo file in dir.GetFiles())
+            foreach (var file in dir.GetFiles())
             {
                 if (Utils.IsNotEmpty(ignoredName) && file.Name.Contains(ignoredName))
                 {
@@ -165,16 +165,16 @@ namespace ServiceLib.Common
                 {
                     continue;
                 }
-                string targetFilePath = Path.Combine(destinationDir, file.Name);
+                var targetFilePath = Path.Combine(destinationDir, file.Name);
                 file.CopyTo(targetFilePath);
             }
 
             // If recursive and copying subdirectories, recursively call this method
             if (recursive)
             {
-                foreach (DirectoryInfo subDir in dirs)
+                foreach (var subDir in dirs)
                 {
-                    string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+                    var newDestinationDir = Path.Combine(destinationDir, subDir.Name);
                     CopyDirectory(subDir.FullName, newDestinationDir, true, ignoredName);
                 }
             }
diff --git a/v2rayn/v2rayN/ServiceLib/Common/HttpClientHelper.cs b/v2rayn/v2rayN/ServiceLib/Common/HttpClientHelper.cs
index bd671feec1..cabc3f8529 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/HttpClientHelper.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/HttpClientHelper.cs
@@ -27,7 +27,7 @@ namespace ServiceLib.Common
 
             try
             {
-                HttpResponseMessage response = await httpClient.GetAsync(url);
+                var response = await httpClient.GetAsync(url);
                 return await response.Content.ReadAsStringAsync();
             }
             catch
@@ -84,8 +84,8 @@ namespace ServiceLib.Common
             var total = response.Content.Headers.ContentLength ?? -1L;
             var canReportProgress = total != -1 && progress != null;
 
-            using var stream = await response.Content.ReadAsStreamAsync(token);
-            using var file = File.Create(fileName);
+            await using var stream = await response.Content.ReadAsStreamAsync(token);
+            await using var file = File.Create(fileName);
             var totalRead = 0L;
             var buffer = new byte[1024 * 1024];
             var progressPercentage = 0;
@@ -98,7 +98,7 @@ namespace ServiceLib.Common
                 totalRead += read;
 
                 if (read == 0) break;
-                file.Write(buffer, 0, read);
+                await file.WriteAsync(buffer, 0, read, token);
 
                 if (canReportProgress)
                 {
@@ -133,13 +133,13 @@ namespace ServiceLib.Common
             //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
             //var canReportProgress = total != -1 && progress != null;
 
-            using var stream = await response.Content.ReadAsStreamAsync(token);
+            await using var stream = await response.Content.ReadAsStreamAsync(token);
             var totalRead = 0L;
             var buffer = new byte[1024 * 64];
             var isMoreToRead = true;
-            string progressSpeed = string.Empty;
-            DateTime totalDatetime = DateTime.Now;
-            int totalSecond = 0;
+            var progressSpeed = string.Empty;
+            var totalDatetime = DateTime.Now;
+            var totalSecond = 0;
 
             do
             {
@@ -168,7 +168,7 @@ namespace ServiceLib.Common
 
                     totalRead += read;
 
-                    TimeSpan ts = (DateTime.Now - totalDatetime);
+                    var ts = (DateTime.Now - totalDatetime);
                     if (progress != null && ts.Seconds > totalSecond)
                     {
                         totalSecond = ts.Seconds;
diff --git a/v2rayn/v2rayN/ServiceLib/Common/Job.cs b/v2rayn/v2rayN/ServiceLib/Common/Job.cs
index 0cd623fbb2..4acf752050 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/Job.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/Job.cs
@@ -8,7 +8,7 @@ namespace ServiceLib.Common
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
      */
 
-    public class Job : IDisposable
+    public sealed class Job : IDisposable
     {
         private IntPtr handle = IntPtr.Zero;
 
@@ -73,7 +73,7 @@ namespace ServiceLib.Common
             GC.SuppressFinalize(this);
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposed) return;
             disposed = true;
diff --git a/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs b/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs
index d7650d2c5a..40d0cdfc79 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs
@@ -69,7 +69,7 @@ namespace ServiceLib.Common
         /// <returns></returns>
         public static string Serialize(object? obj, bool indented = true)
         {
-            string result = string.Empty;
+            var result = string.Empty;
             try
             {
                 if (obj == null)
@@ -112,7 +112,7 @@ namespace ServiceLib.Common
             }
             try
             {
-                using FileStream file = File.Create(filePath);
+                using var file = File.Create(filePath);
 
                 var options = new JsonSerializerOptions
                 {
diff --git a/v2rayn/v2rayN/ServiceLib/Common/QRCodeHelper.cs b/v2rayn/v2rayN/ServiceLib/Common/QRCodeHelper.cs
index 7e6e0d085d..82d6125ef1 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/QRCodeHelper.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/QRCodeHelper.cs
@@ -7,7 +7,7 @@ namespace ServiceLib.Common
         public static byte[]? GenQRCode(string? url)
         {
             using QRCodeGenerator qrGenerator = new();
-            using QRCodeData qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
+            using var qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
             using PngByteQRCode qrCode = new(qrCodeData);
             return qrCode.GetGraphic(20);
         }
diff --git a/v2rayn/v2rayN/ServiceLib/Common/QueryableExtension.cs b/v2rayn/v2rayN/ServiceLib/Common/QueryableExtension.cs
index 767676566d..b8e9143323 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/QueryableExtension.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/QueryableExtension.cs
@@ -17,7 +17,7 @@ namespace ServiceLib.Common
 
         private static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
         {
-            string methodname = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
+            var methodname = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
 
             var memberProp = typeof(T).GetProperty(propertyName);
 
diff --git a/v2rayn/v2rayN/ServiceLib/Common/SemanticVersion.cs b/v2rayn/v2rayN/ServiceLib/Common/SemanticVersion.cs
index beea6acc28..fd236c89e5 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/SemanticVersion.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/SemanticVersion.cs
@@ -28,14 +28,14 @@
                 }
                 this.version = version.RemovePrefix('v');
 
-                string[] parts = this.version.Split('.');
+                var parts = this.version.Split('.');
                 if (parts.Length == 2)
                 {
                     this.major = int.Parse(parts[0]);
                     this.minor = int.Parse(parts[1]);
                     this.patch = 0;
                 }
-                else if (parts.Length == 3 || parts.Length == 4)
+                else if (parts.Length is 3 or 4)
                 {
                     this.major = int.Parse(parts[0]);
                     this.minor = int.Parse(parts[1]);
diff --git a/v2rayn/v2rayN/ServiceLib/Common/SqliteHelper.cs b/v2rayn/v2rayN/ServiceLib/Common/SqliteHelper.cs
index 9faa72baeb..ca34319ef1 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/SqliteHelper.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/SqliteHelper.cs
@@ -11,7 +11,7 @@ namespace ServiceLib.Common
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
-        public readonly string _configDB = "guiNDB.db";
+        private readonly string _configDB = "guiNDB.db";
 
         public SQLiteHelper()
         {
diff --git a/v2rayn/v2rayN/ServiceLib/Common/StringEx.cs b/v2rayn/v2rayN/ServiceLib/Common/StringEx.cs
index eb9bdafe38..81965adaad 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/StringEx.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/StringEx.cs
@@ -25,21 +25,14 @@ namespace ServiceLib.Common
             return chars.Contains(s[0]);
         }
 
-        public static bool IsWhiteSpace(this string value)
+        private static bool IsWhiteSpace(this string value)
         {
-            foreach (char c in value)
-            {
-                if (char.IsWhiteSpace(c)) continue;
-
-                return false;
-            }
-            return true;
+            return value.All(char.IsWhiteSpace);
         }
 
         public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
         {
-            string? line;
-            while ((line = reader.ReadLine()) != null)
+            while (reader.ReadLine() is { } line)
             {
                 if (line.IsWhiteSpace()) continue;
                 yield return line;
@@ -53,26 +46,12 @@ namespace ServiceLib.Common
 
         public static string RemovePrefix(this string value, char prefix)
         {
-            if (value.StartsWith(prefix))
-            {
-                return value.Substring(1);
-            }
-            else
-            {
-                return value;
-            }
+            return value.StartsWith(prefix) ? value[1..] : value;
         }
 
         public static string RemovePrefix(this string value, string prefix)
         {
-            if (value.StartsWith(prefix))
-            {
-                return value.Substring(prefix.Length);
-            }
-            else
-            {
-                return value;
-            }
+            return value.StartsWith(prefix) ? value[prefix.Length..] : value;
         }
 
         public static string UpperFirstChar(this string value)
@@ -82,17 +61,12 @@ namespace ServiceLib.Common
                 return string.Empty;
             }
 
-            return char.ToUpper(value[0]) + value.Substring(1);
+            return char.ToUpper(value[0]) + value[1..];
         }
 
         public static string AppendQuotes(this string value)
         {
-            if (string.IsNullOrEmpty(value))
-            {
-                return string.Empty;
-            }
-
-            return $"\"{value}\"";
+            return string.IsNullOrEmpty(value) ? string.Empty : $"\"{value}\"";
         }
     }
 }
\ No newline at end of file
diff --git a/v2rayn/v2rayN/ServiceLib/Common/Utils.cs b/v2rayn/v2rayN/ServiceLib/Common/Utils.cs
index d3dc3f6998..fc273dbe6b 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/Utils.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/Utils.cs
@@ -2,7 +2,6 @@
 using CliWrap.Buffered;
 using System.Collections.Specialized;
 using System.Diagnostics;
-using System.IO.Compression;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
@@ -11,13 +10,12 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Principal;
 using System.Text;
-using System.Text.RegularExpressions;
 
 namespace ServiceLib.Common
 {
     public class Utils
     {
-        #region 资源Json操作
+        #region 资源操作
 
         /// <summary>
         /// 获取嵌入文本资源
@@ -26,12 +24,12 @@ namespace ServiceLib.Common
         /// <returns></returns>
         public static string GetEmbedText(string res)
         {
-            string result = string.Empty;
+            var result = string.Empty;
 
             try
             {
-                Assembly assembly = Assembly.GetExecutingAssembly();
-                using Stream? stream = assembly.GetManifestResourceStream(res);
+                var assembly = Assembly.GetExecutingAssembly();
+                using var stream = assembly.GetManifestResourceStream(res);
                 ArgumentNullException.ThrowIfNull(stream);
                 using StreamReader reader = new(stream);
                 result = reader.ReadToEnd();
@@ -51,11 +49,10 @@ namespace ServiceLib.Common
         {
             try
             {
-                if (!File.Exists(res))
+                if (File.Exists(res))
                 {
-                    return null;
+                    return File.ReadAllText(res);
                 }
-                return File.ReadAllText(res);
             }
             catch (Exception ex)
             {
@@ -64,14 +61,15 @@ namespace ServiceLib.Common
             return null;
         }
 
-        #endregion 资源Json操作
+        #endregion 资源操作
 
         #region 转换函数
 
         /// <summary>
-        /// List<string>转逗号分隔的字符串
+        /// 转逗号分隔的字符串
         /// </summary>
         /// <param name="lst"></param>
+        /// <param name="wrap"></param>
         /// <returns></returns>
         public static string List2String(List<string>? lst, bool wrap = false)
         {
@@ -93,35 +91,40 @@ namespace ServiceLib.Common
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                return string.Empty;
             }
+            return string.Empty;
         }
 
         /// <summary>
-        /// 逗号分隔的字符串,转List<string>
+        /// 逗号分隔的字符串
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
-        public static List<string> String2List(string str)
+        public static List<string>? String2List(string? str)
         {
             try
             {
+                if (str == null)
+                {
+                    return null;
+                }
+
                 str = str.Replace(Environment.NewLine, "");
                 return new List<string>(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                return [];
             }
+            return null;
         }
 
         /// <summary>
-        /// 逗号分隔的字符串,先排序后转List<string>
+        /// 逗号分隔的字符串,先排序后转List
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
-        public static List<string> String2ListSorted(string str)
+        public static List<string>? String2ListSorted(string str)
         {
             try
             {
@@ -133,8 +136,8 @@ namespace ServiceLib.Common
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                return [];
             }
+            return null;
         }
 
         /// <summary>
@@ -146,14 +149,14 @@ namespace ServiceLib.Common
         {
             try
             {
-                byte[] plainTextBytes = Encoding.UTF8.GetBytes(plainText);
+                var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
                 return Convert.ToBase64String(plainTextBytes);
             }
             catch (Exception ex)
             {
                 Logging.SaveLog("Base64Encode", ex);
-                return string.Empty;
             }
+            return string.Empty;
         }
 
         /// <summary>
@@ -179,30 +182,24 @@ namespace ServiceLib.Common
                     plainText = plainText.PadRight(plainText.Length + 4 - plainText.Length % 4, '=');
                 }
 
-                byte[] data = Convert.FromBase64String(plainText);
+                var data = Convert.FromBase64String(plainText);
                 return Encoding.UTF8.GetString(data);
             }
             catch (Exception ex)
             {
                 Logging.SaveLog("Base64Decode", ex);
-                return string.Empty;
             }
+            return string.Empty;
         }
 
-        /// <summary>
-        /// 转Int
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
         public static int ToInt(object? obj)
         {
             try
             {
                 return Convert.ToInt32(obj ?? string.Empty);
             }
-            catch //(Exception ex)
+            catch
             {
-                //SaveLog(ex.Message, ex);
                 return 0;
             }
         }
@@ -213,50 +210,47 @@ namespace ServiceLib.Common
             {
                 return Convert.ToBoolean(obj);
             }
-            catch //(Exception ex)
+            catch
             {
-                //SaveLog(ex.Message, ex);
                 return false;
             }
         }
 
-        public static string ToString(object obj)
+        public static string ToString(object? obj)
         {
             try
             {
                 return obj?.ToString() ?? string.Empty;
             }
-            catch// (Exception ex)
+            catch
             {
-                //SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
 
         /// <summary>
-        /// byte 转成 有两位小数点的 方便阅读的数据
-        ///     比如 2.50 MB
+        /// byte 转成 有两位小数点的 方便阅读的数据   比如 2.50 MB
         /// </summary>
         /// <param name="amount">bytes</param>
         /// <param name="result">转换之后的数据</param>
         /// <param name="unit">单位</param>
-        public static void ToHumanReadable(long amount, out double result, out string unit)
+        private static void ToHumanReadable(long amount, out double result, out string unit)
         {
-            uint factor = 1024u;
+            var factor = 1024u;
             //long KBs = amount / factor;
-            long KBs = amount;
+            var KBs = amount;
             if (KBs > 0)
             {
                 // multi KB
-                long MBs = KBs / factor;
+                var MBs = KBs / factor;
                 if (MBs > 0)
                 {
                     // multi MB
-                    long GBs = MBs / factor;
+                    var GBs = MBs / factor;
                     if (GBs > 0)
                     {
                         // multi GB
-                        long TBs = GBs / factor;
+                        var TBs = GBs / factor;
                         if (TBs > 0)
                         {
                             result = TBs + ((GBs % factor) / (factor + 0.0));
@@ -284,20 +278,18 @@ namespace ServiceLib.Common
 
         public static string HumanFy(long amount)
         {
-            ToHumanReadable(amount, out double result, out string unit);
-            return $"{string.Format("{0:f1}", result)} {unit}";
+            ToHumanReadable(amount, out var result, out var unit);
+            return $"{result:f1} {unit}";
         }
 
         public static string UrlEncode(string url)
         {
             return Uri.EscapeDataString(url);
-            //return  HttpUtility.UrlEncode(url);
         }
 
         public static string UrlDecode(string url)
         {
             return Uri.UnescapeDataString(url);
-            //return HttpUtility.UrlDecode(url);
         }
 
         public static NameValueCollection ParseQueryString(string query)
@@ -308,10 +300,10 @@ namespace ServiceLib.Common
                 return result;
             }
 
-            var parts = query[1..].Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries);
+            var parts = query[1..].Split('&', StringSplitOptions.RemoveEmptyEntries);
             foreach (var part in parts)
             {
-                var keyValue = part.Split(['=']);
+                var keyValue = part.Split('=');
                 if (keyValue.Length != 2)
                 {
                     continue;
@@ -328,12 +320,12 @@ namespace ServiceLib.Common
             return result;
         }
 
-        public static string GetMD5(string str)
+        public static string GetMd5(string str)
         {
-            byte[] byteOld = Encoding.UTF8.GetBytes(str);
-            byte[] byteNew = MD5.HashData(byteOld);
+            var byteOld = Encoding.UTF8.GetBytes(str);
+            var byteNew = MD5.HashData(byteOld);
             StringBuilder sb = new(32);
-            foreach (byte b in byteNew)
+            foreach (var b in byteNew)
             {
                 sb.Append(b.ToString("x2"));
             }
@@ -373,12 +365,12 @@ namespace ServiceLib.Common
         {
             if (plainText.IsNullOrEmpty()) return false;
             var buffer = new Span<byte>(new byte[plainText.Length]);
-            return Convert.TryFromBase64String(plainText, buffer, out int _);
+            return Convert.TryFromBase64String(plainText, buffer, out var _);
         }
 
         public static string Convert2Comma(string text)
         {
-            if (Utils.IsNullOrEmpty(text))
+            if (IsNullOrEmpty(text))
             {
                 return text;
             }
@@ -396,16 +388,7 @@ namespace ServiceLib.Common
         /// <returns></returns>
         public static bool IsNumeric(string oText)
         {
-            try
-            {
-                int var1 = ToInt(oText);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                return false;
-            }
+            return oText.All(char.IsNumber);
         }
 
         public static bool IsNullOrEmpty(string? text)
@@ -414,11 +397,7 @@ namespace ServiceLib.Common
             {
                 return true;
             }
-            if (text == "null")
-            {
-                return true;
-            }
-            return false;
+            return text == "null";
         }
 
         public static bool IsNotEmpty(string? text)
@@ -426,41 +405,6 @@ namespace ServiceLib.Common
             return !string.IsNullOrEmpty(text);
         }
 
-        /// <summary>
-        /// 验证IP地址是否合法
-        /// </summary>
-        /// <param name="ip"></param>
-        public static bool IsIP(string ip)
-        {
-            //如果为空
-            if (IsNullOrEmpty(ip))
-            {
-                return false;
-            }
-
-            //清除要验证字符串中的空格
-            //ip = ip.TrimEx();
-            //可能是CIDR
-            if (ip.IndexOf(@"/") > 0)
-            {
-                string[] cidr = ip.Split('/');
-                if (cidr.Length == 2)
-                {
-                    if (!IsNumeric(cidr[0]))
-                    {
-                        return false;
-                    }
-                    ip = cidr[0];
-                }
-            }
-
-            //模式字符串
-            string pattern = @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$";
-
-            //验证
-            return IsMatch(ip, pattern);
-        }
-
         /// <summary>
         /// 验证Domain地址是否合法
         /// </summary>
@@ -476,19 +420,9 @@ namespace ServiceLib.Common
             return Uri.CheckHostName(domain) == UriHostNameType.Dns;
         }
 
-        /// <summary>
-        /// 验证输入字符串是否与模式字符串匹配，匹配返回true
-        /// </summary>
-        /// <param name="input">输入字符串</param>
-        /// <param name="pattern">模式字符串</param>
-        public static bool IsMatch(string input, string pattern)
-        {
-            return Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase);
-        }
-
         public static bool IsIpv6(string ip)
         {
-            if (IPAddress.TryParse(ip, out IPAddress? address))
+            if (IPAddress.TryParse(ip, out var address))
             {
                 return address.AddressFamily switch
                 {
@@ -504,43 +438,20 @@ namespace ServiceLib.Common
 
         #region 测速
 
-        public static void SetSecurityProtocol(bool enableSecurityProtocolTls13)
+        private static bool PortInUse(int port)
         {
-            if (enableSecurityProtocolTls13)
-            {
-                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13;
-            }
-            else
-            {
-                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
-            }
-            ServicePointManager.DefaultConnectionLimit = 256;
-        }
-
-        public static bool PortInUse(int port)
-        {
-            bool inUse = false;
             try
             {
-                IPGlobalProperties ipProperties = IPGlobalProperties.GetIPGlobalProperties();
-                IPEndPoint[] ipEndPoints = ipProperties.GetActiveTcpListeners();
-
-                var lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-
-                foreach (IPEndPoint endPoint in ipEndPoints)
-                {
-                    if (endPoint.Port == port)
-                    {
-                        inUse = true;
-                        break;
-                    }
-                }
+                var ipProperties = IPGlobalProperties.GetIPGlobalProperties();
+                var ipEndPoints = ipProperties.GetActiveTcpListeners();
+                //var lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                return ipEndPoints.Any(endPoint => endPoint.Port == port);
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
             }
-            return inUse;
+            return false;
         }
 
         public static int GetFreePort(int defaultPort = 9090)
@@ -554,7 +465,7 @@ namespace ServiceLib.Common
 
                 TcpListener l = new(IPAddress.Loopback, 0);
                 l.Start();
-                int port = ((IPEndPoint)l.LocalEndpoint).Port;
+                var port = ((IPEndPoint)l.LocalEndpoint).Port;
                 l.Stop();
                 return port;
             }
@@ -578,23 +489,18 @@ namespace ServiceLib.Common
             {
                 if (blFull)
                 {
-                    return string.Format("{0} - V{1} - {2}",
-                            Global.AppName,
-                            GetVersionInfo(),
-                            File.GetLastWriteTime(GetExePath()).ToString("yyyy/MM/dd"));
+                    return $"{Global.AppName} - V{GetVersionInfo()} - {File.GetLastWriteTime(GetExePath()):yyyy/MM/dd}";
                 }
                 else
                 {
-                    return string.Format("{0}/{1}",
-                        Global.AppName,
-                        GetVersionInfo());
+                    return $"{Global.AppName}/{GetVersionInfo()}";
                 }
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                return Global.AppName;
             }
+            return Global.AppName;
         }
 
         public static string GetVersionInfo()
@@ -614,7 +520,7 @@ namespace ServiceLib.Common
         /// 取得GUID
         /// </summary>
         /// <returns></returns>
-        public static string GetGUID(bool full = true)
+        public static string GetGuid(bool full = true)
         {
             try
             {
@@ -634,14 +540,6 @@ namespace ServiceLib.Common
             return string.Empty;
         }
 
-        public static string GetDownloadFileName(string url)
-        {
-            var fileName = Path.GetFileName(url);
-            fileName += "_temp";
-
-            return fileName;
-        }
-
         public static bool IsGuidByParse(string strSrc)
         {
             return Guid.TryParse(strSrc, out _);
@@ -667,12 +565,12 @@ namespace ServiceLib.Common
         public static Dictionary<string, string> GetSystemHosts()
         {
             var systemHosts = new Dictionary<string, string>();
-            var hostfile = @"C:\Windows\System32\drivers\etc\hosts";
+            var hostFile = @"C:\Windows\System32\drivers\etc\hosts";
             try
             {
-                if (File.Exists(hostfile))
+                if (File.Exists(hostFile))
                 {
-                    var hosts = File.ReadAllText(hostfile).Replace("\r", "");
+                    var hosts = File.ReadAllText(hostFile).Replace("\r", "");
                     var hostsList = hosts.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
 
                     foreach (var host in hostsList)
@@ -693,10 +591,10 @@ namespace ServiceLib.Common
 
         public static async Task<string?> GetCliWrapOutput(string filePath, string? arg)
         {
-            return await GetCliWrapOutput(filePath, arg != null ? [arg] : null);
+            return await GetCliWrapOutput(filePath, arg != null ? new List<string>() { arg } : null);
         }
 
-        public static async Task<string?> GetCliWrapOutput(string filePath, IEnumerable<string>? args)
+        private static async Task<string?> GetCliWrapOutput(string filePath, IEnumerable<string>? args)
         {
             try
             {
@@ -736,7 +634,7 @@ namespace ServiceLib.Common
         /// <returns></returns>
         public static string GetPath(string fileName)
         {
-            string startupPath = StartupPath();
+            var startupPath = StartupPath();
             if (IsNullOrEmpty(fileName))
             {
                 return startupPath;
@@ -760,113 +658,104 @@ namespace ServiceLib.Common
 
         public static string GetTempPath(string filename = "")
         {
-            string _tempPath = Path.Combine(StartupPath(), "guiTemps");
-            if (!Directory.Exists(_tempPath))
+            var tempPath = Path.Combine(StartupPath(), "guiTemps");
+            if (!Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(_tempPath);
+                Directory.CreateDirectory(tempPath);
             }
-            if (Utils.IsNullOrEmpty(filename))
+            if (IsNullOrEmpty(filename))
             {
-                return _tempPath;
+                return tempPath;
             }
             else
             {
-                return Path.Combine(_tempPath, filename);
+                return Path.Combine(tempPath, filename);
             }
         }
 
-        public static string UnGzip(byte[] buf)
-        {
-            using MemoryStream sb = new();
-            using GZipStream input = new(new MemoryStream(buf), CompressionMode.Decompress, false);
-            input.CopyTo(sb);
-            sb.Position = 0;
-            return new StreamReader(sb, Encoding.UTF8).ReadToEnd();
-        }
-
         public static string GetBackupPath(string filename)
         {
-            string _tempPath = Path.Combine(StartupPath(), "guiBackups");
-            if (!Directory.Exists(_tempPath))
+            var tempPath = Path.Combine(StartupPath(), "guiBackups");
+            if (!Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(_tempPath);
+                Directory.CreateDirectory(tempPath);
             }
-            return Path.Combine(_tempPath, filename);
+            return Path.Combine(tempPath, filename);
         }
 
         public static string GetConfigPath(string filename = "")
         {
-            string _tempPath = Path.Combine(StartupPath(), "guiConfigs");
-            if (!Directory.Exists(_tempPath))
+            var tempPath = Path.Combine(StartupPath(), "guiConfigs");
+            if (!Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(_tempPath);
+                Directory.CreateDirectory(tempPath);
             }
             if (Utils.IsNullOrEmpty(filename))
             {
-                return _tempPath;
+                return tempPath;
             }
             else
             {
-                return Path.Combine(_tempPath, filename);
+                return Path.Combine(tempPath, filename);
             }
         }
 
         public static string GetBinPath(string filename, string? coreType = null)
         {
-            string _tempPath = Path.Combine(StartupPath(), "bin");
-            if (!Directory.Exists(_tempPath))
+            var tempPath = Path.Combine(StartupPath(), "bin");
+            if (!Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(_tempPath);
+                Directory.CreateDirectory(tempPath);
             }
             if (coreType != null)
             {
-                _tempPath = Path.Combine(_tempPath, coreType.ToString());
-                if (!Directory.Exists(_tempPath))
+                tempPath = Path.Combine(tempPath, coreType.ToString());
+                if (!Directory.Exists(tempPath))
                 {
-                    Directory.CreateDirectory(_tempPath);
+                    Directory.CreateDirectory(tempPath);
                 }
             }
-            if (Utils.IsNullOrEmpty(filename))
+            if (IsNullOrEmpty(filename))
             {
-                return _tempPath;
+                return tempPath;
             }
             else
             {
-                return Path.Combine(_tempPath, filename);
+                return Path.Combine(tempPath, filename);
             }
         }
 
         public static string GetLogPath(string filename = "")
         {
-            string _tempPath = Path.Combine(StartupPath(), "guiLogs");
-            if (!Directory.Exists(_tempPath))
+            var tempPath = Path.Combine(StartupPath(), "guiLogs");
+            if (!Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(_tempPath);
+                Directory.CreateDirectory(tempPath);
             }
             if (Utils.IsNullOrEmpty(filename))
             {
-                return _tempPath;
+                return tempPath;
             }
             else
             {
-                return Path.Combine(_tempPath, filename);
+                return Path.Combine(tempPath, filename);
             }
         }
 
         public static string GetFontsPath(string filename = "")
         {
-            string _tempPath = Path.Combine(StartupPath(), "guiFonts");
-            if (!Directory.Exists(_tempPath))
+            var tempPath = Path.Combine(StartupPath(), "guiFonts");
+            if (!Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(_tempPath);
+                Directory.CreateDirectory(tempPath);
             }
             if (Utils.IsNullOrEmpty(filename))
             {
-                return _tempPath;
+                return tempPath;
             }
             else
             {
-                return Path.Combine(_tempPath, filename);
+                return Path.Combine(tempPath, filename);
             }
         }
 
@@ -882,14 +771,7 @@ namespace ServiceLib.Common
 
         public static string GetExeName(string name)
         {
-            if (IsWindows())
-            {
-                return $"{name}.exe";
-            }
-            else
-            {
-                return name;
-            }
+            return IsWindows() ? $"{name}.exe" : name;
         }
 
         public static bool IsAdministrator()
@@ -901,7 +783,7 @@ namespace ServiceLib.Common
             else
             {
                 var id = GetLinuxUserId().Result ?? "1000";
-                if (int.TryParse(id, out int userId))
+                if (int.TryParse(id, out var userId))
                 {
                     return userId == 0;
                 }
@@ -914,7 +796,8 @@ namespace ServiceLib.Common
 
         private static async Task<string?> GetLinuxUserId()
         {
-            return await GetCliWrapOutput("/bin/bash", ["-c", "id -u"]);
+            var arg = new List<string>() { "-c", "id -u" };
+            return await GetCliWrapOutput("/bin/bash", arg);
         }
 
         #endregion Platform
diff --git a/v2rayn/v2rayN/ServiceLib/Common/YamlUtils.cs b/v2rayn/v2rayN/ServiceLib/Common/YamlUtils.cs
index f87fd63c68..94d572b56a 100644
--- a/v2rayn/v2rayN/ServiceLib/Common/YamlUtils.cs
+++ b/v2rayn/v2rayN/ServiceLib/Common/YamlUtils.cs
@@ -21,7 +21,7 @@ namespace ServiceLib.Common
                 .Build();
             try
             {
-                T obj = deserializer.Deserialize<T>(str);
+                var obj = deserializer.Deserialize<T>(str);
                 return obj;
             }
             catch (Exception ex)
@@ -36,9 +36,9 @@ namespace ServiceLib.Common
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public static string ToYaml(Object? obj)
+        public static string ToYaml(object? obj)
         {
-            string result = string.Empty;
+            var result = string.Empty;
             if (obj == null)
             {
                 return result;
diff --git a/v2rayn/v2rayN/ServiceLib/Global.cs b/v2rayn/v2rayN/ServiceLib/Global.cs
index d39955dd5c..2e269ae6b5 100644
--- a/v2rayn/v2rayN/ServiceLib/Global.cs
+++ b/v2rayn/v2rayN/ServiceLib/Global.cs
@@ -114,6 +114,11 @@
             @"http://www.msftconnecttest.com/connecttest.txt",
         };
 
+        public static readonly List<string> GeoFilesSources = new() {
+            GeoUrl,
+            @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
+        };
+
         public static readonly Dictionary<string, string> UserAgentTexts = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
diff --git a/v2rayn/v2rayN/ServiceLib/Handler/AppHandler.cs b/v2rayn/v2rayN/ServiceLib/Handler/AppHandler.cs
index bf3cb420ff..5f6ab3af5d 100644
--- a/v2rayn/v2rayN/ServiceLib/Handler/AppHandler.cs
+++ b/v2rayn/v2rayN/ServiceLib/Handler/AppHandler.cs
@@ -2,11 +2,14 @@
 {
     public sealed class AppHandler
     {
+        #region Property
+
         private static readonly Lazy<AppHandler> _instance = new(() => new());
         private Config _config;
         private int? _statePort;
         private int? _statePort2;
         private Job? _processJob;
+        private bool? _isAdministrator;
         public static AppHandler Instance => _instance.Value;
         public Config Config => _config;
 
@@ -28,6 +31,17 @@
             }
         }
 
+        public bool IsAdministrator
+        {
+            get
+            {
+                _isAdministrator ??= Utils.IsAdministrator();
+                return _isAdministrator.Value;
+            }
+        }
+
+        #endregion Property
+
         #region Init
 
         public AppHandler()
diff --git a/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 16dbfc5840..a574cbeb20 100644
--- a/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -1,6 +1,5 @@
 using System.Data;
 using System.Text.RegularExpressions;
-using System.Web;
 
 namespace ServiceLib.Handler
 {
@@ -494,7 +493,7 @@ namespace ServiceLib.Handler
                 return -1;
             }
             var ext = Path.GetExtension(fileName);
-            string newFileName = $"{Utils.GetGUID()}{ext}";
+            string newFileName = $"{Utils.GetGuid()}{ext}";
             //newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
 
             try
@@ -934,7 +933,7 @@ namespace ServiceLib.Handler
             var maxSort = -1;
             if (Utils.IsNullOrEmpty(profileItem.indexId))
             {
-                profileItem.indexId = Utils.GetGUID(false);
+                profileItem.indexId = Utils.GetGuid(false);
                 maxSort = ProfileExHandler.Instance.GetMaxSort();
             }
             if (!toFile && maxSort < 0)
@@ -1002,7 +1001,7 @@ namespace ServiceLib.Handler
 
         public static int AddCustomServer4Multiple(Config config, List<ProfileItem> selecteds, ECoreType coreType, out string indexId)
         {
-            indexId = Utils.GetMD5(Global.CoreMultipleLoadConfigFileName);
+            indexId = Utils.GetMd5(Global.CoreMultipleLoadConfigFileName);
             string configPath = Utils.GetConfigPath(Global.CoreMultipleLoadConfigFileName);
             if (CoreConfigHandler.GenerateClientMultipleLoadConfig(config, configPath, selecteds, coreType, out string msg) != 0)
             {
@@ -1341,7 +1340,7 @@ namespace ServiceLib.Handler
             try
             {
                 var uri = new Uri(url);
-                var queryVars = HttpUtility.ParseQueryString(uri.Query);
+                var queryVars = Utils.ParseQueryString(uri.Query);
                 subItem.remarks = queryVars["remarks"] ?? "import_sub";
             }
             catch (UriFormatException)
@@ -1378,7 +1377,7 @@ namespace ServiceLib.Handler
 
             if (Utils.IsNullOrEmpty(item.id))
             {
-                item.id = Utils.GetGUID(false);
+                item.id = Utils.GetGuid(false);
 
                 if (item.sort <= 0)
                 {
@@ -1461,7 +1460,7 @@ namespace ServiceLib.Handler
         {
             if (Utils.IsNullOrEmpty(item.id))
             {
-                item.id = Utils.GetGUID(false);
+                item.id = Utils.GetGuid(false);
             }
 
             if (SQLiteHelper.Instance.Replace(item) > 0)
@@ -1495,14 +1494,14 @@ namespace ServiceLib.Handler
 
             foreach (var item in lstRules)
             {
-                item.id = Utils.GetGUID(false);
+                item.id = Utils.GetGuid(false);
             }
             routingItem.ruleNum = lstRules.Count;
             routingItem.ruleSet = JsonUtils.Serialize(lstRules, false);
 
             if (Utils.IsNullOrEmpty(routingItem.id))
             {
-                routingItem.id = Utils.GetGUID(false);
+                routingItem.id = Utils.GetGuid(false);
             }
 
             if (SQLiteHelper.Instance.Replace(routingItem) > 0)
@@ -1711,7 +1710,7 @@ namespace ServiceLib.Handler
         {
             if (Utils.IsNullOrEmpty(item.id))
             {
-                item.id = Utils.GetGUID(false);
+                item.id = Utils.GetGuid(false);
             }
 
             if (SQLiteHelper.Instance.Replace(item) > 0)
diff --git a/v2rayn/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayn/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
index 3372cfc542..fc1bcda61f 100644
--- a/v2rayn/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
+++ b/v2rayn/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -197,7 +197,7 @@ namespace ServiceLib.Handler.Fmt
 
         protected static string WriteAllText(string strData, string ext = "json")
         {
-            var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.{ext}");
+            var fileName = Utils.GetTempPath($"{Utils.GetGuid(false)}.{ext}");
             File.WriteAllText(fileName, strData);
             return fileName;
         }
diff --git a/v2rayn/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs b/v2rayn/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs
index f172cd82a7..311462facc 100644
--- a/v2rayn/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs
+++ b/v2rayn/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs
@@ -70,12 +70,12 @@
             item.network = Global.DefaultNetwork;
             item.headerType = Global.None;
 
-            item.configVersion = Utils.ToInt(vmessQRCode.v);
+            item.configVersion = vmessQRCode.v;
             item.remarks = Utils.ToString(vmessQRCode.ps);
             item.address = Utils.ToString(vmessQRCode.add);
-            item.port = Utils.ToInt(vmessQRCode.port);
+            item.port = vmessQRCode.port;
             item.id = Utils.ToString(vmessQRCode.id);
-            item.alterId = Utils.ToInt(vmessQRCode.aid);
+            item.alterId = vmessQRCode.aid;
             item.security = Utils.ToString(vmessQRCode.scy);
 
             item.security = Utils.IsNotEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
diff --git a/v2rayn/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayn/v2rayN/ServiceLib/Models/ConfigItems.cs
index bee32971e6..e4bbe112bd 100644
--- a/v2rayn/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayn/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -140,6 +140,7 @@
     {
         public string defIEProxyExceptions { get; set; }
         public string subConvertUrl { get; set; } = string.Empty;
+        public string? geoSourceUrl { get; set; }
     }
 
     [Serializable]
diff --git a/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs
index d36a90010e..954f491bc6 100644
--- a/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs
+++ b/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs
@@ -58,7 +58,7 @@ namespace ServiceLib.Models
             return summary;
         }
 
-        public List<string> GetAlpn()
+        public List<string>? GetAlpn()
         {
             if (Utils.IsNullOrEmpty(alpn))
             {
diff --git a/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs
index 259bb39590..5eba73e133 100644
--- a/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs
+++ b/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs
@@ -120,10 +120,10 @@
         public string? version { get; set; }
         public string? network { get; set; }
         public string? packet_encoding { get; set; }
-        public string[]? local_address { get; set; }
+        public List<string>? local_address { get; set; }
         public string? private_key { get; set; }
         public string? peer_public_key { get; set; }
-        public int[]? reserved { get; set; }
+        public List<int>? reserved { get; set; }
         public int? mtu { get; set; }
         public string? plugin { get; set; }
         public string? plugin_opts { get; set; }
@@ -138,11 +138,11 @@
     public class Tls4Sbox
     {
         public bool enabled { get; set; }
-        public string server_name { get; set; }
+        public string? server_name { get; set; }
         public bool? insecure { get; set; }
-        public List<string> alpn { get; set; }
-        public Utls4Sbox utls { get; set; }
-        public Reality4Sbox reality { get; set; }
+        public List<string>? alpn { get; set; }
+        public Utls4Sbox? utls { get; set; }
+        public Reality4Sbox? reality { get; set; }
     }
 
     public class Multiplex4Sbox
diff --git a/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs
index 6335db48cb..2849771951 100644
--- a/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -647,12 +647,12 @@ namespace ServiceLib.Models
         /// <summary>
         ///
         /// </summary>
-        public string path { get; set; }
+        public string? path { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public List<string> host { get; set; }
+        public List<string>? host { get; set; }
     }
 
     public class QuicSettings4Ray
diff --git a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 9a0f92e69c..598eb57459 100644
--- a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -3004,6 +3004,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Geo files source (optional) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsGeoFilesSource {
+            get {
+                return ResourceManager.GetString("TbSettingsGeoFilesSource", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 HTTP Port 的本地化字符串。
         /// </summary>
diff --git a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.resx
index 8e4c65fb08..725481df30 100644
--- a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1322,9 +1322,12 @@
     <value>Host filter</value>
   </data>
   <data name="TipActiveServer" xml:space="preserve">
-    <value>Active</value>    
+    <value>Active</value>
   </data>
   <data name="menuStorageUI" xml:space="preserve">
     <value>Save Interface Layout</value>
   </data>
+  <data name="TbSettingsGeoFilesSource" xml:space="preserve">
+    <value>Geo files source (optional)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index f1557ed960..e235565026 100644
--- a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1324,4 +1324,7 @@
   <data name="menuStorageUI" xml:space="preserve">
     <value>保存界面布局</value>
   </data>
+  <data name="TbSettingsGeoFilesSource" xml:space="preserve">
+    <value>Geo文件来源(可选)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 870dca42c6..b85c239d6a 100644
--- a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1204,4 +1204,7 @@
   <data name="menuStorageUI" xml:space="preserve">
     <value>儲存介面佈局</value>
   </data>
+  <data name="TbSettingsGeoFilesSource" xml:space="preserve">
+    <value>Geo文件來源(可選)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayn/v2rayN/ServiceLib/Sample/dns_singbox_normal b/v2rayn/v2rayN/ServiceLib/Sample/dns_singbox_normal
index c0619ebf0c..7003f91f1b 100644
--- a/v2rayn/v2rayN/ServiceLib/Sample/dns_singbox_normal
+++ b/v2rayn/v2rayN/ServiceLib/Sample/dns_singbox_normal
@@ -3,13 +3,13 @@
     {
       "tag": "remote",
       "address": "8.8.8.8",
-      "strategy": "ipv4_only",
+      "strategy": "prefer_ipv4",
       "detour": "proxy"
     },
     {
       "tag": "local",
       "address": "223.5.5.5",
-      "strategy": "ipv4_only",
+      "strategy": "prefer_ipv4",
       "detour": "direct"
     },
     {
diff --git a/v2rayn/v2rayN/ServiceLib/Sample/tun_singbox_dns b/v2rayn/v2rayN/ServiceLib/Sample/tun_singbox_dns
index c0619ebf0c..7003f91f1b 100644
--- a/v2rayn/v2rayN/ServiceLib/Sample/tun_singbox_dns
+++ b/v2rayn/v2rayN/ServiceLib/Sample/tun_singbox_dns
@@ -3,13 +3,13 @@
     {
       "tag": "remote",
       "address": "8.8.8.8",
-      "strategy": "ipv4_only",
+      "strategy": "prefer_ipv4",
       "detour": "proxy"
     },
     {
       "tag": "local",
       "address": "223.5.5.5",
-      "strategy": "ipv4_only",
+      "strategy": "prefer_ipv4",
       "detour": "direct"
     },
     {
diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 26839b1150..3e8dc82af1 100644
--- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -678,8 +678,8 @@ namespace ServiceLib.Services.CoreConfig
                         {
                             outbound.private_key = node.id;
                             outbound.peer_public_key = node.publicKey;
-                            outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
-                            outbound.local_address = [.. Utils.String2List(node.requestHost)];
+                            outbound.reserved = Utils.String2List(node.path)?.Select(int.Parse).ToList();
+                            outbound.local_address = Utils.String2List(node.requestHost);
                             outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
                             break;
                         }
@@ -732,7 +732,7 @@ namespace ServiceLib.Services.CoreConfig
                     }
                     else if (Utils.IsNotEmpty(node.requestHost))
                     {
-                        server_name = Utils.String2List(node.requestHost)[0];
+                        server_name = Utils.String2List(node.requestHost)?.First();
                     }
                     var tls = new Tls4Sbox()
                     {
diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
index 1b774111fa..97d951be84 100644
--- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -829,7 +829,7 @@ namespace ServiceLib.Services.CoreConfig
                     }
                     else if (Utils.IsNotEmpty(host))
                     {
-                        tlsSettings.serverName = Utils.String2List(host)[0];
+                        tlsSettings.serverName = Utils.String2List(host)?.First();
                     }
                     streamSettings.tlsSettings = tlsSettings;
                 }
diff --git a/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs
index 97d1080ec1..887ef88a03 100644
--- a/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs
+++ b/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs
@@ -30,7 +30,7 @@ namespace ServiceLib.Services
         {
             try
             {
-                Utils.SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
+                SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
 
                 var progress = new Progress<string>();
                 progress.ProgressChanged += (sender, value) =>
@@ -62,7 +62,7 @@ namespace ServiceLib.Services
         {
             try
             {
-                Utils.SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
+                SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
                 UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
@@ -92,7 +92,7 @@ namespace ServiceLib.Services
 
         public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
         {
-            Utils.SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
+            SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
             var webRequestHandler = new SocketsHttpHandler
             {
                 AllowAutoRedirect = false,
@@ -181,7 +181,7 @@ namespace ServiceLib.Services
         {
             try
             {
-                Utils.SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
+                SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
                 var webProxy = GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
@@ -226,7 +226,7 @@ namespace ServiceLib.Services
         {
             try
             {
-                Utils.SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
+                SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
 
                 var webProxy = GetWebProxy(blProxy);
 
@@ -337,5 +337,18 @@ namespace ServiceLib.Services
                 return false;
             }
         }
+
+        private static void SetSecurityProtocol(bool enableSecurityProtocolTls13)
+        {
+            if (enableSecurityProtocolTls13)
+            {
+                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13;
+            }
+            else
+            {
+                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+            }
+            ServicePointManager.DefaultConnectionLimit = 256;
+        }
     }
 }
\ No newline at end of file
diff --git a/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs
index c5034b6bb0..d821d1db9f 100644
--- a/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -56,7 +56,7 @@ namespace ServiceLib.Services
                 _updateFunc?.Invoke(false, args.Msg);
 
                 url = args.Url;
-                fileName = Utils.GetTempPath(Utils.GetGUID());
+                fileName = Utils.GetTempPath(Utils.GetGuid());
                 await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
             }
             else
@@ -108,7 +108,7 @@ namespace ServiceLib.Services
 
                 url = args.Url;
                 var ext = Path.GetExtension(url);
-                fileName = Utils.GetTempPath(Utils.GetGUID() + ext);
+                fileName = Utils.GetTempPath(Utils.GetGuid() + ext);
                 await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
             }
             else
@@ -255,8 +255,8 @@ namespace ServiceLib.Services
 
         public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFunc)
         {
-            await UpdateGeoFile("geosite", _config, updateFunc);
-            await UpdateGeoFile("geoip", _config, updateFunc);
+            await UpdateGeoFile("geosite", config, updateFunc);
+            await UpdateGeoFile("geoip", config, updateFunc);
             _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
         }
 
@@ -450,8 +450,12 @@ namespace ServiceLib.Services
         {
             _config = config;
             _updateFunc = updateFunc;
+
+            var geoUrl = string.IsNullOrEmpty(config?.constItem.geoSourceUrl)
+                ? Global.GeoUrl
+                : config.constItem.geoSourceUrl;
             var url = string.Format(Global.GeoUrl, geoName);
-            var fileName = Utils.GetTempPath(Utils.GetGUID());
+            var fileName = Utils.GetTempPath(Utils.GetGuid());
 
             DownloadService downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
index 09569c40f9..3b96c3da0a 100644
--- a/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
+++ b/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
@@ -85,7 +85,7 @@ namespace ServiceLib.ViewModels
         private async Task RemoteRestore()
         {
             DisplayOperationMsg();
-            var fileName = Utils.GetTempPath(Utils.GetGUID());
+            var fileName = Utils.GetTempPath(Utils.GetGuid());
             var result = await WebDavHandler.Instance.GetRawFile(fileName);
             if (result)
             {
diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index 8ccb903325..a691647ea0 100644
--- a/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -414,7 +414,7 @@ namespace ServiceLib.ViewModels
             var ret = await _updateView?.Invoke(EViewAction.OptionSettingWindow, null);
             if (ret == true)
             {
-                Locator.Current.GetService<StatusBarViewModel>()?.InboundDisplayStaus();
+                Locator.Current.GetService<StatusBarViewModel>()?.InboundDisplayStatus();
                 Reload();
             }
         }
diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
index 93d611824d..ef6f67359c 100644
--- a/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
@@ -65,6 +65,7 @@ namespace ServiceLib.ViewModels
         [Reactive] public bool EnableHWA { get; set; }
         [Reactive] public string SubConvertUrl { get; set; }
         [Reactive] public int MainGirdOrientation { get; set; }
+        [Reactive] public string GeoFileSourceUrl { get; set; }
 
         #endregion UI
 
@@ -164,6 +165,7 @@ namespace ServiceLib.ViewModels
             EnableHWA = _config.guiItem.enableHWA;
             SubConvertUrl = _config.constItem.subConvertUrl;
             MainGirdOrientation = (int)_config.uiItem.mainGirdOrientation;
+            GeoFileSourceUrl = _config.constItem.geoSourceUrl;
 
             #endregion UI
 
@@ -316,6 +318,7 @@ namespace ServiceLib.ViewModels
             _config.guiItem.enableHWA = EnableHWA;
             _config.constItem.subConvertUrl = SubConvertUrl;
             _config.uiItem.mainGirdOrientation = (EGirdOrientation)MainGirdOrientation;
+            _config.constItem.geoSourceUrl = GeoFileSourceUrl;
 
             //systemProxy
             _config.systemProxyItem.systemProxyExceptions = systemProxyExceptions;
diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs
index 068a96b8e4..1a2419dfea 100644
--- a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs
+++ b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs
@@ -34,7 +34,7 @@ namespace ServiceLib.ViewModels
 
             if (rulesItem.id.IsNullOrEmpty())
             {
-                rulesItem.id = Utils.GetGUID(false);
+                rulesItem.id = Utils.GetGuid(false);
                 rulesItem.outboundTag = Global.ProxyTag;
                 rulesItem.enabled = true;
                 SelectedSource = rulesItem;
diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
index 215c78eefc..57692d9c0f 100644
--- a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
@@ -232,7 +232,7 @@ namespace ServiceLib.ViewModels
             var item = SelectedRouting;
             foreach (var it in _rules)
             {
-                it.id = Utils.GetGUID(false);
+                it.id = Utils.GetGuid(false);
             }
             item.ruleNum = _rules.Count;
             item.ruleSet = JsonUtils.Serialize(_rules, false);
@@ -322,7 +322,7 @@ namespace ServiceLib.ViewModels
             }
             foreach (var rule in lstRules)
             {
-                rule.id = Utils.GetGUID(false);
+                rule.id = Utils.GetGuid(false);
             }
 
             if (blReplace)
diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
index c76198f2fb..a93500bc09 100644
--- a/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -10,8 +10,6 @@ namespace ServiceLib.ViewModels
 {
     public class StatusBarViewModel : MyReactiveObject
     {
-        private bool _isAdministrator { get; set; }
-
         #region ObservableCollection
 
         private IObservableCollection<RoutingItem> _routingItems = new ObservableCollectionExtended<RoutingItem>();
@@ -108,19 +106,16 @@ namespace ServiceLib.ViewModels
         public StatusBarViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
         {
             _config = AppHandler.Instance.Config;
-            _updateView = updateView;
 
-            if (_updateView != null)
+            if (updateView != null)
             {
-                MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString())
-                    .Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
+                Init(updateView);
             }
 
             SelectedRouting = new();
             SelectedServer = new();
 
-            _isAdministrator = Utils.IsAdministrator();
-            if (_config.tunModeItem.enableTun && _isAdministrator)
+            if (_config.tunModeItem.enableTun && AppHandler.Instance.IsAdministrator)
             {
                 EnableTun = true;
             }
@@ -130,7 +125,7 @@ namespace ServiceLib.ViewModels
             }
 
             RefreshRoutingsMenu();
-            InboundDisplayStaus();
+            InboundDisplayStatus();
             ChangeSystemProxyAsync(_config.systemProxyItem.sysProxyType, true);
 
             #region WhenAnyValue && ReactiveCommand
@@ -414,7 +409,7 @@ namespace ServiceLib.ViewModels
             {
                 _config.tunModeItem.enableTun = EnableTun;
                 // When running as a non-administrator, reboot to administrator mode
-                if (EnableTun && !_isAdministrator)
+                if (EnableTun && !AppHandler.Instance.IsAdministrator)
                 {
                     _config.tunModeItem.enableTun = false;
                     Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
@@ -429,19 +424,12 @@ namespace ServiceLib.ViewModels
 
         #region UI
 
-        public void InboundDisplayStaus()
+        public void InboundDisplayStatus()
         {
             StringBuilder sb = new();
             sb.Append($"[{EInboundProtocol.socks}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}]");
             sb.Append(" | ");
-            //if (_config.systemProxyItem.sysProxyType == ESysProxyType.ForcedChange)
-            //{
-            //    sb.Append($"[{Global.InboundHttp}({ResUI.SystemProxy}):{LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}]");
-            //}
-            //else
-            //{
             sb.Append($"[{EInboundProtocol.http}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.http)}]");
-            //}
             InboundDisplay = $"{ResUI.LabLocal}:{sb}";
 
             if (_config.inbound[0].allowLANConn)
diff --git a/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs
index 5cc69809b9..660e686519 100644
--- a/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs
@@ -43,7 +43,7 @@ public partial class App : Application
 
     private void OnStartup(string[]? Args)
     {
-        var exePathKey = Utils.GetMD5(Utils.GetExePath());
+        var exePathKey = Utils.GetMd5(Utils.GetExePath());
 
         var rebootas = (Args ?? new string[] { }).Any(t => t == Global.RebootAs);
         //ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
index e7f35643bf..9c00aadf4f 100644
--- a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
+++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@@ -272,7 +272,7 @@ namespace v2rayN.Desktop.Views
         private void btnGUID_Click(object? sender, RoutedEventArgs e)
         {
             txtId.Text =
-            txtId5.Text = Utils.GetGUID();
+            txtId5.Text = Utils.GetGuid();
         }
 
         private void SetHeaderType()
diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 83933ef7ff..f4fd21c560 100644
--- a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -80,30 +80,35 @@ namespace v2rayN.Desktop.Views
                 this.BindCommand(ViewModel, vm => vm.ReloadCmd, v => v.menuReload).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlReloadEnabled, v => v.menuReload.IsEnabled).DisposeWith(disposables);
 
-                if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Horizontal)
+                switch (_config.uiItem.mainGirdOrientation)
                 {
-                    gridMain.IsVisible = true;
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies.IsVisible).DisposeWith(disposables);
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections.IsVisible).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain.SelectedIndex).DisposeWith(disposables);
-                }
-                else if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Vertical)
-                {
-                    gridMain1.IsVisible = true;
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies1.IsVisible).DisposeWith(disposables);
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections1.IsVisible).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain1.SelectedIndex).DisposeWith(disposables);
-                }
-                else
-                {
-                    gridMain2.IsVisible = true;
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies2.IsVisible).DisposeWith(disposables);
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections2.IsVisible).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
+                    case EGirdOrientation.Horizontal:
+                        gridMain.IsVisible = true;
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView.IsVisible).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies.IsVisible).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections.IsVisible).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain.SelectedIndex).DisposeWith(disposables);
+                        break;
+
+                    case EGirdOrientation.Vertical:
+                        gridMain1.IsVisible = true;
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView1.IsVisible).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies1.IsVisible).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections1.IsVisible).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain1.SelectedIndex).DisposeWith(disposables);
+                        break;
+
+                    case EGirdOrientation.Tab:
+                    default:
+                        gridMain2.IsVisible = true;
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies2.IsVisible).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections2.IsVisible).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
+                        break;
                 }
             });
 
-            this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+            this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
             if (Utils.IsWindows())
             {
                 menuGlobalHotkeySetting.IsVisible = false;
@@ -115,26 +120,29 @@ namespace v2rayN.Desktop.Views
                 menuGlobalHotkeySetting.IsVisible = false;
             }
 
-            if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Horizontal)
+            switch (_config.uiItem.mainGirdOrientation)
             {
-                tabProfiles.Content ??= new ProfilesView(this);
-                tabMsgView.Content ??= new MsgView();
-                tabClashProxies.Content ??= new ClashProxiesView();
-                tabClashConnections.Content ??= new ClashConnectionsView();
-            }
-            else if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Vertical)
-            {
-                tabProfiles1.Content ??= new ProfilesView(this);
-                tabMsgView1.Content ??= new MsgView();
-                tabClashProxies1.Content ??= new ClashProxiesView();
-                tabClashConnections1.Content ??= new ClashConnectionsView();
-            }
-            else
-            {
-                tabProfiles2.Content ??= new ProfilesView(this);
-                tabMsgView2.Content ??= new MsgView();
-                tabClashProxies2.Content ??= new ClashProxiesView();
-                tabClashConnections2.Content ??= new ClashConnectionsView();
+                case EGirdOrientation.Horizontal:
+                    tabProfiles.Content ??= new ProfilesView(this);
+                    tabMsgView.Content ??= new MsgView();
+                    tabClashProxies.Content ??= new ClashProxiesView();
+                    tabClashConnections.Content ??= new ClashConnectionsView();
+                    break;
+
+                case EGirdOrientation.Vertical:
+                    tabProfiles1.Content ??= new ProfilesView(this);
+                    tabMsgView1.Content ??= new MsgView();
+                    tabClashProxies1.Content ??= new ClashProxiesView();
+                    tabClashConnections1.Content ??= new ClashConnectionsView();
+                    break;
+
+                case EGirdOrientation.Tab:
+                default:
+                    tabProfiles2.Content ??= new ProfilesView(this);
+                    tabMsgView2.Content ??= new MsgView();
+                    tabClashProxies2.Content ??= new ClashProxiesView();
+                    tabClashConnections2.Content ??= new ClashConnectionsView();
+                    break;
             }
             conTheme.Content ??= new ThemeSettingView();
 
diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index ae63a5e349..a183fdf58c 100644
--- a/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -32,7 +32,7 @@
                 Cursor="Hand" />
         </StackPanel>
 
-        <TabControl HorizontalContentAlignment="Left">
+        <TabControl HorizontalContentAlignment="Stretch">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid Classes="Margin8">
@@ -364,6 +364,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -610,6 +611,19 @@
                             Grid.Column="1"
                             Width="300"
                             Classes="Margin8" />
+
+                        <TextBlock
+                            Grid.Row="22"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Classes="Margin8"
+                            Text="{x:Static resx:ResUI.TbSettingsGeoFilesSource}" />
+                        <ComboBox
+                            x:Name="cmbGetFilesSourceUrl"
+                            Grid.Row="22"
+                            Grid.Column="1"
+                            Width="300"
+                            Classes="Margin8" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
index dd52aa9219..2ff06d9b4b 100644
--- a/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -83,6 +83,10 @@ namespace v2rayN.Desktop.Views
             {
                 cmbSubConvertUrl.Items.Add(it);
             });
+            Global.GeoFilesSources.ForEach(it =>
+            {
+                cmbGetFilesSourceUrl.Items.Add(it);
+            });
             foreach (EGirdOrientation it in Enum.GetValues(typeof(EGirdOrientation)))
             {
                 cmbMainGirdOrientation.Items.Add(it.ToString());
@@ -132,6 +136,7 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);
 
                 this.Bind(ViewModel, vm => vm.notProxyLocalAddress, v => v.tognotProxyLocalAddress.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.SelectedValue).DisposeWith(disposables);
diff --git a/v2rayn/v2rayN/v2rayN/App.xaml b/v2rayn/v2rayN/v2rayN/App.xaml
index 844c6af97e..b5d2997d7f 100644
--- a/v2rayn/v2rayN/v2rayN/App.xaml
+++ b/v2rayn/v2rayN/v2rayN/App.xaml
@@ -24,23 +24,47 @@
 
             <conv:InverseBooleanConverter x:Key="InverseBooleanConverter" />
             <Thickness
-                x:Key="ServerItemMargin"
+                x:Key="Margin4"
                 Bottom="4"
                 Left="4"
                 Right="4"
                 Top="4" />
             <Thickness
-                x:Key="SettingItemMargin"
+                x:Key="Margin8"
                 Bottom="8"
                 Left="8"
                 Right="8"
                 Top="8" />
             <Thickness
                 x:Key="OutlinedTextBoxDefaultPadding"
-                Bottom="12"
-                Left="16"
-                Right="12"
-                Top="12" />
+                Bottom="8"
+                Left="8"
+                Right="8"
+                Top="8" />
+            <Thickness
+                x:Key="MarginLeftRight4"
+                Bottom="0"
+                Left="4"
+                Right="4"
+                Top="0" />
+            <Thickness
+                x:Key="MarginLeftRight8"
+                Bottom="0"
+                Left="8"
+                Right="8"
+                Top="0" />
+            <Thickness
+                x:Key="MarginLeft8"
+                Bottom="0"
+                Left="8"
+                Right="0"
+                Top="0" />
+            <Thickness
+                x:Key="MarginRight8"
+                Bottom="0"
+                Left="0"
+                Right="8"
+                Top="0" />
             <Style
                 x:Key="ModuleTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
diff --git a/v2rayn/v2rayN/v2rayN/App.xaml.cs b/v2rayn/v2rayN/v2rayN/App.xaml.cs
index 43ce041ab5..89cd346758 100644
--- a/v2rayn/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/App.xaml.cs
@@ -26,7 +26,7 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            var exePathKey = Utils.GetMD5(Utils.GetExePath());
+            var exePathKey = Utils.GetMd5(Utils.GetExePath());
 
             var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
diff --git a/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs b/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs
index b9ca2323dc..43045398c5 100644
--- a/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs
+++ b/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs
@@ -218,7 +218,7 @@ namespace v2rayN
         {
             try
             {
-                var autoRunName = $"{AutoRunName}_{Utils.GetMD5(Utils.StartupPath())}";
+                var autoRunName = $"{AutoRunName}_{Utils.GetMd5(Utils.StartupPath())}";
                 //delete first
                 RegWriteValue(AutoRunRegPath, autoRunName, "");
                 if (Utils.IsAdministrator())
diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml
index b196a21234..904f22485a 100644
--- a/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -72,14 +72,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.menuServers}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
@@ -89,7 +89,7 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         Style="{StaticResource MyOutlinedTextBox}" />
@@ -97,7 +97,7 @@
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAddress}" />
@@ -106,7 +106,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -118,12 +118,12 @@
                         Orientation="Horizontal">
                         <Button
                             x:Name="btnBrowse"
-                            Margin="2,0"
+                            Margin="{StaticResource MarginLeftRight4}"
                             Content="{x:Static resx:ResUI.TbBrowse}"
                             Style="{StaticResource DefButton}" />
                         <Button
                             x:Name="btnEdit"
-                            Margin="2,0"
+                            Margin="{StaticResource MarginLeftRight4}"
                             Content="{x:Static resx:ResUI.TbEdit}"
                             Style="{StaticResource DefButton}" />
                     </StackPanel>
@@ -131,7 +131,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbCoreType}" />
@@ -140,7 +140,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         MaxDropDownHeight="1000"
                         Style="{StaticResource MyOutlinedTextComboBox}" />
@@ -148,18 +148,18 @@
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbDisplayLog}" />
                     <StackPanel
                         Grid.Row="4"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         Orientation="Horizontal">
                         <ToggleButton x:Name="togDisplayLog" HorizontalAlignment="Left" />
                         <TextBlock
-                            Margin="8,0"
+                            Margin="{StaticResource MarginLeftRight8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TipDisplayLog}" />
@@ -168,7 +168,7 @@
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPreSocksPort}" />
@@ -177,7 +177,7 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         AcceptsReturn="True"
                         Style="{StaticResource MyOutlinedTextBox}" />
@@ -193,7 +193,7 @@
                             TextWrapping="Wrap" />
                         <TextBlock
                             Width="500"
-                            Margin="8,0"
+                            Margin="{StaticResource MarginLeftRight8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.CustomServerTips}"
diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml
index f23efe2584..ad9a229b7d 100644
--- a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -76,7 +76,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.menuServers}" />
                     <StackPanel
@@ -86,7 +86,7 @@
                         <ComboBox
                             x:Name="cmbCoreType"
                             Width="100"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbCoreType}"
                             Style="{StaticResource DefComboBox}" />
                     </StackPanel>
@@ -94,7 +94,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
@@ -103,13 +103,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAddress}" />
@@ -118,13 +118,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPort}" />
@@ -133,7 +133,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
@@ -162,7 +162,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId}" />
@@ -171,20 +171,20 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <Button
                         x:Name="btnGUID"
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLeftRight4}"
                         Content="{x:Static resx:ResUI.TbGUID}"
                         Style="{StaticResource DefButton}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAlterId}" />
@@ -193,14 +193,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity}" />
@@ -209,7 +209,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -230,7 +230,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -239,13 +239,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity3}" />
@@ -254,7 +254,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="300"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -275,7 +275,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity4}" />
@@ -284,13 +284,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId4}" />
@@ -299,7 +299,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
@@ -321,7 +321,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId5}" />
@@ -330,20 +330,20 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <Button
                         x:Name="btnGUID5"
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLeftRight4}"
                         Content="{x:Static resx:ResUI.TbGUID}"
                         Style="{StaticResource DefButton}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
@@ -352,13 +352,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity5}" />
@@ -367,7 +367,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
@@ -389,7 +389,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -398,13 +398,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
@@ -413,7 +413,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -434,7 +434,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -443,13 +443,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPath7}" />
@@ -458,7 +458,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
@@ -479,7 +479,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId}" />
@@ -488,13 +488,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -503,13 +503,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType8}" />
@@ -518,7 +518,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -541,7 +541,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPrivateKey}" />
@@ -550,13 +550,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
@@ -565,14 +565,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbReserved}" />
@@ -581,13 +581,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbLocalAddress}" />
@@ -596,13 +596,13 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Mtu" />
@@ -611,7 +611,7 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
@@ -642,14 +642,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.ColumnSpan="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.GbTransport}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbNetwork}" />
@@ -658,12 +658,12 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TipNetwork}" />
@@ -672,7 +672,7 @@
                         x:Name="labHeaderType"
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
@@ -681,13 +681,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                     <TextBlock
                         x:Name="tipHeaderType"
                         Grid.Row="2"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
@@ -695,7 +695,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
@@ -704,13 +704,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         x:Name="tipRequestHost"
                         Grid.Row="3"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
@@ -718,7 +718,7 @@
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPath}" />
@@ -727,13 +727,13 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         x:Name="tipPath"
                         Grid.Row="4"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPath}" />
@@ -760,7 +760,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbStreamSecurity}" />
@@ -769,7 +769,7 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -791,7 +791,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSNI}" />
@@ -800,14 +800,14 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
@@ -816,14 +816,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         IsEditable="True"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAlpn}" />
@@ -832,13 +832,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAllowInsecure}" />
@@ -847,7 +847,7 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -869,7 +869,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSNI}" />
@@ -878,14 +878,14 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
@@ -894,14 +894,14 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         IsEditable="True"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
@@ -910,14 +910,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbShortId}" />
@@ -926,14 +926,14 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSpiderX}" />
@@ -942,7 +942,7 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index 7eff73a233..1593e9bb8d 100644
--- a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -267,7 +267,7 @@ namespace v2rayN.Views
         private void btnGUID_Click(object sender, RoutedEventArgs e)
         {
             txtId.Text =
-            txtId5.Text = Utils.GetGUID();
+            txtId5.Text = Utils.GetGuid();
         }
 
         private void SetHeaderType()
diff --git a/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
index 219893bb5c..4107d19985 100644
--- a/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
@@ -21,11 +21,11 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <DockPanel Margin="16">
-        <DockPanel Margin="8" DockPanel.Dock="Bottom">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <DockPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
             <Button
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuClose}"
                 DockPanel.Dock="Right"
@@ -35,14 +35,14 @@
 
             <TextBlock
                 x:Name="txtMsg"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}" />
         </DockPanel>
 
         <StackPanel>
-            <materialDesign:Card Width="Auto" Margin="8">
-                <Grid Margin="8">
+            <materialDesign:Card Width="Auto" Margin="{StaticResource Margin8}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -56,14 +56,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.menuLocalBackupAndRestore}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuLocalBackup}" />
@@ -71,7 +71,7 @@
                         x:Name="menuLocalBackup"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuLocalBackup}"
                         Style="{StaticResource DefButton}" />
@@ -84,7 +84,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuLocalRestore}" />
@@ -92,14 +92,14 @@
                         x:Name="menuLocalRestore"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuLocalRestore}"
                         Style="{StaticResource DefButton}" />
                 </Grid>
             </materialDesign:Card>
-            <materialDesign:Card Width="Auto" Margin="8">
-                <Grid Margin="8">
+            <materialDesign:Card Width="Auto" Margin="{StaticResource Margin8}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -115,7 +115,7 @@
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="8"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource ModuleTitle}"
                             Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
@@ -124,7 +124,7 @@
                             HorizontalAlignment="Right"
                             StaysOpen="True"
                             Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
-                            <StackPanel Margin="16">
+                            <StackPanel Margin="{StaticResource Margin8}">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -140,7 +140,7 @@
                                     <TextBlock
                                         Grid.Row="0"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavUrl}" />
@@ -149,7 +149,7 @@
                                         x:Name="txtWebDavUrl"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}"
                                         TextWrapping="Wrap" />
@@ -157,7 +157,7 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavUserName}" />
@@ -166,14 +166,14 @@
                                         x:Name="txtWebDavUserName"
                                         Grid.Row="1"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
                                     <TextBlock
                                         Grid.Row="2"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavPassword}" />
@@ -182,14 +182,14 @@
                                         x:Name="txtWebDavPassword"
                                         Grid.Row="2"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
                                     <TextBlock
                                         Grid.Row="3"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavDirName}" />
@@ -198,7 +198,7 @@
                                         x:Name="txtWebDavDirName"
                                         Grid.Row="3"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
@@ -206,7 +206,7 @@
                                         x:Name="menuWebDavCheck"
                                         Grid.Row="4"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Content="{x:Static resx:ResUI.LvWebDavCheck}"
                                         Style="{StaticResource DefButton}" />
@@ -218,7 +218,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuRemoteBackup}" />
@@ -226,7 +226,7 @@
                         x:Name="menuRemoteBackup"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuRemoteBackup}"
                         Style="{StaticResource DefButton}" />
@@ -238,7 +238,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuRemoteRestore}" />
@@ -246,7 +246,7 @@
                         x:Name="menuRemoteRestore"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuRemoteRestore}"
                         Style="{StaticResource DefButton}" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml
index ee55d737ad..acd8299b62 100644
--- a/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -15,27 +15,27 @@
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
 
-    <DockPanel Margin="16">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
 
             <TextBlock
-                Margin="{StaticResource SettingItemMargin}"
+                Margin="{StaticResource Margin8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
             <ToggleButton
                 x:Name="togEnableCheckPreReleaseUpdate"
-                Margin="{StaticResource SettingItemMargin}"
+                Margin="{StaticResource Margin8}"
                 HorizontalAlignment="Left" />
 
             <Button
                 x:Name="btnCheckUpdate"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Content="{x:Static resx:ResUI.menuCheckUpdate}"
                 IsCancel="True"
                 IsDefault="True"
@@ -43,7 +43,7 @@
 
             <Button
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 HorizontalAlignment="Right"
                 Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuClose}"
@@ -67,7 +67,7 @@
                         <Border
                             Width="500"
                             Height="50"
-                            Margin="8"
+                            Margin="{StaticResource Margin8}"
                             Padding="0"
                             VerticalAlignment="Center">
                             <Grid>
@@ -82,7 +82,7 @@
                                 <ToggleButton
                                     x:Name="togAutoRefresh"
                                     Grid.Column="0"
-                                    Margin="8"
+                                    Margin="{StaticResource Margin8}"
                                     HorizontalAlignment="Left"
                                     IsChecked="{Binding IsSelected}" />
                                 <TextBlock
diff --git a/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
index b9e3ef5e2c..f83226c08f 100644
--- a/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
@@ -13,9 +13,9 @@
     x:TypeArguments="vms:ClashConnectionsViewModel"
     mc:Ignorable="d">
 
-    <DockPanel Margin="2">
+    <DockPanel Margin="{StaticResource Margin4}">
         <WrapPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             VerticalAlignment="Center"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
@@ -23,21 +23,21 @@
             <TextBox
                 x:Name="txtHostFilter"
                 Width="200"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalContentAlignment="Center"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.ConnectionsHostFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True"
                 Style="{StaticResource DefTextBox}" />
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingUpSpeed}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDownSpeed}" />
@@ -51,20 +51,20 @@
                 x:Name="btnConnectionCloseAll"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuConnectionCloseAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
             </Button>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left" />
         </WrapPanel>
 
diff --git a/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml b/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml
index 8e964f9347..f393a74a15 100644
--- a/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml
@@ -20,22 +20,22 @@
         <converters:DelayColorConverter x:Key="DelayColorConverter" />
     </UserControl.Resources>
 
-    <DockPanel Margin="2">
+    <DockPanel Margin="{StaticResource Margin4}">
         <WrapPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             VerticalAlignment="Center"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.menuRulemode}" />
             <ComboBox
                 x:Name="cmbRulemode"
                 Width="80"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeGlobal}" />
@@ -43,14 +43,14 @@
             </ComboBox>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
                 Width="60"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingName}" />
@@ -61,7 +61,7 @@
                 x:Name="menuProxiesReload"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuProxiesReload}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Reload" />
@@ -71,26 +71,26 @@
                 x:Name="menuProxiesDelaytest"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuProxiesDelaytest}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="LightningBolt" />
             </Button>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left" />
         </WrapPanel>
         <DockPanel>
             <ListView
                 x:Name="lstProxyGroups"
-                Margin="0,0,5,0"
+                Margin="{StaticResource MarginRight8}"
                 BorderThickness="0"
                 DockPanel.Dock="Left"
                 ItemContainerStyle="{StaticResource lvItemSelected}"
@@ -106,10 +106,10 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="4,0"
+                            Margin="{StaticResource MarginLeftRight4}"
                             Padding="0">
                             <DockPanel>
-                                <Grid Grid.Column="0" Margin="4">
+                                <Grid Grid.Column="0" Margin="{StaticResource Margin4}">
                                     <Grid.RowDefinitions>
                                         <RowDefinition />
                                         <RowDefinition />
@@ -162,7 +162,7 @@
                                     CornerRadius="4"
                                     DockPanel.Dock="Left"
                                     Visibility="{Binding Path=isActive, Converter={StaticResource BoolToVisConverter}}" />
-                                <Grid Margin="4">
+                                <Grid Margin="{StaticResource Margin4}">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="2*" />
                                         <RowDefinition Height="1*" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 0b69f7c950..76a212c9c2 100644
--- a/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -47,15 +47,15 @@
         <TabControl HorizontalContentAlignment="Left">
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
                         <TextBlock
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}">
                             <Hyperlink Click="linkDnsObjectDoc_Click">
@@ -65,7 +65,7 @@
                         </TextBlock>
                         <Button
                             x:Name="btnImportDefConfig4V2ray"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
@@ -74,39 +74,39 @@
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                             <ToggleButton
                                 x:Name="togUseSystemHosts"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
                             <ComboBox
                                 x:Name="cmbdomainStrategy4Freedom"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
                                 x:Name="cmbdomainDNSAddress"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 IsEditable="True"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
@@ -114,7 +114,7 @@
 
                     <TextBox
                         x:Name="txtnormalDNS"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Stretch"
                         materialDesign:HintAssist.Hint="HTTP/SOCKS"
                         AcceptsReturn="True"
@@ -126,10 +126,10 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}">
                             <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
@@ -139,7 +139,7 @@
                         </TextBlock>
                         <Button
                             x:Name="btnImportDefConfig4Singbox"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
@@ -148,33 +148,33 @@
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
                             <ComboBox
                                 x:Name="cmbdomainStrategy4Out"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
                                 x:Name="cmbdomainDNSAddress2"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 IsEditable="True"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 904217d2bc..90c4957ebb 100644
--- a/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -23,16 +23,16 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="btnReset"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbReset}"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -44,7 +44,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -77,14 +77,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbDisplayGUI}" />
@@ -93,7 +93,7 @@
                         x:Name="txtGlobalHotkey0"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -103,7 +103,7 @@
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
@@ -111,7 +111,7 @@
                         x:Name="txtGlobalHotkey1"
                         Grid.Row="2"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -121,7 +121,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
@@ -129,7 +129,7 @@
                         x:Name="txtGlobalHotkey2"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -138,7 +138,7 @@
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
@@ -146,7 +146,7 @@
                         x:Name="txtGlobalHotkey3"
                         Grid.Row="4"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -155,7 +155,7 @@
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
@@ -163,7 +163,7 @@
                         x:Name="txtGlobalHotkey4"
                         Grid.Row="5"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -173,7 +173,7 @@
 
                 <TextBlock
                     Grid.Row="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml
index 1fff8dedde..7757911b3b 100644
--- a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -50,7 +50,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Server" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuServers}" />
@@ -114,7 +114,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="BookClockOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuSubscription}" />
@@ -149,7 +149,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="SettingsOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuSetting}" />
@@ -201,7 +201,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Reload" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
@@ -215,7 +215,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Update" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
@@ -229,7 +229,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="HelpCircleOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
@@ -243,7 +243,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="VolumeHigh" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
@@ -257,7 +257,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Minimize" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
@@ -313,11 +313,7 @@
                             <TabItem x:Name="tabMsgView1">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="MessageTextOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="MessageTextOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -328,11 +324,7 @@
                             <TabItem x:Name="tabClashProxies1">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="ArrowDecisionOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="ArrowDecisionOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -343,11 +335,7 @@
                             <TabItem x:Name="tabClashConnections1">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="LanConnect" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="LanConnect" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -366,11 +354,7 @@
                             <TabItem x:Name="tabProfiles2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="Server" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="Server" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -381,11 +365,7 @@
                             <TabItem x:Name="tabMsgView2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="MessageTextOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="MessageTextOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -396,11 +376,7 @@
                             <TabItem x:Name="tabClashProxies2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="ArrowDecisionOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="ArrowDecisionOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -411,11 +387,7 @@
                             <TabItem x:Name="tabClashConnections2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="LanConnect" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="LanConnect" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
diff --git a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index c9be54e91d..9530df9c67 100644
--- a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -41,26 +41,29 @@ namespace v2rayN.Views
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
             WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
-            if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Horizontal)
+            switch (_config.uiItem.mainGirdOrientation)
             {
-                tabProfiles.Content ??= new ProfilesView();
-                tabMsgView.Content ??= new MsgView();
-                tabClashProxies.Content ??= new ClashProxiesView();
-                tabClashConnections.Content ??= new ClashConnectionsView();
-            }
-            else if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Vertical)
-            {
-                tabProfiles1.Content ??= new ProfilesView();
-                tabMsgView1.Content ??= new MsgView();
-                tabClashProxies1.Content ??= new ClashProxiesView();
-                tabClashConnections1.Content ??= new ClashConnectionsView();
-            }
-            else
-            {
-                tabProfiles2.Content ??= new ProfilesView();
-                tabMsgView2.Content ??= new MsgView();
-                tabClashProxies2.Content ??= new ClashProxiesView();
-                tabClashConnections2.Content ??= new ClashConnectionsView();
+                case EGirdOrientation.Horizontal:
+                    tabProfiles.Content ??= new ProfilesView();
+                    tabMsgView.Content ??= new MsgView();
+                    tabClashProxies.Content ??= new ClashProxiesView();
+                    tabClashConnections.Content ??= new ClashConnectionsView();
+                    break;
+
+                case EGirdOrientation.Vertical:
+                    tabProfiles1.Content ??= new ProfilesView();
+                    tabMsgView1.Content ??= new MsgView();
+                    tabClashProxies1.Content ??= new ClashProxiesView();
+                    tabClashConnections1.Content ??= new ClashConnectionsView();
+                    break;
+
+                case EGirdOrientation.Tab:
+                default:
+                    tabProfiles2.Content ??= new ProfilesView();
+                    tabMsgView2.Content ??= new MsgView();
+                    tabClashProxies2.Content ??= new ClashProxiesView();
+                    tabClashConnections2.Content ??= new ClashConnectionsView();
+                    break;
             }
             pbTheme.Content ??= new ThemeSettingView();
 
@@ -99,30 +102,35 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.ReloadCmd, v => v.menuReload).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlReloadEnabled, v => v.menuReload.IsEnabled).DisposeWith(disposables);
 
-                if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Horizontal)
+                switch (_config.uiItem.mainGirdOrientation)
                 {
-                    gridMain.Visibility = Visibility.Visible;
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies.Visibility).DisposeWith(disposables);
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections.Visibility).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain.SelectedIndex).DisposeWith(disposables);
-                }
-                else if (_config.uiItem.mainGirdOrientation == EGirdOrientation.Vertical)
-                {
-                    gridMain1.Visibility = Visibility.Visible;
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies1.Visibility).DisposeWith(disposables);
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections1.Visibility).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain1.SelectedIndex).DisposeWith(disposables);
-                }
-                else
-                {
-                    gridMain2.Visibility = Visibility.Visible;
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies2.Visibility).DisposeWith(disposables);
-                    this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections2.Visibility).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
+                    case EGirdOrientation.Horizontal:
+                        gridMain.Visibility = Visibility.Visible;
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView.Visibility).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies.Visibility).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections.Visibility).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain.SelectedIndex).DisposeWith(disposables);
+                        break;
+
+                    case EGirdOrientation.Vertical:
+                        gridMain1.Visibility = Visibility.Visible;
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabMsgView1.Visibility).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies1.Visibility).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections1.Visibility).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain1.SelectedIndex).DisposeWith(disposables);
+                        break;
+
+                    case EGirdOrientation.Tab:
+                    default:
+                        gridMain2.Visibility = Visibility.Visible;
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashProxies2.Visibility).DisposeWith(disposables);
+                        this.OneWayBind(ViewModel, vm => vm.ShowClashUI, v => v.tabClashConnections2.Visibility).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
+                        break;
                 }
             });
 
-            this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+            this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
             if (!_config.guiItem.enableHWA)
             {
diff --git a/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml
index 491950d72e..ae3a61a724 100644
--- a/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml
@@ -13,9 +13,9 @@
     x:TypeArguments="vms:MsgViewModel"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
-    <DockPanel Margin="2">
+    <DockPanel Margin="{StaticResource Margin4}">
         <WrapPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             VerticalAlignment="Center"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
@@ -23,7 +23,7 @@
             <ComboBox
                 x:Name="cmbMsgFilter"
                 Width="200"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True"
                 IsEditable="True"
@@ -32,7 +32,7 @@
                 x:Name="btnCopy"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentCopy" />
@@ -41,29 +41,29 @@
                 x:Name="btnClear"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Delete" />
             </Button>
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left"
                 IsChecked="True" />
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
             <ToggleButton
                 x:Name="togScrollToEnd"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left"
                 IsChecked="True" />
         </WrapPanel>
diff --git a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index baa5d8d7e2..e17543261d 100644
--- a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -47,7 +47,7 @@
         <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -78,7 +78,7 @@
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSocksPort}" />
@@ -87,12 +87,12 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefTextBox}" />
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="2"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSocksPortTip}" />
@@ -100,7 +100,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
@@ -108,13 +108,13 @@
                             x:Name="togudpEnabled"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
@@ -125,11 +125,11 @@
                             Orientation="Horizontal">
                             <ToggleButton
                                 x:Name="togsniffingEnabled"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                             <ListBox
                                 x:Name="clbdestOverride"
-                                Margin="4"
+                                Margin="{StaticResource Margin4}"
                                 HorizontalAlignment="Left"
                                 FontSize="{DynamicResource StdFontSize}"
                                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
@@ -138,7 +138,7 @@
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
@@ -146,13 +146,13 @@
                             x:Name="togrouteOnly"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
@@ -160,13 +160,13 @@
                             x:Name="togAllowLANConn"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="5"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
@@ -174,13 +174,13 @@
                             x:Name="togNewPort4LAN"
                             Grid.Row="5"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="6"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsUser}" />
@@ -189,13 +189,13 @@
                             Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="7"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsPass}" />
@@ -204,13 +204,13 @@
                             Grid.Row="7"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
@@ -218,13 +218,13 @@
                             x:Name="togmuxEnabled"
                             Grid.Row="8"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="9"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
@@ -232,13 +232,13 @@
                             x:Name="toglogEnabled"
                             Grid.Row="9"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="10"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
@@ -247,14 +247,14 @@
                             Grid.Row="10"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             materialDesign:HintAssist.Hint="Level"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="11"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
@@ -262,13 +262,13 @@
                             x:Name="togdefAllowInsecure"
                             Grid.Row="11"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="12"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
@@ -277,14 +277,14 @@
                             Grid.Row="12"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="13"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
@@ -293,20 +293,20 @@
                             Grid.Row="13"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="13"
                             Grid.Column="3"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
 
                         <TextBlock
                             Grid.Row="14"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
@@ -315,13 +315,13 @@
                             Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
@@ -329,13 +329,13 @@
                             x:Name="togenableCacheFile4Sbox"
                             Grid.Row="15"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
@@ -348,13 +348,13 @@
                             <TextBox
                                 x:Name="txtUpMbps"
                                 Width="90"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 materialDesign:HintAssist.Hint="Up"
                                 Style="{StaticResource DefTextBox}" />
                             <TextBox
                                 x:Name="txtDownMbps"
                                 Width="90"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 materialDesign:HintAssist.Hint="Down"
                                 Style="{StaticResource DefTextBox}" />
                         </StackPanel>
@@ -362,7 +362,7 @@
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
@@ -370,12 +370,12 @@
                             x:Name="togenableFragment"
                             Grid.Row="17"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="3"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}" />
                     </Grid>
@@ -383,7 +383,7 @@
             </TabItem>
 
             <!--<TabItem Header="{x:Static resx:ResUI.TbSettingsCoreKcp}">
-                <Grid Margin="{StaticResource SettingItemMargin}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -405,7 +405,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="mtu" />
@@ -414,12 +414,12 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="tti" />
@@ -428,12 +428,12 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="uplinkCapacity" />
@@ -442,12 +442,12 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="downlinkCapacity" />
@@ -456,12 +456,12 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="readBufferSize" />
@@ -470,12 +470,12 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="6"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="writeBufferSize" />
@@ -484,12 +484,12 @@
                         Grid.Row="6"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="congestion" />
@@ -497,14 +497,14 @@
                         x:Name="togKcpcongestion"
                         Grid.Row="7"
                         Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         HorizontalAlignment="Left" />
                 </Grid>
             </TabItem>-->
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsN}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid Grid.Row="2" Margin="{StaticResource SettingItemMargin}">
+                    <Grid Grid.Row="2" Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -528,6 +528,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -538,7 +539,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsStartBoot}" />
@@ -546,12 +547,12 @@
                             x:Name="togAutoRun"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="2"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsStartBootTip}"
@@ -560,7 +561,7 @@
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsStatistics}" />
@@ -568,13 +569,13 @@
                             x:Name="togEnableStatistics"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
@@ -582,13 +583,13 @@
                             x:Name="togKeepOlderDedupl"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsIgnoreGeoUpdateCore}" />
@@ -596,13 +597,13 @@
                             x:Name="togIgnoreGeoUpdateCore"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="5"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableAutoAdjustMainLvColWidth}" />
@@ -610,13 +611,13 @@
                             x:Name="togEnableAutoAdjustMainLvColWidth"
                             Grid.Row="5"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="6"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
@@ -624,13 +625,13 @@
                             x:Name="togEnableUpdateSubOnlyRemarksExist"
                             Grid.Row="6"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="7"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsTLS13}" />
@@ -638,13 +639,13 @@
                             x:Name="togEnableSecurityProtocolTls13"
                             Grid.Row="7"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAutoHideStartup}" />
@@ -652,13 +653,13 @@
                             x:Name="togAutoHideStartup"
                             Grid.Row="8"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="9"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
@@ -666,13 +667,13 @@
                             x:Name="togEnableCheckPreReleaseUpdate"
                             Grid.Row="9"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="10"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableDragDropSort}" />
@@ -680,13 +681,13 @@
                             x:Name="togEnableDragDropSort"
                             Grid.Row="10"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="11"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDoubleClick2Activate}" />
@@ -694,13 +695,13 @@
                             x:Name="togDoubleClick2Activate"
                             Grid.Row="11"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="12"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableHWA}" />
@@ -708,13 +709,13 @@
                             x:Name="togEnableHWA"
                             Grid.Row="12"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="14"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAutoUpdateInterval}" />
@@ -723,14 +724,14 @@
                             Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsTrayMenuServersLimit}" />
@@ -739,14 +740,14 @@
                             Grid.Row="15"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
@@ -755,13 +756,13 @@
                             Grid.Row="16"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             MaxDropDownHeight="1000"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="2"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}"
@@ -770,7 +771,7 @@
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestTimeout}" />
@@ -779,13 +780,13 @@
                             Grid.Row="17"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="18"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestUrl}" />
@@ -794,14 +795,14 @@
                             Grid.Row="18"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="19"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedPingTestUrl}" />
@@ -810,14 +811,14 @@
                             Grid.Row="19"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="20"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
@@ -826,7 +827,7 @@
                             Grid.Row="20"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             materialDesign:HintAssist.Hint="Convert Url"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
@@ -834,7 +835,7 @@
                         <TextBlock
                             Grid.Row="21"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsMainGirdOrientation}" />
@@ -843,37 +844,53 @@
                             Grid.Row="21"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="22"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsGeoFilesSource}" />
+                        <ComboBox
+                            x:Name="cmbGetFilesSourceUrl"
+                            Grid.Row="22"
+                            Grid.Column="1"
+                            Width="300"
+                            Margin="{StaticResource Margin8}"
+                            IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsSystemproxy}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Bottom" Orientation="Vertical">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsNotProxyLocalAddress}" />
                             <ToggleButton
                                 x:Name="tognotProxyLocalAddress"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsAdvancedProtocol}" />
                             <ComboBox
                                 x:Name="cmbsystemProxyAdvancedProtocol"
                                 MinWidth="400"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 materialDesign:HintAssist.Hint="Protocol"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
@@ -881,14 +898,14 @@
 
                     <TextBlock
                         Grid.Row="1"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Top"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSettingsExceptionTip}" />
                     <TextBox
                         x:Name="txtsystemProxyExceptions"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Stretch"
                         AcceptsReturn="True"
                         BorderThickness="1"
@@ -899,8 +916,8 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsTunMode}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
-                    <Grid Margin="{StaticResource SettingItemMargin}" DockPanel.Dock="Top">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -919,7 +936,7 @@
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="Strict Route" />
@@ -927,13 +944,13 @@
                             x:Name="togStrictRoute"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="Stack" />
@@ -942,14 +959,14 @@
                             Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="Mtu" />
@@ -958,14 +975,14 @@
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="5"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
@@ -973,13 +990,13 @@
                             x:Name="togEnableExInbound"
                             Grid.Row="5"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="6"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableIPv6Address}" />
@@ -987,14 +1004,14 @@
                             x:Name="togEnableIPv6Address"
                             Grid.Row="6"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                     </Grid>
                 </DockPanel>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreType}">
-                <Grid Margin="{StaticResource SettingItemMargin}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -1011,7 +1028,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="VMess" />
@@ -1020,13 +1037,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Custom" />
@@ -1035,13 +1052,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Shadowsocks" />
@@ -1050,13 +1067,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Socks" />
@@ -1065,13 +1082,13 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="VLESS" />
@@ -1080,13 +1097,13 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="6"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Trojan" />
@@ -1095,7 +1112,7 @@
                         Grid.Row="6"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
             </TabItem>
diff --git a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index cc70ddd0b6..b67aafeba5 100644
--- a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -85,6 +85,10 @@ namespace v2rayN.Views
             {
                 cmbSubConvertUrl.Items.Add(it);
             });
+            Global.GeoFilesSources.ForEach(it =>
+            {
+                cmbGetFilesSourceUrl.Items.Add(it);
+            });
             foreach (EGirdOrientation it in Enum.GetValues(typeof(EGirdOrientation)))
             {
                 cmbMainGirdOrientation.Items.Add(it.ToString());
@@ -145,6 +149,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.Text).DisposeWith(disposables);
 
                 this.Bind(ViewModel, vm => vm.notProxyLocalAddress, v => v.tognotProxyLocalAddress.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);
diff --git a/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml
index 8bfe2d9824..85427c0f6e 100644
--- a/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml
@@ -21,7 +21,7 @@
     </UserControl.Resources>
     <Grid>
         <DockPanel>
-            <WrapPanel Margin="2" DockPanel.Dock="Top">
+            <WrapPanel Margin="{StaticResource Margin4}" DockPanel.Dock="Top">
                 <ListBox
                     x:Name="lstGroup"
                     MaxHeight="200"
@@ -39,7 +39,7 @@
                     x:Name="btnEditSub"
                     Width="30"
                     Height="30"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLeftRight4}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubEdit}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
@@ -48,7 +48,7 @@
                     x:Name="btnAddSub"
                     Width="30"
                     Height="30"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLeftRight4}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubAdd}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
@@ -58,7 +58,7 @@
                     x:Name="btnAutofitColumnWidth"
                     Width="30"
                     Height="30"
-                    Margin="20,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
@@ -66,7 +66,7 @@
                 <TextBox
                     x:Name="txtServerFilter"
                     Width="200"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLeftRight4}"
                     VerticalContentAlignment="Center"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
                     materialDesign:TextFieldAssist.HasClearButton="True"
diff --git a/v2rayn/v2rayN/v2rayN/Views/QrcodeView.xaml b/v2rayn/v2rayN/v2rayN/Views/QrcodeView.xaml
index b24111c2b5..f1af5ab1d6 100644
--- a/v2rayn/v2rayN/v2rayN/Views/QrcodeView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/QrcodeView.xaml
@@ -10,7 +10,7 @@
     d:DesignWidth="300"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
-    <Grid Margin="30">
+    <Grid Margin="32">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -38,7 +38,7 @@
         <Button
             Grid.Row="2"
             Width="100"
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
             Content="{x:Static resx:ResUI.TbConfirm}"
diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 75b764ec64..cca103a912 100644
--- a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -23,7 +23,7 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel>
-        <Grid Margin="8" DockPanel.Dock="Top">
+        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -41,7 +41,7 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
@@ -50,20 +50,20 @@
                 Grid.Row="0"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource DefTextBox}" />
             <ToggleButton
                 x:Name="togEnabled"
                 Grid.Row="0"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left" />
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="outboundTag" />
@@ -72,13 +72,13 @@
                 Grid.Row="1"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 MaxDropDownHeight="1000"
                 Style="{StaticResource DefComboBox}" />
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbRuleMatchingTips}" />
@@ -86,7 +86,7 @@
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="port" />
@@ -95,13 +95,13 @@
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource DefTextBox}" />
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}">
                 <Hyperlink Click="linkRuleobjectDoc_Click">
@@ -113,7 +113,7 @@
             <TextBlock
                 Grid.Row="3"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="protocol" />
@@ -121,7 +121,7 @@
                 x:Name="clbProtocol"
                 Grid.Row="3"
                 Grid.Column="1"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 FontSize="{DynamicResource StdFontSize}"
                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
@@ -129,7 +129,7 @@
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="inboundTag" />
@@ -137,14 +137,14 @@
                 x:Name="clbInboundTag"
                 Grid.Row="4"
                 Grid.Column="1"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 FontSize="{DynamicResource StdFontSize}"
                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
 
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="network" />
@@ -153,21 +153,21 @@
                 Grid.Row="5"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 MaxDropDownHeight="1000"
                 Style="{StaticResource DefComboBox}" />
 
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbRoutingTips}" />
         </Grid>
 
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -188,14 +188,14 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <Grid Margin="{StaticResource SettingItemMargin}">
+        <Grid Margin="{StaticResource Margin8}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="10" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 9edd22878b..98f684c21c 100644
--- a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -32,7 +32,7 @@
                 <Button x:Name="menuRuleAdd">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Plus" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRuleAdd}" />
@@ -42,7 +42,7 @@
                 <Button x:Name="menuImportRulesFromFile">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromFile}" />
@@ -52,7 +52,7 @@
                 <Button x:Name="menuImportRulesFromClipboard">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromClipboard}" />
@@ -62,7 +62,7 @@
                 <Button x:Name="menuImportRulesFromUrl">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromUrl}" />
@@ -72,7 +72,7 @@
         </ToolBarTray>
 
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -85,14 +85,14 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <Grid Margin="8" DockPanel.Dock="Top">
+        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -109,7 +109,7 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
@@ -123,7 +123,7 @@
                     Grid.Row="0"
                     Grid.Column="1"
                     Width="300"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
@@ -131,14 +131,14 @@
                     TextWrapping="Wrap" />
 
                 <TextBlock
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     AcceptsReturn="True"
                     Style="{StaticResource DefTextBox}" />
@@ -147,7 +147,7 @@
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
@@ -158,24 +158,24 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy"
                     Width="200"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     Style="{StaticResource DefComboBox}" />
                 <TextBlock
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
                     Width="200"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     Style="{StaticResource DefComboBox}" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvUrl}" />
@@ -184,7 +184,7 @@
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="600"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
                 Style="{StaticResource DefTextBox}"
@@ -193,7 +193,7 @@
             <TextBlock
                 Grid.Row="3"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvCustomIcon}" />
@@ -202,7 +202,7 @@
                 Grid.Row="3"
                 Grid.Column="1"
                 Width="600"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
                 Style="{StaticResource DefTextBox}"
@@ -211,14 +211,14 @@
                 x:Name="btnBrowseCustomIcon"
                 Grid.Row="3"
                 Grid.Column="2"
-                Margin="2,0,8,0"
+                Margin="{StaticResource MarginLeftRight4}"
                 Content="{x:Static resx:ResUI.TbBrowse}"
                 Style="{StaticResource DefButton}" />
 
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}">
                 <Hyperlink Click="linkCustomRulesetPath4Singbox">
@@ -231,7 +231,7 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="600"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
                 Style="{StaticResource DefTextBox}"
@@ -240,7 +240,7 @@
                 x:Name="btnBrowseCustomRulesetPath4Singbox"
                 Grid.Row="4"
                 Grid.Column="2"
-                Margin="2,0,8,0"
+                Margin="{StaticResource MarginLeftRight4}"
                 Content="{x:Static resx:ResUI.TbBrowse}"
                 Style="{StaticResource DefButton}" />
         </Grid>
diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 18bc01681b..c49f4c4959 100644
--- a/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -34,12 +34,12 @@
                 VerticalAlignment="Center"
                 ClipToBounds="True"
                 Style="{StaticResource MaterialDesignToolBar}">
-                <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                     <MenuItem x:Name="menuRoutingBasic" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Server" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuRoutingBasic}" />
@@ -51,12 +51,12 @@
                             Header="{x:Static resx:ResUI.menuRoutingBasicImportRules}" />
                     </MenuItem>
                 </Menu>
-                <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                     <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Routes" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuRoutingAdvanced}" />
@@ -74,17 +74,17 @@
                 </Menu>
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbenableRoutingAdvanced}" />
                 <ToggleButton
                     x:Name="togenableRoutingAdvanced"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     HorizontalAlignment="Left" />
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}">
                     <Hyperlink Click="linkdomainStrategy_Click">
@@ -95,22 +95,22 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy"
                     Width="110"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     Style="{StaticResource DefComboBox}" />
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbdomainMatcher}" />
                 <ComboBox
                     x:Name="cmbdomainMatcher"
                     Width="60"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     Style="{StaticResource DefComboBox}" />
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}">
                     <Hyperlink Click="linkdomainStrategy4Singbox_Click">
@@ -121,13 +121,13 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
                     Width="100"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     Style="{StaticResource DefComboBox}" />
             </ToolBar>
         </ToolBarTray>
 
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -146,7 +146,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -158,7 +158,6 @@
                 <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
                     <DataGrid
                         x:Name="lstRoutings"
-                        Margin="2,0"
                         AutoGenerateColumns="False"
                         BorderThickness="1"
                         CanUserAddRows="False"
@@ -233,7 +232,7 @@
 
             <TabControl x:Name="tabBasic">
                 <TabItem Header="{x:Static resx:ResUI.TbRoutingTabProxy}">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
@@ -266,7 +265,7 @@
                 </TabItem>
 
                 <TabItem Header="{x:Static resx:ResUI.TbRoutingTabDirect}">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
@@ -299,7 +298,7 @@
                 </TabItem>
 
                 <TabItem Header="{x:Static resx:ResUI.TbRoutingTabBlock}">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml b/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml
index 71d7090f29..3c0d6e5c1e 100644
--- a/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml
@@ -18,46 +18,46 @@
         <materialDesign:ColorZone Height="50" Mode="Standard">
             <DockPanel>
                 <StackPanel
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Right">
                     <TextBlock x:Name="txtSpeedProxyDisplay" Style="{StaticResource StatusbarItem}" />
-                    <Border Margin="2" />
+                    <Border Margin="{StaticResource Margin4}" />
                     <TextBlock x:Name="txtSpeedDirectDisplay" Style="{StaticResource StatusbarItem}" />
                 </StackPanel>
 
                 <StackPanel
                     Width="240"
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
                     <TextBlock x:Name="txtInboundDisplay" Style="{StaticResource StatusbarItem}" />
-                    <Border Margin="2" />
+                    <Border Margin="{StaticResource Margin4}" />
                     <TextBlock x:Name="txtInboundLanDisplay" Style="{StaticResource StatusbarItem}" />
                 </StackPanel>
 
                 <StackPanel
                     x:Name="spEnableTun"
                     Width="auto"
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
                     <TextBlock Text="{x:Static resx:ResUI.TbEnableTunAs}" />
                     <ToggleButton
                         x:Name="togEnableTun"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
                 </StackPanel>
 
                 <StackPanel
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left"
                     Orientation="Horizontal">
                     <ComboBox
                         x:Name="cmbSystemProxy"
                         Width="120"
-                        Margin="8,0"
+                        Margin="{StaticResource MarginLeftRight8}"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
                         FontSize="{DynamicResource StdFontSize}"
                         Style="{StaticResource MaterialDesignFloatingHintComboBox}">
@@ -70,16 +70,16 @@
                     <ComboBox
                         x:Name="cmbRoutings2"
                         Width="150"
-                        Margin="8,0"
+                        Margin="{StaticResource MarginLeftRight8}"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
                         DisplayMemberPath="remarks"
                         FontSize="{DynamicResource StdFontSize}"
                         Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
                 </StackPanel>
 
-                <StackPanel Margin="8,0" VerticalAlignment="Center">
+                <StackPanel Margin="{StaticResource MarginLeftRight8}" VerticalAlignment="Center">
                     <TextBlock x:Name="txtRunningServerDisplay" Style="{StaticResource StatusbarItem}" />
-                    <Border Margin="2" />
+                    <Border Margin="{StaticResource Margin4}" />
                     <TextBlock x:Name="txtRunningInfoDisplay" Style="{StaticResource StatusbarItem}" />
                 </StackPanel>
             </DockPanel>
@@ -99,7 +99,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxyClear2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyClear}" />
@@ -111,7 +111,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxySet2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxySet}" />
@@ -123,7 +123,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxyNothing2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyNothing}" />
@@ -135,7 +135,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxyPac2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyPac}" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml
index b571a74d19..be43a47a57 100644
--- a/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -29,9 +29,9 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -44,7 +44,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -79,14 +79,14 @@
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     Style="{StaticResource ModuleTitle}"
                     Text="{x:Static resx:ResUI.menuSubscription}" />
 
                 <TextBlock
                     Grid.Row="1"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvRemarks}" />
@@ -95,7 +95,7 @@
                     x:Name="txtRemarks"
                     Grid.Row="1"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}"
@@ -104,7 +104,7 @@
                 <TextBlock
                     Grid.Row="2"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvUrl}" />
@@ -112,7 +112,7 @@
                     x:Name="txtUrl"
                     Grid.Row="2"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
@@ -127,14 +127,14 @@
                     Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
                     <StackPanel>
                         <TextBlock
-                            Margin="4"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.LvMoreUrl}" />
                         <TextBox
                             x:Name="txtMoreUrl"
                             Width="400"
-                            Margin="4"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Top"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                             AcceptsReturn="True"
@@ -147,7 +147,7 @@
                 <TextBlock
                     Grid.Row="3"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvEnabled}" />
@@ -155,17 +155,17 @@
                 <DockPanel
                     Grid.Row="3"
                     Grid.Column="1"
-                    Margin="4">
+                    Margin="{StaticResource Margin4}">
                     <ToggleButton
                         x:Name="togEnable"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         DockPanel.Dock="Left" />
 
                     <TextBox
                         x:Name="txtAutoUpdateInterval"
                         Width="200"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                         AcceptsReturn="True"
@@ -173,7 +173,7 @@
                         Style="{StaticResource MyOutlinedTextBox}" />
 
                     <TextBlock
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
@@ -183,7 +183,7 @@
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvFilter}" />
@@ -191,7 +191,7 @@
                     x:Name="txtFilter"
                     Grid.Row="5"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
@@ -200,7 +200,7 @@
                 <TextBlock
                     Grid.Row="6"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvConvertTarget}" />
@@ -208,7 +208,7 @@
                     x:Name="cmbConvertTarget"
                     Grid.Row="6"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
                     MaxDropDownHeight="1000"
                     Style="{StaticResource MyOutlinedTextComboBox}" />
@@ -216,14 +216,14 @@
                 <TextBlock
                     Grid.Row="7"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.LvUserAgent}" />
                 <TextBox
                     x:Name="txtUserAgent"
                     Grid.Row="7"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
@@ -233,7 +233,7 @@
                 <TextBlock
                     Grid.Row="8"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvSort}" />
@@ -242,7 +242,7 @@
                     Grid.Row="8"
                     Grid.Column="1"
                     Width="100"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
@@ -251,7 +251,7 @@
                 <TextBlock
                     Grid.Row="9"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvPrevProfile}" />
@@ -259,7 +259,7 @@
                     x:Name="txtPrevProfile"
                     Grid.Row="9"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
                     AcceptsReturn="True"
@@ -268,7 +268,7 @@
                 <TextBlock
                     Grid.Row="10"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvNextProfile}" />
@@ -276,7 +276,7 @@
                     x:Name="txtNextProfile"
                     Grid.Row="10"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
                     AcceptsReturn="True"
@@ -285,7 +285,7 @@
                 <TextBlock
                     Grid.Row="11"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbPreSocksPort4Sub}" />
@@ -293,7 +293,7 @@
                     x:Name="txtPreSocksPort"
                     Grid.Row="11"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TipPreSocksPort}"
                     AcceptsReturn="True"
diff --git a/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml
index 7042ce3239..7a78b8a95f 100644
--- a/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@@ -36,7 +36,7 @@
                     <Button x:Name="menuSubAdd">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Plus" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubAdd}" />
@@ -46,7 +46,7 @@
                     <Button x:Name="menuSubDelete">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Delete" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubDelete}" />
@@ -56,7 +56,7 @@
                     <Button x:Name="menuSubEdit">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Edit" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubEdit}" />
@@ -66,7 +66,7 @@
                     <Button x:Name="menuSubShare">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="QrcodePlus" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubShare}" />
@@ -75,7 +75,7 @@
                     <Button x:Name="menuClose" IsCancel="True">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Close" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuClose}" />
diff --git a/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml b/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml
index 7559e25c87..ab3dee3f3f 100644
--- a/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml
+++ b/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml
@@ -12,7 +12,7 @@
     x:TypeArguments="vms:ThemeSettingViewModel"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
-    <StackPanel Margin="8">
+    <StackPanel Margin="{StaticResource Margin8}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -35,7 +35,7 @@
                 x:Name="togDarkMode"
                 Grid.Row="0"
                 Grid.Column="1"
-                Margin="8" />
+                Margin="{StaticResource Margin8}" />
 
             <TextBlock
                 Grid.Row="1"
@@ -47,7 +47,7 @@
                 x:Name="followSystemTheme"
                 Grid.Row="1"
                 Grid.Column="1"
-                Margin="8" />
+                Margin="{StaticResource Margin8}" />
 
             <TextBlock
                 Grid.Row="2"
@@ -60,7 +60,7 @@
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 DisplayMemberPath="Name"
                 Style="{StaticResource DefComboBox}" />
 
@@ -75,7 +75,7 @@
                 Grid.Row="3"
                 Grid.Column="1"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Style="{StaticResource DefComboBox}" />
 
             <TextBlock
@@ -89,7 +89,7 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Style="{StaticResource DefComboBox}" />
         </Grid>
     </StackPanel>
diff --git a/yass/.gitignore b/yass/.gitignore
index bc10831bf3..882950ddd2 100644
--- a/yass/.gitignore
+++ b/yass/.gitignore
@@ -85,3 +85,7 @@ local.properties
 /third_party/rust-ohos
 /*-alpine320-sysroot
 *.flatpak
+*.hap
+*.hsp
+*.har
+*.app
diff --git a/yass/README.md b/yass/README.md
index 8dabd3113e..cd76ce0d07 100644
--- a/yass/README.md
+++ b/yass/README.md
@@ -44,6 +44,7 @@ See [Status of Package Store](https://github.com/Chilledheart/yass/wiki/Status-o
 - CLI [download tgz for riscv64][cli_tgz_riscv64_url] or [download tgz for riscv32][cli_tgz_riscv32_url] (require glibc >= 2.36)
 - CLI(openwrt) [download tgz for amd64][cli_openwrt_amd64_url] or [download tgz for i486][cli_openwrt_i486_url] or [download tgz for aarch64 generic][cli_openwrt_aarch64_url] (require openwrt >= 23.05.3)
 - CLI(musl) [download tgz for amd64][cli_musl_amd64_url] or [download tgz for i386][cli_musl_i386_url] (static build)
+- CLI(musl) [download tgz for aarch64][cli_musl_aarch64_url] or [download tgz for armhf][cli_musl_armhf_url] (static build)
 
 [![aur yass-proxy-cli](https://img.shields.io/aur/version/yass-proxy-cli)](https://aur.archlinux.org/packages/yass-proxy-cli)
 
@@ -192,6 +193,8 @@ Start from wiki's [Guide](https://github.com/Chilledheart/yass/wiki/Debug-Guide)
 
 [cli_musl_amd64_url]: https://github.com/Chilledheart/yass/releases/download/1.14.4/yass_cli-linux-musl-release-amd64-1.14.4.tgz
 [cli_musl_i386_url]: https://github.com/Chilledheart/yass/releases/download/1.14.4/yass_cli-linux-musl-release-i386-1.14.4.tgz
+[cli_musl_aarch64_url]: https://github.com/Chilledheart/yass/releases/download/1.14.4/yass_cli-linux-musl-release-aarch64-1.14.4.tgz
+[cli_musl_armhf_url]: https://github.com/Chilledheart/yass/releases/download/1.14.4/yass_cli-linux-musl-release-armhf-1.14.4.tgz
 
 [android_64_apk_url]: https://github.com/Chilledheart/yass/releases/download/1.14.4/yass-android-release-arm64-1.14.4.apk
 [android_32_apk_url]: https://github.com/Chilledheart/yass/releases/download/1.14.4/yass-android-release-arm-1.14.4.apk
diff --git a/yass/cmake/platforms/Harmony.cmake b/yass/cmake/platforms/Harmony.cmake
index 44816e89b5..2f4e8f94cb 100644
--- a/yass/cmake/platforms/Harmony.cmake
+++ b/yass/cmake/platforms/Harmony.cmake
@@ -1,7 +1,30 @@
-set(OHOS TRUE)
-set(CMAKE_SYSTEM_NAME OHOS)
 set(CMAKE_SYSTEM_VERSION 1)
 
+# Set OHOS_SDK_NATIVE, ignore if we are running try-compile tasks
+if (DEFINED OHOS_SDK_NATIVE)
+  file(TO_CMAKE_PATH "${OHOS_SDK_NATIVE}" OHOS_SDK_NATIVE)
+endif()
+
+# Sdk native version, ignore if we are running try-compile tasks
+if (DEFINED OHOS_SDK_NATIVE)
+  file(STRINGS "${OHOS_SDK_NATIVE}/oh-uni-package.json" NATIVE_VER REGEX "\"version\":.*")
+  string(REGEX REPLACE "\"version\":(.*)$" "\\1" SDK_NATIVE_VERSION "${NATIVE_VER}")
+  string(STRIP "${SDK_NATIVE_VERSION}" SDK_NATIVE_VERSION)
+  string(REGEX REPLACE "^\"(.*)\"$" "\\1" SDK_NATIVE_VERSION "${SDK_NATIVE_VERSION}")
+endif()
+
+# Sdk api level, ignore if we are running try-compile tasks (uOHOS_APILEVEL
+if (DEFINED OHOS_SDK_NATIVE)
+  file(STRINGS "${OHOS_SDK_NATIVE}/oh-uni-package.json" API_VER REGEX "\"apiVersion\":.*")
+  string(REGEX REPLACE "\"apiVersion\":(.*),$" "\\1" OHOS_APILEVEL "${API_VER}")
+  string(STRIP "${OHOS_APILEVEL}" OHOS_APILEVEL)
+  string(REGEX REPLACE "^\"(.*)\"$" "\\1" OHOS_APILEVEL "${OHOS_APILEVEL}")
+endif()
+
+# Common default settings
+set(OHOS OHOS)
+set(CMAKE_SYSTEM_NAME OHOS)
+
 if(NOT DEFINED OHOS_PLATFORM_LEVEL)
   set(OHOS_PLATFORM_LEVEL 1)
 endif()
@@ -201,7 +224,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "${OHOS_RELEASE_COMPILER_FLAGS} ${CMAKE_CXX_FLAGS_RE
 
 # set the cmake global asmflags
 set(CMAKE_ASM_FLAGS "" CACHE STRING "Flags for all build types.")
-#set(CMAKE_ASM_FLAGS "-mrelax-relocations=no" CACHE STRING "Flags for all build types.")
 set(CMAKE_ASM_FLAGS "${OHOS_ASM_COMPILER_FLAGS} ${CMAKE_ASM_FLAGS} -D__MUSL__")
 
 set(CMAKE_ASM_FLAGS_DEBUG "" CACHE STRING "Flags for debug variant builds.")
@@ -245,3 +267,4 @@ set(CMAKE_AR                "${OHOS_AR}" CACHE FILEPATH "Archiver")
 set(CMAKE_CXX_COMPILER_AR   "${OHOS_AR}" CACHE FILEPATH "Archiver")
 set(CMAKE_RANLIB            "${OHOS_RANLIB}" CACHE FILEPATH "Ranlib")
 set(CMAKE_CXX_COMPILER_RANLIB "${OHOS_RANLIB}" CACHE FILEPATH "Ranlib")
+set(UNIX TRUE CACHE BOOL FROCE)
diff --git a/yass/harmony/.gitignore b/yass/harmony/.gitignore
index fbabf77101..778c6b2b51 100644
--- a/yass/harmony/.gitignore
+++ b/yass/harmony/.gitignore
@@ -8,4 +8,5 @@
 /.clangd
 /.clang-format
 /.clang-tidy
-**/.test
\ No newline at end of file
+**/.test
+/entry/libs/
diff --git a/yass/harmony/build-profile.json5 b/yass/harmony/build-profile.json5
index f273b3048f..cde2069de4 100644
--- a/yass/harmony/build-profile.json5
+++ b/yass/harmony/build-profile.json5
@@ -5,7 +5,7 @@
       {
         "name": "default",
         "signingConfig": "default",
-        "compatibleSdkVersion": "4.0.0(10)",
+        "compatibleSdkVersion": "5.0.0(12)",
         "runtimeOS": "HarmonyOS"
       }
     ],
diff --git a/yass/harmony/entry/src/main/ets/pages/DetailPage.ets b/yass/harmony/entry/src/main/ets/pages/DetailPage.ets
index 2b8b696208..be541c62ec 100644
--- a/yass/harmony/entry/src/main/ets/pages/DetailPage.ets
+++ b/yass/harmony/entry/src/main/ets/pages/DetailPage.ets
@@ -8,8 +8,7 @@ import { YassDataItem } from '../viewmodel/YassDataItem';
 import YassViewModel from '../viewmodel/YassViewModel';
 import hilog from '@ohos.hilog';
 import yass from 'libyass.so';
-// import wifiManager from '@ohos.wifiManager';
-import wifi from '@ohos.wifi';
+import { wifiManager } from '@kit.ConnectivityKit';
 import UIAbility from '@ohos.app.ability.UIAbility';
 
 /**
@@ -208,14 +207,9 @@ struct DetailPage {
   }
 
   getWifiAddress() {
-    if (wifi.isConnected()) {
-      return wifi.getIpInfo().ipAddress.toString();
-    }
-    /* FIXME crash on emulator
     if (wifiManager.isConnected()) {
       return wifiManager.getIpInfo().ipAddress.toString();
     }
-    */
     return "0.0.0.0";
   }
 }
diff --git a/yass/harmony/entry/src/main/ets/view/DetailListComponent.ets b/yass/harmony/entry/src/main/ets/view/DetailListComponent.ets
index 1b833a61f4..e1d6225488 100644
--- a/yass/harmony/entry/src/main/ets/view/DetailListComponent.ets
+++ b/yass/harmony/entry/src/main/ets/view/DetailListComponent.ets
@@ -10,7 +10,7 @@ import yass from 'libyass.so';
  */
 @Component
 export struct DetailListComponent {
-  @Link private dataItem: YassDataItem;
+  @Link dataItem: YassDataItem;
 
   build() {
     Column() {
diff --git a/yass/rpmlintrc b/yass/rpmlintrc
new file mode 100644
index 0000000000..fce1b71ffe
--- /dev/null
+++ b/yass/rpmlintrc
@@ -0,0 +1,8 @@
+# -*- python -*-
+
+# Override rpmlint default configuration.
+
+from Config import *
+
+# for old rpmlint such as 1.10 (centos 8)
+setOption("NetworkEnabled", False)
diff --git a/yass/scripts/build-hap.sh b/yass/scripts/build-hap.sh
new file mode 100755
index 0000000000..18e9ccf098
--- /dev/null
+++ b/yass/scripts/build-hap.sh
@@ -0,0 +1,112 @@
+#!/bin/bash
+set -x
+set -e
+PWD=$(dirname "${BASH_SOURCE[0]}")
+cd $PWD/..
+
+# update LAST_CHANGE
+if [ -d '.git' ]; then
+  LAST_CHANGE_REF=$(/usr/bin/git rev-parse HEAD)
+  TAG=$(/usr/bin/git describe --abbrev=0 --tags HEAD)
+  SUBTAG=$(/usr/bin/git rev-list $TAG..HEAD --count)
+  ABBREV_REF="$TAG{$SUBTAG}"
+  echo -n "${LAST_CHANGE_REF}-refs/branch-heads/${ABBREV_REF}" > LAST_CHANGE
+  echo -n "${TAG}" > TAG
+  echo -n "${SUBTAG}" > SUBTAG
+else
+  TAG=$(< TAG)
+  SUBTAG=$(< SUBTAG)
+fi
+
+VERSION=$TAG
+SUBVERSION=$SUBTAG
+SUBVERSION_SUFFIX="-$SUBTAG"
+if [ $SUBVERSION == 0 ]; then
+  SUBVERSION_SUFFIX=""
+fi
+
+ARCH=${ARCH:-arm64}
+BUILD_TYPE=${BUILD_TYPE:-release}
+
+case "$ARCH" in
+  arm64)
+    ABI="arm64-v8a"
+    ;;
+  arm)
+    ABI="armeabi-v7a"
+    ;;
+  x64)
+    ABI="arm64-v8a"
+    ;;
+  *)
+    echo "Invalid ARCH: $ARCH"
+    exit -1
+    ;;
+esac
+
+function prepare_build() {
+pushd tools
+go build
+popd
+}
+
+function cleanup() {
+pushd harmony
+hvigorw clean --no-daemon
+rm -rf entry/libs
+popd
+}
+
+function strip_binary() {
+pushd build-harmony-${ARCH}
+rm -f libyass.so
+ninja yass
+../third_party/llvm-build/Release+Asserts/bin/llvm-objcopy --only-keep-debug libyass.so libyass.so.dbg
+../third_party/llvm-build/Release+Asserts/bin/llvm-objcopy --strip-debug libyass.so
+../third_party/llvm-build/Release+Asserts/bin/llvm-objcopy --add-gnu-debuglink=libyass.so.dbg libyass.so
+popd
+}
+
+function build() {
+./tools/build --system harmony --arch ${ARCH} -no-packaging -nc
+}
+
+function copy_binary() {
+pushd harmony
+mkdir -p entry/libs/${ABI}
+cp -fv ../build-harmony-${ARCH}/libyass.so entry/libs/${ABI}
+popd
+}
+
+function package_hap() {
+pushd harmony
+hvigorw assembleHap --mode module -p product=default -p buildMode=${BUILD_TYPE} --no-daemon
+cp -fv entry/build/default/outputs/default/entry-default-unsigned.hap \
+  ../yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}.hap
+popd
+}
+
+function package_debuginfo() {
+pushd build-harmony-${ARCH}
+rm -rf yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}
+mkdir yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}
+cp -fv libyass.so.dbg yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}/
+tar cfz ../yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}-debuginfo.tgz \
+  yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}
+rm -rf yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}
+popd
+}
+
+function inspect_pkgs() {
+7z l yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}.hap
+tar tvf yass-harmony-${BUILD_TYPE}-${ARCH}-${VERSION}${SUBVERSION_SUFFIX}-debuginfo.tgz
+}
+
+cleanup
+prepare_build
+build
+strip_binary
+copy_binary
+package_hap
+package_debuginfo
+inspect_pkgs
diff --git a/yass/scripts/build-rpm.sh b/yass/scripts/build-rpm.sh
index a5c4c0feba..57515adabb 100755
--- a/yass/scripts/build-rpm.sh
+++ b/yass/scripts/build-rpm.sh
@@ -3,6 +3,7 @@ set -x
 set -e
 PWD=$(dirname "${BASH_SOURCE[0]}")
 cd $PWD/..
+PROJECT_HOME="$PWD"
 
 # update LAST_CHANGE
 if [ -d '.git' ]; then
@@ -87,7 +88,7 @@ fi
 
 pushd $HOME/rpmbuild/SPECS/
 rpmbuild --define "_topdir $HOME/rpmbuild" -v $rpm_options -bs yass.spec
-rpmlint "$HOME/rpmbuild/SRPMS/yass-${RPM_VERSION}-${RPM_SUBVERSION}${SUFFIX}.src.rpm"
+rpmlint --verbose --file "$PROJECT_HOME/rpmlintrc" "$HOME/rpmbuild/SRPMS/yass-${RPM_VERSION}-${RPM_SUBVERSION}${SUFFIX}.src.rpm"
 rpmbuild --define "_topdir $HOME/rpmbuild" -v $rpm_options -bb yass.spec
 popd
 
diff --git a/yass/third_party/libc++/CMakeLists.txt b/yass/third_party/libc++/CMakeLists.txt
index 187ba592b0..1447970675 100644
--- a/yass/third_party/libc++/CMakeLists.txt
+++ b/yass/third_party/libc++/CMakeLists.txt
@@ -59,7 +59,7 @@ foreach(CompilerFlag ${CompilerFlags})
   string(REPLACE "-stdlib=libc++" "" ${CompilerFlag} "${${CompilerFlag}}")
 endforeach()
 
-set(libcxx_CR "b6b3d2a1868d818c256a77e5f7127ea2855d3c47")
+set(libcxx_CR "6a68fd412b9aecd515a20a7cf84d11b598bfaf96")
 # Fixed libc++ configuration macros are in
 # buildtools/third_party/libc++/__config_site. This config only has defines
 # that vary depending on gn args, and non-define flags.
diff --git a/yass/third_party/libc++/trunk/.clang-format b/yass/third_party/libc++/trunk/.clang-format
index 84a2afaf28..a6154c7c4a 100644
--- a/yass/third_party/libc++/trunk/.clang-format
+++ b/yass/third_party/libc++/trunk/.clang-format
@@ -30,7 +30,6 @@ AttributeMacros: [
                   '_LIBCPP_DEPRECATED_IN_CXX20',
                   '_LIBCPP_DEPRECATED_IN_CXX23',
                   '_LIBCPP_DEPRECATED',
-                  '_LIBCPP_DISABLE_EXTENTSION_WARNING',
                   '_LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION',
                   '_LIBCPP_EXPORTED_FROM_ABI',
                   '_LIBCPP_EXTERN_TEMPLATE_TYPE_VIS',
@@ -38,7 +37,6 @@ AttributeMacros: [
                   '_LIBCPP_HIDDEN',
                   '_LIBCPP_HIDE_FROM_ABI_AFTER_V1',
                   '_LIBCPP_HIDE_FROM_ABI',
-                  '_LIBCPP_INTERNAL_LINKAGE',
                   '_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS',
                   '_LIBCPP_NO_SANITIZE',
                   '_LIBCPP_NO_UNIQUE_ADDRESS',
diff --git a/yass/third_party/libc++/trunk/include/CMakeLists.txt b/yass/third_party/libc++/trunk/include/CMakeLists.txt
index c2a597f49e..3431ea7dab 100644
--- a/yass/third_party/libc++/trunk/include/CMakeLists.txt
+++ b/yass/third_party/libc++/trunk/include/CMakeLists.txt
@@ -747,6 +747,7 @@ set(files
   __type_traits/common_type.h
   __type_traits/conditional.h
   __type_traits/conjunction.h
+  __type_traits/container_traits.h
   __type_traits/copy_cv.h
   __type_traits/copy_cvref.h
   __type_traits/datasizeof.h
diff --git a/yass/third_party/libc++/trunk/include/__atomic/aliases.h b/yass/third_party/libc++/trunk/include/__atomic/aliases.h
index e27e09af6b..afc64eaaa6 100644
--- a/yass/third_party/libc++/trunk/include/__atomic/aliases.h
+++ b/yass/third_party/libc++/trunk/include/__atomic/aliases.h
@@ -37,7 +37,7 @@ using atomic_long   = atomic<long>;
 using atomic_ulong  = atomic<unsigned long>;
 using atomic_llong  = atomic<long long>;
 using atomic_ullong = atomic<unsigned long long>;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 using atomic_char8_t = atomic<char8_t>;
 #endif
 using atomic_char16_t = atomic<char16_t>;
diff --git a/yass/third_party/libc++/trunk/include/__atomic/atomic_lock_free.h b/yass/third_party/libc++/trunk/include/__atomic/atomic_lock_free.h
index 0715439db4..3ae9b8856e 100644
--- a/yass/third_party/libc++/trunk/include/__atomic/atomic_lock_free.h
+++ b/yass/third_party/libc++/trunk/include/__atomic/atomic_lock_free.h
@@ -18,7 +18,7 @@
 #if defined(__CLANG_ATOMIC_BOOL_LOCK_FREE)
 #  define ATOMIC_BOOL_LOCK_FREE __CLANG_ATOMIC_BOOL_LOCK_FREE
 #  define ATOMIC_CHAR_LOCK_FREE __CLANG_ATOMIC_CHAR_LOCK_FREE
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 #    define ATOMIC_CHAR8_T_LOCK_FREE __CLANG_ATOMIC_CHAR8_T_LOCK_FREE
 #  endif
 #  define ATOMIC_CHAR16_T_LOCK_FREE __CLANG_ATOMIC_CHAR16_T_LOCK_FREE
@@ -32,7 +32,7 @@
 #elif defined(__GCC_ATOMIC_BOOL_LOCK_FREE)
 #  define ATOMIC_BOOL_LOCK_FREE __GCC_ATOMIC_BOOL_LOCK_FREE
 #  define ATOMIC_CHAR_LOCK_FREE __GCC_ATOMIC_CHAR_LOCK_FREE
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 #    define ATOMIC_CHAR8_T_LOCK_FREE __GCC_ATOMIC_CHAR8_T_LOCK_FREE
 #  endif
 #  define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE
diff --git a/yass/third_party/libc++/trunk/include/__bit/byteswap.h b/yass/third_party/libc++/trunk/include/__bit/byteswap.h
index 6225ecf2f9..d761e6a6fd 100644
--- a/yass/third_party/libc++/trunk/include/__bit/byteswap.h
+++ b/yass/third_party/libc++/trunk/include/__bit/byteswap.h
@@ -32,7 +32,7 @@ template <integral _Tp>
     return __builtin_bswap32(__val);
   } else if constexpr (sizeof(_Tp) == 8) {
     return __builtin_bswap64(__val);
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   } else if constexpr (sizeof(_Tp) == 16) {
 #    if __has_builtin(__builtin_bswap128)
     return __builtin_bswap128(__val);
@@ -40,7 +40,7 @@ template <integral _Tp>
     return static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val))) << 64 |
            static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val >> 64)));
 #    endif // __has_builtin(__builtin_bswap128)
-#  endif   // _LIBCPP_HAS_NO_INT128
+#  endif   // _LIBCPP_HAS_INT128
   } else {
     static_assert(sizeof(_Tp) == 0, "byteswap is unimplemented for integral types of this size");
   }
diff --git a/yass/third_party/libc++/trunk/include/__bit/countl.h b/yass/third_party/libc++/trunk/include/__bit/countl.h
index bb09e8e5b5..d4df1d049b 100644
--- a/yass/third_party/libc++/trunk/include/__bit/countl.h
+++ b/yass/third_party/libc++/trunk/include/__bit/countl.h
@@ -39,7 +39,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
   return __builtin_clzll(__x);
 }
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR int __libcpp_clz(__uint128_t __x) _NOEXCEPT {
 #  if __has_builtin(__builtin_clzg)
   return __builtin_clzg(__x);
@@ -57,7 +57,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR int __libcpp_clz(__uint128_t __x)
                             : __builtin_clzll(static_cast<unsigned long long>(__x >> 64));
 #  endif
 }
-#endif // _LIBCPP_HAS_NO_INT128
+#endif // _LIBCPP_HAS_INT128
 
 template <class _Tp>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 int __countl_zero(_Tp __t) _NOEXCEPT {
diff --git a/yass/third_party/libc++/trunk/include/__charconv/tables.h b/yass/third_party/libc++/trunk/include/__charconv/tables.h
index 6b93536b8c..9568bf841c 100644
--- a/yass/third_party/libc++/trunk/include/__charconv/tables.h
+++ b/yass/third_party/libc++/trunk/include/__charconv/tables.h
@@ -95,7 +95,7 @@ inline constexpr uint64_t __pow10_64[20] = {
     UINT64_C(1000000000000000000),
     UINT64_C(10000000000000000000)};
 
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 inline constexpr int __pow10_128_offset      = 0;
 inline constexpr __uint128_t __pow10_128[40] = {
     UINT64_C(0),
diff --git a/yass/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h b/yass/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h
index c49f4f6797..06e4e69233 100644
--- a/yass/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h
+++ b/yass/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h
@@ -124,7 +124,7 @@ __base_10_u64(char* __buffer, uint64_t __value) noexcept {
   return __itoa::__append10(__buffer, __value);
 }
 
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 /// \returns 10^\a exp
 ///
 /// \pre \a exp [19, 39]
diff --git a/yass/third_party/libc++/trunk/include/__charconv/to_chars_integral.h b/yass/third_party/libc++/trunk/include/__charconv/to_chars_integral.h
index ccb5856df1..fd92be4b4c 100644
--- a/yass/third_party/libc++/trunk/include/__charconv/to_chars_integral.h
+++ b/yass/third_party/libc++/trunk/include/__charconv/to_chars_integral.h
@@ -71,7 +71,7 @@ __to_chars_itoa(char* __first, char* __last, _Tp __value, false_type) {
     return {__last, errc::value_too_large};
 }
 
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 template <>
 inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_itoa(char* __first, char* __last, __uint128_t __value, false_type) {
diff --git a/yass/third_party/libc++/trunk/include/__charconv/traits.h b/yass/third_party/libc++/trunk/include/__charconv/traits.h
index c91c6da324..2cb37c8cfb 100644
--- a/yass/third_party/libc++/trunk/include/__charconv/traits.h
+++ b/yass/third_party/libc++/trunk/include/__charconv/traits.h
@@ -88,7 +88,7 @@ struct _LIBCPP_HIDDEN __traits_base<_Tp, __enable_if_t<sizeof(_Tp) == sizeof(uin
   }
 };
 
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 template <typename _Tp>
 struct _LIBCPP_HIDDEN __traits_base<_Tp, __enable_if_t<sizeof(_Tp) == sizeof(__uint128_t)> > {
   using type = __uint128_t;
diff --git a/yass/third_party/libc++/trunk/include/__chrono/exception.h b/yass/third_party/libc++/trunk/include/__chrono/exception.h
index cc408d78a3..64484fb551 100644
--- a/yass/third_party/libc++/trunk/include/__chrono/exception.h
+++ b/yass/third_party/libc++/trunk/include/__chrono/exception.h
@@ -73,7 +73,7 @@ private:
 template <class _Duration>
 [[noreturn]] _LIBCPP_AVAILABILITY_TZDB _LIBCPP_HIDE_FROM_ABI void __throw_nonexistent_local_time(
     [[maybe_unused]] const local_time<_Duration>& __time, [[maybe_unused]] const local_info& __info) {
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
   throw nonexistent_local_time(__time, __info);
 #    else
   _LIBCPP_VERBOSE_ABORT("nonexistent_local_time was thrown in -fno-exceptions mode");
@@ -117,7 +117,7 @@ private:
 template <class _Duration>
 [[noreturn]] _LIBCPP_AVAILABILITY_TZDB _LIBCPP_HIDE_FROM_ABI void __throw_ambiguous_local_time(
     [[maybe_unused]] const local_time<_Duration>& __time, [[maybe_unused]] const local_info& __info) {
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
   throw ambiguous_local_time(__time, __info);
 #    else
   _LIBCPP_VERBOSE_ABORT("ambiguous_local_time was thrown in -fno-exceptions mode");
diff --git a/yass/third_party/libc++/trunk/include/__chrono/file_clock.h b/yass/third_party/libc++/trunk/include/__chrono/file_clock.h
index 4dd3f88ce5..b4b7e9dc14 100644
--- a/yass/third_party/libc++/trunk/include/__chrono/file_clock.h
+++ b/yass/third_party/libc++/trunk/include/__chrono/file_clock.h
@@ -47,7 +47,7 @@ _LIBCPP_END_NAMESPACE_STD
 #ifndef _LIBCPP_CXX03_LANG
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
 struct _FilesystemClock {
-#  if !defined(_LIBCPP_HAS_NO_INT128)
+#  if _LIBCPP_HAS_INT128
   typedef __int128_t rep;
   typedef nano period;
 #  else
diff --git a/yass/third_party/libc++/trunk/include/__condition_variable/condition_variable.h b/yass/third_party/libc++/trunk/include/__condition_variable/condition_variable.h
index de35aaca10..61412541b4 100644
--- a/yass/third_party/libc++/trunk/include/__condition_variable/condition_variable.h
+++ b/yass/third_party/libc++/trunk/include/__condition_variable/condition_variable.h
@@ -45,7 +45,7 @@ class _LIBCPP_EXPORTED_FROM_ABI condition_variable {
 public:
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR condition_variable() _NOEXCEPT = default;
 
-#  ifdef _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
+#  if _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
   ~condition_variable() = default;
 #  else
   ~condition_variable();
@@ -83,7 +83,7 @@ public:
 private:
   void
   __do_timed_wait(unique_lock<mutex>& __lk, chrono::time_point<chrono::system_clock, chrono::nanoseconds>) _NOEXCEPT;
-#  if defined(_LIBCPP_HAS_COND_CLOCKWAIT)
+#  if _LIBCPP_HAS_COND_CLOCKWAIT
   _LIBCPP_HIDE_FROM_ABI void
   __do_timed_wait(unique_lock<mutex>& __lk, chrono::time_point<chrono::steady_clock, chrono::nanoseconds>) _NOEXCEPT;
 #  endif
@@ -180,7 +180,7 @@ cv_status condition_variable::wait_for(unique_lock<mutex>& __lk, const chrono::d
   using __ns_rep                   = nanoseconds::rep;
   steady_clock::time_point __c_now = steady_clock::now();
 
-#  if defined(_LIBCPP_HAS_COND_CLOCKWAIT)
+#  if _LIBCPP_HAS_COND_CLOCKWAIT
   using __clock_tp_ns     = time_point<steady_clock, nanoseconds>;
   __ns_rep __now_count_ns = std::__safe_nanosecond_cast(__c_now.time_since_epoch()).count();
 #  else
@@ -205,7 +205,7 @@ condition_variable::wait_for(unique_lock<mutex>& __lk, const chrono::duration<_R
   return wait_until(__lk, chrono::steady_clock::now() + __d, std::move(__pred));
 }
 
-#  if defined(_LIBCPP_HAS_COND_CLOCKWAIT)
+#  if _LIBCPP_HAS_COND_CLOCKWAIT
 inline void condition_variable::__do_timed_wait(
     unique_lock<mutex>& __lk, chrono::time_point<chrono::steady_clock, chrono::nanoseconds> __tp) _NOEXCEPT {
   using namespace chrono;
diff --git a/yass/third_party/libc++/trunk/include/__config b/yass/third_party/libc++/trunk/include/__config
index 0d71264611..fcba56f7e3 100644
--- a/yass/third_party/libc++/trunk/include/__config
+++ b/yass/third_party/libc++/trunk/include/__config
@@ -225,9 +225,14 @@ _LIBCPP_HARDENING_MODE_DEBUG
 #      define _LIBCPP_MSVCRT // Using Microsoft's C Runtime library
 #    endif
 #    if (defined(_M_AMD64) || defined(__x86_64__)) || (defined(_M_ARM) || defined(__arm__))
-#      define _LIBCPP_HAS_BITSCAN64
+#      define _LIBCPP_HAS_BITSCAN64 1
+#    else
+#      define _LIBCPP_HAS_BITSCAN64 0
 #    endif
-#    define _LIBCPP_HAS_OPEN_WITH_WCHAR
+#    define _LIBCPP_HAS_OPEN_WITH_WCHAR 1
+#  else
+#    define _LIBCPP_HAS_OPEN_WITH_WCHAR 0
+#    define _LIBCPP_HAS_BITSCAN64 0
 #  endif // defined(_WIN32)
 
 #  if defined(_AIX) && !defined(__64BIT__)
@@ -318,23 +323,33 @@ typedef __char32_t char32_t;
 
 // Objective-C++ features (opt-in)
 #  if __has_feature(objc_arc)
-#    define _LIBCPP_HAS_OBJC_ARC
+#    define _LIBCPP_HAS_OBJC_ARC 1
+#  else
+#    define _LIBCPP_HAS_OBJC_ARC 0
 #  endif
 
 #  if __has_feature(objc_arc_weak)
-#    define _LIBCPP_HAS_OBJC_ARC_WEAK
+#    define _LIBCPP_HAS_OBJC_ARC_WEAK 1
+#  else
+#    define _LIBCPP_HAS_OBJC_ARC_WEAK 0
 #  endif
 
 #  if __has_extension(blocks)
-#    define _LIBCPP_HAS_EXTENSION_BLOCKS
+#    define _LIBCPP_HAS_EXTENSION_BLOCKS 1
+#  else
+#    define _LIBCPP_HAS_EXTENSION_BLOCKS 0
 #  endif
 
-#  if defined(_LIBCPP_HAS_EXTENSION_BLOCKS) && defined(__APPLE__)
-#    define _LIBCPP_HAS_BLOCKS_RUNTIME
+#  if _LIBCPP_HAS_EXTENSION_BLOCKS && defined(__APPLE__)
+#    define _LIBCPP_HAS_BLOCKS_RUNTIME 1
+#  else
+#    define _LIBCPP_HAS_BLOCKS_RUNTIME 0
 #  endif
 
-#  if !__has_feature(address_sanitizer)
-#    define _LIBCPP_HAS_NO_ASAN
+#  if __has_feature(address_sanitizer)
+#    define _LIBCPP_HAS_ASAN 1
+#  else
+#    define _LIBCPP_HAS_ASAN 0
 #  endif
 
 #  define _LIBCPP_ALWAYS_INLINE __attribute__((__always_inline__))
@@ -457,7 +472,7 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_HARDENING_SIG n // "none"
 #  endif
 
-#  ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if !_LIBCPP_HAS_EXCEPTIONS
 #    define _LIBCPP_EXCEPTIONS_SIG n
 #  else
 #    define _LIBCPP_EXCEPTIONS_SIG e
@@ -597,7 +612,9 @@ typedef __char32_t char32_t;
 #  endif
 
 #  if !defined(__SIZEOF_INT128__) || defined(_MSC_VER)
-#    define _LIBCPP_HAS_NO_INT128
+#    define _LIBCPP_HAS_INT128 0
+#  else
+#    define _LIBCPP_HAS_INT128 1
 #  endif
 
 #  ifdef _LIBCPP_CXX03_LANG
@@ -629,33 +646,39 @@ typedef __char32_t char32_t;
 // If we are getting operator new from the MSVC CRT, then allocation overloads
 // for align_val_t were added in 19.12, aka VS 2017 version 15.3.
 #  if defined(_LIBCPP_MSVCRT) && defined(_MSC_VER) && _MSC_VER < 1912
-#    define _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#    define _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION 0
 #  elif defined(_LIBCPP_ABI_VCRUNTIME) && !defined(__cpp_aligned_new)
 // We're deferring to Microsoft's STL to provide aligned new et al. We don't
 // have it unless the language feature test macro is defined.
-#    define _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#    define _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION 0
 #  elif defined(__MVS__)
-#    define _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#    define _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION 0
+#  else
+#    define _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION 1
 #  endif
 
-#  if defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) || (!defined(__cpp_aligned_new) || __cpp_aligned_new < 201606)
-#    define _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#  if !_LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION || (!defined(__cpp_aligned_new) || __cpp_aligned_new < 201606)
+#    define _LIBCPP_HAS_ALIGNED_ALLOCATION 0
+#  else
+#    define _LIBCPP_HAS_ALIGNED_ALLOCATION 1
 #  endif
 
 // It is not yet possible to use aligned_alloc() on all Apple platforms since
 // 10.15 was the first version to ship an implementation of aligned_alloc().
 #  if defined(__APPLE__)
 #    if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&                                                     \
-         __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101500)
-#      define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC
-#    endif
-#    if (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) &&                                                    \
+         __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101500) ||                                                    \
+        (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) &&                                                    \
          __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 130000)
-#      define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC
+#      define _LIBCPP_HAS_C11_ALIGNED_ALLOC 0
+#    else
+#      define _LIBCPP_HAS_C11_ALIGNED_ALLOC 1
 #    endif
 #  elif defined(__ANDROID__) && __ANDROID_API__ < 28
 // Android only provides aligned_alloc when targeting API 28 or higher.
-#    define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC
+#    define _LIBCPP_HAS_C11_ALIGNED_ALLOC 0
+#  else
+#    define _LIBCPP_HAS_C11_ALIGNED_ALLOC 1
 #  endif
 
 #  if defined(__APPLE__) || defined(__FreeBSD__)
@@ -667,7 +690,9 @@ typedef __char32_t char32_t;
 #  endif
 
 #  if _LIBCPP_STD_VER <= 17 || !defined(__cpp_char8_t)
-#    define _LIBCPP_HAS_NO_CHAR8_T
+#    define _LIBCPP_HAS_CHAR8_T 0
+#  else
+#    define _LIBCPP_HAS_CHAR8_T 1
 #  endif
 
 // Deprecation macros.
@@ -726,7 +751,7 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_DEPRECATED_IN_CXX26
 #  endif
 
-#  if !defined(_LIBCPP_HAS_NO_CHAR8_T)
+#  if _LIBCPP_HAS_CHAR8_T
 #    define _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_DEPRECATED
 #  else
 #    define _LIBCPP_DEPRECATED_WITH_CHAR8_T
@@ -821,12 +846,18 @@ typedef __char32_t char32_t;
 
 #  if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
 #    if defined(__ANDROID__) && __ANDROID_API__ >= 30
-#      define _LIBCPP_HAS_COND_CLOCKWAIT
+#      define _LIBCPP_HAS_COND_CLOCKWAIT 1
 #    elif defined(_LIBCPP_GLIBC_PREREQ)
 #      if _LIBCPP_GLIBC_PREREQ(2, 30)
-#        define _LIBCPP_HAS_COND_CLOCKWAIT
+#        define _LIBCPP_HAS_COND_CLOCKWAIT 1
+#      else
+#        define _LIBCPP_HAS_COND_CLOCKWAIT 0
 #      endif
+#    else
+#      define _LIBCPP_HAS_COND_CLOCKWAIT 0
 #    endif
+#  else
+#    define _LIBCPP_HAS_COND_CLOCKWAIT 0
 #  endif
 
 #  if defined(_LIBCPP_HAS_NO_THREADS) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
@@ -863,7 +894,9 @@ typedef __char32_t char32_t;
       (defined(_LIBCPP_HAS_THREAD_API_C11) && defined(__Fuchsia__)) ||                                                 \
        defined(_LIBCPP_HAS_THREAD_API_WIN32)
 // clang-format on
-#    define _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION
+#    define _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION 1
+#  else
+#    define _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION 0
 #  endif
 
 // Destroying a condvar is a nop on Windows.
@@ -875,7 +908,9 @@ typedef __char32_t char32_t;
 // TODO(EricWF): This is potentially true for some pthread implementations
 // as well.
 #  if (defined(_LIBCPP_HAS_THREAD_API_C11) && defined(__Fuchsia__)) || defined(_LIBCPP_HAS_THREAD_API_WIN32)
-#    define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
+#    define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION 1
+#  else
+#    define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION 0
 #  endif
 
 #  if defined(__BIONIC__) || defined(__NuttX__) || defined(__Fuchsia__) || defined(__wasi__) ||                        \
@@ -891,8 +926,9 @@ typedef __char32_t char32_t;
 
 #  if !defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) &&                                    \
       !defined(_LIBCPP_HAS_EXTERNAL_ATOMIC_IMP)
-#    define _LIBCPP_HAS_NO_ATOMIC_HEADER
+#    define _LIBCPP_HAS_ATOMIC_HEADER 0
 #  else
+#    define _LIBCPP_HAS_ATOMIC_HEADER 1
 #    ifndef _LIBCPP_ATOMIC_FLAG_TYPE
 #      define _LIBCPP_ATOMIC_FLAG_TYPE bool
 #    endif
@@ -904,19 +940,18 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS
 #  endif
 
-#  if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS)
-#    if defined(__clang__) && __has_attribute(acquire_capability)
 // Work around the attribute handling in clang.  When both __declspec and
 // __attribute__ are present, the processing goes awry preventing the definition
 // of the types. In MinGW mode, __declspec evaluates to __attribute__, and thus
 // combining the two does work.
-#      if !defined(_MSC_VER)
-#        define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
-#      endif
-#    endif
+#  if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS) && defined(__clang__) &&                                       \
+      __has_attribute(acquire_capability) && !defined(_MSC_VER)
+#    define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS 1
+#  else
+#    define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS 0
 #  endif
 
-#  ifdef _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
+#  if _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
 #    define _LIBCPP_THREAD_SAFETY_ANNOTATION(x) __attribute__((x))
 #  else
 #    define _LIBCPP_THREAD_SAFETY_ANNOTATION(x)
@@ -997,7 +1032,7 @@ typedef __char32_t char32_t;
 // functions is gradually being added to existing C libraries. The conditions
 // below check for known C library versions and conditions under which these
 // functions are declared by the C library.
-#  define _LIBCPP_HAS_NO_C8RTOMB_MBRTOC8
+//
 // GNU libc 2.36 and newer declare c8rtomb() and mbrtoc8() in C++ modes if
 // __cpp_char8_t is defined or if C2X extensions are enabled. Determining
 // the latter depends on internal GNU libc details that are not appropriate
@@ -1005,8 +1040,12 @@ typedef __char32_t char32_t;
 // defined are ignored.
 #  if defined(_LIBCPP_GLIBC_PREREQ)
 #    if _LIBCPP_GLIBC_PREREQ(2, 36) && defined(__cpp_char8_t)
-#      undef _LIBCPP_HAS_NO_C8RTOMB_MBRTOC8
+#      define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
+#    else
+#      define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
 #    endif
+#  else
+#    define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
 #  endif
 
 // There are a handful of public standard library types that are intended to
@@ -1188,7 +1227,9 @@ typedef __char32_t char32_t;
 
 // Clang-18 has support for deducing this, but it does not set the FTM.
 #  if defined(__cpp_explicit_this_parameter) || (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 1800)
-#    define _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
+#    define _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER 1
+#  else
+#    define _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER 0
 #  endif
 
 #endif // __cplusplus
diff --git a/yass/third_party/libc++/trunk/include/__configuration/availability.h b/yass/third_party/libc++/trunk/include/__configuration/availability.h
index b10f29590a..f42ff460db 100644
--- a/yass/third_party/libc++/trunk/include/__configuration/availability.h
+++ b/yass/third_party/libc++/trunk/include/__configuration/availability.h
@@ -409,10 +409,10 @@
 #define _LIBCPP_AVAILABILITY_HAS_BAD_EXPECTED_ACCESS_KEY_FUNCTION _LIBCPP_INTRODUCED_IN_LLVM_19
 #define _LIBCPP_AVAILABILITY_BAD_EXPECTED_ACCESS_KEY_FUNCTION _LIBCPP_INTRODUCED_IN_LLVM_19_ATTRIBUTE
 
-// Define availability attributes that depend on _LIBCPP_HAS_NO_EXCEPTIONS.
+// Define availability attributes that depend on _LIBCPP_HAS_EXCEPTIONS.
 // Those are defined in terms of the availability attributes above, and
 // should not be vendor-specific.
-#if defined(_LIBCPP_HAS_NO_EXCEPTIONS)
+#if !_LIBCPP_HAS_EXCEPTIONS
 #  define _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST
 #  define _LIBCPP_AVAILABILITY_THROW_BAD_OPTIONAL_ACCESS
 #  define _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
@@ -423,8 +423,8 @@
 #endif
 
 // Define availability attributes that depend on both
-// _LIBCPP_HAS_NO_EXCEPTIONS and _LIBCPP_HAS_NO_RTTI.
-#if defined(_LIBCPP_HAS_NO_EXCEPTIONS) || defined(_LIBCPP_HAS_NO_RTTI)
+// _LIBCPP_HAS_EXCEPTIONS and _LIBCPP_HAS_RTTI.
+#if !_LIBCPP_HAS_EXCEPTIONS || !_LIBCPP_HAS_RTTI
 #  undef _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
 #  undef _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION
 #  define _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION 0
diff --git a/yass/third_party/libc++/trunk/include/__configuration/language.h b/yass/third_party/libc++/trunk/include/__configuration/language.h
index fa62a7b6f5..9c224dfa76 100644
--- a/yass/third_party/libc++/trunk/include/__configuration/language.h
+++ b/yass/third_party/libc++/trunk/include/__configuration/language.h
@@ -35,12 +35,16 @@
 #endif // __cplusplus
 // NOLINTEND(libcpp-cpp-version-check)
 
-#if !defined(__cpp_rtti) || __cpp_rtti < 199711L
-#  define _LIBCPP_HAS_NO_RTTI
+#if defined(__cpp_rtti) && __cpp_rtti >= 199711L
+#  define _LIBCPP_HAS_RTTI 1
+#else
+#  define _LIBCPP_HAS_RTTI 0
 #endif
 
-#if !defined(__cpp_exceptions) || __cpp_exceptions < 199711L
-#  define _LIBCPP_HAS_NO_EXCEPTIONS
+#if defined(__cpp_exceptions) && __cpp_exceptions >= 199711L
+#  define _LIBCPP_HAS_EXCEPTIONS 1
+#else
+#  define _LIBCPP_HAS_EXCEPTIONS 0
 #endif
 
 #endif // _LIBCPP___CONFIGURATION_LANGUAGE_H
diff --git a/yass/third_party/libc++/trunk/include/__debug_utils/sanitizers.h b/yass/third_party/libc++/trunk/include/__debug_utils/sanitizers.h
index d8547e3249..73d192711e 100644
--- a/yass/third_party/libc++/trunk/include/__debug_utils/sanitizers.h
+++ b/yass/third_party/libc++/trunk/include/__debug_utils/sanitizers.h
@@ -17,7 +17,7 @@
 #  pragma GCC system_header
 #endif
 
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
 
 extern "C" {
 _LIBCPP_EXPORTED_FROM_ABI void
@@ -28,12 +28,12 @@ _LIBCPP_EXPORTED_FROM_ABI int
 __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, const void*, const void*);
 }
 
-#endif // _LIBCPP_HAS_NO_ASAN
+#endif // _LIBCPP_HAS_ASAN
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 // ASan choices
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
 #  define _LIBCPP_HAS_ASAN_CONTAINER_ANNOTATIONS_FOR_ALL_ALLOCATORS 1
 #endif
 
@@ -57,7 +57,7 @@ _LIBCPP_HIDE_FROM_ABI void __annotate_double_ended_contiguous_container(
     const void* __last_old_contained,
     const void* __first_new_contained,
     const void* __last_new_contained) {
-#ifdef _LIBCPP_HAS_NO_ASAN
+#if !_LIBCPP_HAS_ASAN
   (void)__first_storage;
   (void)__last_storage;
   (void)__first_old_contained;
@@ -86,7 +86,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __annotate_contiguous_c
     const void* __last_storage,
     const void* __old_last_contained,
     const void* __new_last_contained) {
-#ifdef _LIBCPP_HAS_NO_ASAN
+#if !_LIBCPP_HAS_ASAN
   (void)__first_storage;
   (void)__last_storage;
   (void)__old_last_contained;
diff --git a/yass/third_party/libc++/trunk/include/__exception/exception_ptr.h b/yass/third_party/libc++/trunk/include/__exception/exception_ptr.h
index 9e5351f534..2cb250dfd4 100644
--- a/yass/third_party/libc++/trunk/include/__exception/exception_ptr.h
+++ b/yass/third_party/libc++/trunk/include/__exception/exception_ptr.h
@@ -92,7 +92,7 @@ public:
 
 template <class _Ep>
 _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION && __cplusplus >= 201103L
   using _Ep2 = __decay_t<_Ep>;
 
diff --git a/yass/third_party/libc++/trunk/include/__exception/nested_exception.h b/yass/third_party/libc++/trunk/include/__exception/nested_exception.h
index 8e817e1c06..cc20b038c8 100644
--- a/yass/third_party/libc++/trunk/include/__exception/nested_exception.h
+++ b/yass/third_party/libc++/trunk/include/__exception/nested_exception.h
@@ -49,7 +49,7 @@ struct __nested : public _Tp, public nested_exception {
   _LIBCPP_HIDE_FROM_ABI explicit __nested(const _Tp& __t) : _Tp(__t) {}
 };
 
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
 template <class _Tp, class _Up, bool>
 struct __throw_with_nested;
 
@@ -68,7 +68,7 @@ struct __throw_with_nested<_Tp, _Up, false> {
 
 template <class _Tp>
 [[__noreturn__]] _LIBCPP_HIDE_FROM_ABI void throw_with_nested(_Tp&& __t) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   using _Up = __decay_t<_Tp>;
   static_assert(is_copy_constructible<_Up>::value, "type thrown must be CopyConstructible");
   __throw_with_nested<_Tp,
diff --git a/yass/third_party/libc++/trunk/include/__expected/expected.h b/yass/third_party/libc++/trunk/include/__expected/expected.h
index e04e17d1eb..3d3f11967e 100644
--- a/yass/third_party/libc++/trunk/include/__expected/expected.h
+++ b/yass/third_party/libc++/trunk/include/__expected/expected.h
@@ -73,7 +73,7 @@ struct __expected_construct_unexpected_from_invoke_tag {};
 
 template <class _Err, class _Arg>
 _LIBCPP_HIDE_FROM_ABI void __throw_bad_expected_access(_Arg&& __arg) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw bad_expected_access<_Err>(std::forward<_Arg>(__arg));
 #  else
   (void)__arg;
diff --git a/yass/third_party/libc++/trunk/include/__filesystem/filesystem_error.h b/yass/third_party/libc++/trunk/include/__filesystem/filesystem_error.h
index f43568c200..73592bba31 100644
--- a/yass/third_party/libc++/trunk/include/__filesystem/filesystem_error.h
+++ b/yass/third_party/libc++/trunk/include/__filesystem/filesystem_error.h
@@ -67,7 +67,7 @@ private:
   shared_ptr<_Storage> __storage_;
 };
 
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
 template <class... _Args>
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FILESYSTEM_LIBRARY void
 __throw_filesystem_error(_Args&&... __args) {
diff --git a/yass/third_party/libc++/trunk/include/__filesystem/path.h b/yass/third_party/libc++/trunk/include/__filesystem/path.h
index f0d3968043..2eb60810af 100644
--- a/yass/third_party/libc++/trunk/include/__filesystem/path.h
+++ b/yass/third_party/libc++/trunk/include/__filesystem/path.h
@@ -60,7 +60,7 @@ struct __can_convert_char<wchar_t> {
   static const bool value = true;
   using __char_type       = wchar_t;
 };
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 template <>
 struct __can_convert_char<char8_t> {
   static const bool value = true;
@@ -87,7 +87,7 @@ _LIBCPP_HIDE_FROM_ABI bool __is_separator(_ECharT __e) {
 #  endif
 }
 
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 typedef u8string __u8_string;
 #  else
 typedef string __u8_string;
@@ -366,7 +366,7 @@ struct _PathExport<char16_t> {
   }
 };
 
-#    ifndef _LIBCPP_HAS_NO_CHAR8_T
+#    if _LIBCPP_HAS_CHAR8_T
 template <>
 struct _PathExport<char8_t> {
   typedef __narrow_to_utf8<sizeof(wchar_t) * __CHAR_BIT__> _Narrower;
@@ -376,7 +376,7 @@ struct _PathExport<char8_t> {
     _Narrower()(back_inserter(__dest), __src.data(), __src.data() + __src.size());
   }
 };
-#    endif /* !_LIBCPP_HAS_NO_CHAR8_T */
+#    endif // _LIBCPP_HAS_CHAR8_T
 #  endif   /* _LIBCPP_WIN32API */
 
 class _LIBCPP_EXPORTED_FROM_ABI path {
@@ -730,7 +730,7 @@ public:
 #  else    /* _LIBCPP_WIN32API */
 
   _LIBCPP_HIDE_FROM_ABI std::string string() const { return __pn_; }
-#    ifndef _LIBCPP_HAS_NO_CHAR8_T
+#    if _LIBCPP_HAS_CHAR8_T
   _LIBCPP_HIDE_FROM_ABI std::u8string u8string() const { return std::u8string(__pn_.begin(), __pn_.end()); }
 #    else
   _LIBCPP_HIDE_FROM_ABI std::string u8string() const { return __pn_; }
@@ -756,7 +756,7 @@ public:
 
   // generic format observers
   _LIBCPP_HIDE_FROM_ABI std::string generic_string() const { return __pn_; }
-#    ifndef _LIBCPP_HAS_NO_CHAR8_T
+#    if _LIBCPP_HAS_CHAR8_T
   _LIBCPP_HIDE_FROM_ABI std::u8string generic_u8string() const { return std::u8string(__pn_.begin(), __pn_.end()); }
 #    else
   _LIBCPP_HIDE_FROM_ABI std::string generic_u8string() const { return __pn_; }
diff --git a/yass/third_party/libc++/trunk/include/__filesystem/u8path.h b/yass/third_party/libc++/trunk/include/__filesystem/u8path.h
index dae5823128..e13980298d 100644
--- a/yass/third_party/libc++/trunk/include/__filesystem/u8path.h
+++ b/yass/third_party/libc++/trunk/include/__filesystem/u8path.h
@@ -34,7 +34,7 @@ _LIBCPP_AVAILABILITY_FILESYSTEM_LIBRARY_PUSH
 template <class _InputIt, __enable_if_t<__is_pathable<_InputIt>::value, int> = 0>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _InputIt __l) {
   static_assert(
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
       is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
 #  endif
           is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
@@ -56,7 +56,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f,
 template <class _InputIt, __enable_if_t<__is_pathable<_InputIt>::value, int> = 0>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _NullSentinel) {
   static_assert(
-#    ifndef _LIBCPP_HAS_NO_CHAR8_T
+#    if _LIBCPP_HAS_CHAR8_T
       is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
 #    endif
           is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
@@ -77,7 +77,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f,
 template <class _Source, __enable_if_t<__is_pathable<_Source>::value, int> = 0>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(const _Source& __s) {
   static_assert(
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
       is_same<typename __is_pathable<_Source>::__char_type, char8_t>::value ||
 #  endif
           is_same<typename __is_pathable<_Source>::__char_type, char>::value,
diff --git a/yass/third_party/libc++/trunk/include/__format/format_arg.h b/yass/third_party/libc++/trunk/include/__format/format_arg.h
index d1ce055874..3f39d2aec8 100644
--- a/yass/third_party/libc++/trunk/include/__format/format_arg.h
+++ b/yass/third_party/libc++/trunk/include/__format/format_arg.h
@@ -113,7 +113,7 @@ _LIBCPP_HIDE_FROM_ABI decltype(auto) __visit_format_arg(_Visitor&& __vis, basic_
   case __format::__arg_t::__long_long:
     return std::invoke(std::forward<_Visitor>(__vis), __arg.__value_.__long_long_);
   case __format::__arg_t::__i128:
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
     return std::invoke(std::forward<_Visitor>(__vis), __arg.__value_.__i128_);
 #  else
     __libcpp_unreachable();
@@ -123,7 +123,7 @@ _LIBCPP_HIDE_FROM_ABI decltype(auto) __visit_format_arg(_Visitor&& __vis, basic_
   case __format::__arg_t::__unsigned_long_long:
     return std::invoke(std::forward<_Visitor>(__vis), __arg.__value_.__unsigned_long_long_);
   case __format::__arg_t::__u128:
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
     return std::invoke(std::forward<_Visitor>(__vis), __arg.__value_.__u128_);
 #  else
     __libcpp_unreachable();
@@ -148,7 +148,7 @@ _LIBCPP_HIDE_FROM_ABI decltype(auto) __visit_format_arg(_Visitor&& __vis, basic_
   __libcpp_unreachable();
 }
 
-#  if _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  if _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
 
 template <class _Rp, class _Visitor, class _Context>
 _LIBCPP_HIDE_FROM_ABI _Rp __visit_format_arg(_Visitor&& __vis, basic_format_arg<_Context> __arg) {
@@ -164,7 +164,7 @@ _LIBCPP_HIDE_FROM_ABI _Rp __visit_format_arg(_Visitor&& __vis, basic_format_arg<
   case __format::__arg_t::__long_long:
     return std::invoke_r<_Rp>(std::forward<_Visitor>(__vis), __arg.__value_.__long_long_);
   case __format::__arg_t::__i128:
-#    ifndef _LIBCPP_HAS_NO_INT128
+#    if _LIBCPP_HAS_INT128
     return std::invoke_r<_Rp>(std::forward<_Visitor>(__vis), __arg.__value_.__i128_);
 #    else
     __libcpp_unreachable();
@@ -174,7 +174,7 @@ _LIBCPP_HIDE_FROM_ABI _Rp __visit_format_arg(_Visitor&& __vis, basic_format_arg<
   case __format::__arg_t::__unsigned_long_long:
     return std::invoke_r<_Rp>(std::forward<_Visitor>(__vis), __arg.__value_.__unsigned_long_long_);
   case __format::__arg_t::__u128:
-#    ifndef _LIBCPP_HAS_NO_INT128
+#    if _LIBCPP_HAS_INT128
     return std::invoke_r<_Rp>(std::forward<_Visitor>(__vis), __arg.__value_.__u128_);
 #    else
     __libcpp_unreachable();
@@ -199,7 +199,7 @@ _LIBCPP_HIDE_FROM_ABI _Rp __visit_format_arg(_Visitor&& __vis, basic_format_arg<
   __libcpp_unreachable();
 }
 
-#  endif // _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  endif // _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
 
 /// Contains the values used in basic_format_arg.
 ///
@@ -237,7 +237,7 @@ public:
     unsigned __unsigned_;
     long long __long_long_;
     unsigned long long __unsigned_long_long_;
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
     __int128_t __i128_;
     __uint128_t __u128_;
 #  endif
@@ -261,7 +261,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI __basic_format_arg_value(long long __value) noexcept : __long_long_(__value) {}
   _LIBCPP_HIDE_FROM_ABI __basic_format_arg_value(unsigned long long __value) noexcept
       : __unsigned_long_long_(__value) {}
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   _LIBCPP_HIDE_FROM_ABI __basic_format_arg_value(__int128_t __value) noexcept : __i128_(__value) {}
   _LIBCPP_HIDE_FROM_ABI __basic_format_arg_value(__uint128_t __value) noexcept : __u128_(__value) {}
 #  endif
@@ -284,14 +284,14 @@ public:
 
   _LIBCPP_HIDE_FROM_ABI explicit operator bool() const noexcept { return __type_ != __format::__arg_t::__none; }
 
-#  if _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  if _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
 
   // This function is user facing, so it must wrap the non-standard types of
   // the "variant" in a handle to stay conforming. See __arg_t for more details.
   template <class _Visitor>
   _LIBCPP_HIDE_FROM_ABI decltype(auto) visit(this basic_format_arg __arg, _Visitor&& __vis) {
     switch (__arg.__type_) {
-#    ifndef _LIBCPP_HAS_NO_INT128
+#    if _LIBCPP_HAS_INT128
     case __format::__arg_t::__i128: {
       typename __basic_format_arg_value<_Context>::__handle __h{__arg.__value_.__i128_};
       return std::invoke(std::forward<_Visitor>(__vis), typename basic_format_arg<_Context>::handle{__h});
@@ -312,7 +312,7 @@ public:
   template <class _Rp, class _Visitor>
   _LIBCPP_HIDE_FROM_ABI _Rp visit(this basic_format_arg __arg, _Visitor&& __vis) {
     switch (__arg.__type_) {
-#    ifndef _LIBCPP_HAS_NO_INT128
+#    if _LIBCPP_HAS_INT128
     case __format::__arg_t::__i128: {
       typename __basic_format_arg_value<_Context>::__handle __h{__arg.__value_.__i128_};
       return std::invoke_r<_Rp>(std::forward<_Visitor>(__vis), typename basic_format_arg<_Context>::handle{__h});
@@ -328,7 +328,7 @@ public:
     }
   }
 
-#  endif // _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  endif // _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
 
 private:
   using char_type = typename _Context::char_type;
@@ -370,13 +370,13 @@ private:
 // This function is user facing, so it must wrap the non-standard types of
 // the "variant" in a handle to stay conforming. See __arg_t for more details.
 template <class _Visitor, class _Context>
-#  if _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  if _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
 _LIBCPP_DEPRECATED_IN_CXX26
 #  endif
     _LIBCPP_HIDE_FROM_ABI decltype(auto)
     visit_format_arg(_Visitor&& __vis, basic_format_arg<_Context> __arg) {
   switch (__arg.__type_) {
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   case __format::__arg_t::__i128: {
     typename __basic_format_arg_value<_Context>::__handle __h{__arg.__value_.__i128_};
     return std::invoke(std::forward<_Visitor>(__vis), typename basic_format_arg<_Context>::handle{__h});
@@ -386,7 +386,7 @@ _LIBCPP_DEPRECATED_IN_CXX26
     typename __basic_format_arg_value<_Context>::__handle __h{__arg.__value_.__u128_};
     return std::invoke(std::forward<_Visitor>(__vis), typename basic_format_arg<_Context>::handle{__h});
   }
-#  endif // _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  endif // _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
   default:
     return std::__visit_format_arg(std::forward<_Visitor>(__vis), __arg);
   }
diff --git a/yass/third_party/libc++/trunk/include/__format/format_arg_store.h b/yass/third_party/libc++/trunk/include/__format/format_arg_store.h
index 9a4a41df6d..847b39d428 100644
--- a/yass/third_party/libc++/trunk/include/__format/format_arg_store.h
+++ b/yass/third_party/libc++/trunk/include/__format/format_arg_store.h
@@ -64,7 +64,7 @@ consteval __arg_t __determine_arg_t() {
     return __arg_t::__int;
   else if constexpr (sizeof(_Tp) <= sizeof(long long))
     return __arg_t::__long_long;
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   else if constexpr (sizeof(_Tp) == sizeof(__int128_t))
     return __arg_t::__i128;
 #  endif
@@ -79,7 +79,7 @@ consteval __arg_t __determine_arg_t() {
     return __arg_t::__unsigned;
   else if constexpr (sizeof(_Tp) <= sizeof(unsigned long long))
     return __arg_t::__unsigned_long_long;
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   else if constexpr (sizeof(_Tp) == sizeof(__uint128_t))
     return __arg_t::__u128;
 #  endif
diff --git a/yass/third_party/libc++/trunk/include/__format/format_context.h b/yass/third_party/libc++/trunk/include/__format/format_context.h
index a9be17b855..019a71011a 100644
--- a/yass/third_party/libc++/trunk/include/__format/format_context.h
+++ b/yass/third_party/libc++/trunk/include/__format/format_context.h
@@ -181,13 +181,13 @@ public:
                   __format::__determine_arg_t<basic_format_context, decltype(__arg)>(),
                   __basic_format_arg_value<basic_format_context>(__arg)};
           };
-#  if _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  if _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
           return static_cast<_Context*>(__c)->arg(__id).visit(std::move(__visitor));
 #  else
           _LIBCPP_SUPPRESS_DEPRECATED_PUSH
           return std::visit_format_arg(std::move(__visitor), static_cast<_Context*>(__c)->arg(__id));
           _LIBCPP_SUPPRESS_DEPRECATED_POP
-#  endif // _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  endif // _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
         }) {
   }
 
diff --git a/yass/third_party/libc++/trunk/include/__format/format_error.h b/yass/third_party/libc++/trunk/include/__format/format_error.h
index 1df7dbff2b..b92e6d1de0 100644
--- a/yass/third_party/libc++/trunk/include/__format/format_error.h
+++ b/yass/third_party/libc++/trunk/include/__format/format_error.h
@@ -36,7 +36,7 @@ public:
 _LIBCPP_DIAGNOSTIC_POP
 
 [[noreturn]] inline _LIBCPP_HIDE_FROM_ABI void __throw_format_error(const char* __s) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw format_error(__s);
 #  else
   _LIBCPP_VERBOSE_ABORT("format_error was thrown in -fno-exceptions mode with message \"%s\"", __s);
diff --git a/yass/third_party/libc++/trunk/include/__format/format_functions.h b/yass/third_party/libc++/trunk/include/__format/format_functions.h
index 1518ab5768..b3cda8bf84 100644
--- a/yass/third_party/libc++/trunk/include/__format/format_functions.h
+++ b/yass/third_party/libc++/trunk/include/__format/format_functions.h
@@ -206,7 +206,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __compile_time_visit_format_arg(
   case __arg_t::__long_long:
     return __format::__compile_time_validate_argument<_CharT, long long>(__parse_ctx, __ctx);
   case __arg_t::__i128:
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
     return __format::__compile_time_validate_argument<_CharT, __int128_t>(__parse_ctx, __ctx);
 #  else
     std::__throw_format_error("Invalid argument");
@@ -217,7 +217,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __compile_time_visit_format_arg(
   case __arg_t::__unsigned_long_long:
     return __format::__compile_time_validate_argument<_CharT, unsigned long long>(__parse_ctx, __ctx);
   case __arg_t::__u128:
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
     return __format::__compile_time_validate_argument<_CharT, __uint128_t>(__parse_ctx, __ctx);
 #  else
     std::__throw_format_error("Invalid argument");
diff --git a/yass/third_party/libc++/trunk/include/__format/formatter_integer.h b/yass/third_party/libc++/trunk/include/__format/formatter_integer.h
index b7f46014c5..3f51b10d75 100644
--- a/yass/third_party/libc++/trunk/include/__format/formatter_integer.h
+++ b/yass/third_party/libc++/trunk/include/__format/formatter_integer.h
@@ -67,7 +67,7 @@ template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<long, _CharT> : public __formatter_integer<_CharT> {};
 template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<long long, _CharT> : public __formatter_integer<_CharT> {};
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<__int128_t, _CharT> : public __formatter_integer<_CharT> {};
 #  endif
@@ -83,7 +83,7 @@ template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<unsigned long, _CharT> : public __formatter_integer<_CharT> {};
 template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<unsigned long long, _CharT> : public __formatter_integer<_CharT> {};
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<__uint128_t, _CharT> : public __formatter_integer<_CharT> {};
 #  endif
@@ -99,7 +99,7 @@ template <>
 inline constexpr bool enable_nonlocking_formatter_optimization<long> = true;
 template <>
 inline constexpr bool enable_nonlocking_formatter_optimization<long long> = true;
-#    ifndef _LIBCPP_HAS_NO_INT128
+#    if _LIBCPP_HAS_INT128
 template <>
 inline constexpr bool enable_nonlocking_formatter_optimization<__int128_t> = true;
 #    endif
@@ -114,7 +114,7 @@ template <>
 inline constexpr bool enable_nonlocking_formatter_optimization<unsigned long> = true;
 template <>
 inline constexpr bool enable_nonlocking_formatter_optimization<unsigned long long> = true;
-#    ifndef _LIBCPP_HAS_NO_INT128
+#    if _LIBCPP_HAS_INT128
 template <>
 inline constexpr bool enable_nonlocking_formatter_optimization<__uint128_t> = true;
 #    endif
diff --git a/yass/third_party/libc++/trunk/include/__functional/function.h b/yass/third_party/libc++/trunk/include/__functional/function.h
index 0d95c9a6ef..e3844f86db 100644
--- a/yass/third_party/libc++/trunk/include/__functional/function.h
+++ b/yass/third_party/libc++/trunk/include/__functional/function.h
@@ -79,7 +79,7 @@ public:
 _LIBCPP_DIAGNOSTIC_POP
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_function_call() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw bad_function_call();
 #  else
   _LIBCPP_VERBOSE_ABORT("bad_function_call was thrown in -fno-exceptions mode");
@@ -123,7 +123,7 @@ _LIBCPP_HIDE_FROM_ABI bool __not_null(function<_Fp> const& __f) {
   return !!__f;
 }
 
-#  ifdef _LIBCPP_HAS_EXTENSION_BLOCKS
+#  if _LIBCPP_HAS_EXTENSION_BLOCKS
 template <class _Rp, class... _Args>
 _LIBCPP_HIDE_FROM_ABI bool __not_null(_Rp (^__p)(_Args...)) {
   return __p;
@@ -244,10 +244,10 @@ public:
   virtual void destroy() _NOEXCEPT            = 0;
   virtual void destroy_deallocate() _NOEXCEPT = 0;
   virtual _Rp operator()(_ArgTypes&&...)      = 0;
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
   virtual const void* target(const type_info&) const _NOEXCEPT = 0;
   virtual const std::type_info& target_type() const _NOEXCEPT  = 0;
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 };
 
 // __func implements __base for a given functor type.
@@ -273,10 +273,10 @@ public:
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void destroy() _NOEXCEPT;
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void destroy_deallocate() _NOEXCEPT;
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual _Rp operator()(_ArgTypes&&... __arg);
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual const void* target(const type_info&) const _NOEXCEPT;
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual const std::type_info& target_type() const _NOEXCEPT;
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 };
 
 template <class _Fp, class _Alloc, class _Rp, class... _ArgTypes>
@@ -314,7 +314,7 @@ _Rp __func<_Fp, _Alloc, _Rp(_ArgTypes...)>::operator()(_ArgTypes&&... __arg) {
   return __f_(std::forward<_ArgTypes>(__arg)...);
 }
 
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
 
 template <class _Fp, class _Alloc, class _Rp, class... _ArgTypes>
 const void* __func<_Fp, _Alloc, _Rp(_ArgTypes...)>::target(const type_info& __ti) const _NOEXCEPT {
@@ -328,7 +328,7 @@ const std::type_info& __func<_Fp, _Alloc, _Rp(_ArgTypes...)>::target_type() cons
   return typeid(_Fp);
 }
 
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 
 // __value_func creates a value-type from a __func.
 
@@ -465,7 +465,7 @@ public:
 
   _LIBCPP_HIDE_FROM_ABI explicit operator bool() const _NOEXCEPT { return __f_ != nullptr; }
 
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
   _LIBCPP_HIDE_FROM_ABI const std::type_info& target_type() const _NOEXCEPT {
     if (__f_ == nullptr)
       return typeid(void);
@@ -478,7 +478,7 @@ public:
       return nullptr;
     return (const _Tp*)__f_->target(typeid(_Tp));
   }
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 };
 
 // Storage for a functor object, to be used with __policy to manage copy and
@@ -521,7 +521,7 @@ struct __policy {
         nullptr,
         nullptr,
         true,
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
         &typeid(void)
 #  else
         nullptr
@@ -548,7 +548,7 @@ private:
         &__large_clone<_Fun>,
         &__large_destroy<_Fun>,
         false,
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
         &typeid(typename _Fun::_Target)
 #  else
         nullptr
@@ -563,7 +563,7 @@ private:
         nullptr,
         nullptr,
         false,
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
         &typeid(typename _Fun::_Target)
 #  else
         nullptr
@@ -725,7 +725,7 @@ public:
 
   _LIBCPP_HIDE_FROM_ABI explicit operator bool() const _NOEXCEPT { return !__policy_->__is_null; }
 
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
   _LIBCPP_HIDE_FROM_ABI const std::type_info& target_type() const _NOEXCEPT { return *__policy_->__type_info; }
 
   template <typename _Tp>
@@ -737,10 +737,10 @@ public:
     else
       return reinterpret_cast<const _Tp*>(&__buf_.__small);
   }
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 };
 
-#  if defined(_LIBCPP_HAS_BLOCKS_RUNTIME)
+#  if _LIBCPP_HAS_BLOCKS_RUNTIME
 
 extern "C" void* _Block_copy(const void*);
 extern "C" void _Block_release(const void*);
@@ -752,7 +752,7 @@ class __func<_Rp1 (^)(_ArgTypes1...), _Alloc, _Rp(_ArgTypes...)> : public __base
 
 public:
   _LIBCPP_HIDE_FROM_ABI explicit __func(__block_type const& __f)
-#    ifdef _LIBCPP_HAS_OBJC_ARC
+#    if _LIBCPP_HAS_OBJC_ARC
       : __f_(__f)
 #    else
       : __f_(reinterpret_cast<__block_type>(__f ? _Block_copy(__f) : nullptr))
@@ -763,7 +763,7 @@ public:
   // [TODO] add && to save on a retain
 
   _LIBCPP_HIDE_FROM_ABI explicit __func(__block_type __f, const _Alloc& /* unused */)
-#    ifdef _LIBCPP_HAS_OBJC_ARC
+#    if _LIBCPP_HAS_OBJC_ARC
       : __f_(__f)
 #    else
       : __f_(reinterpret_cast<__block_type>(__f ? _Block_copy(__f) : nullptr))
@@ -785,7 +785,7 @@ public:
   }
 
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void destroy() _NOEXCEPT {
-#    ifndef _LIBCPP_HAS_OBJC_ARC
+#    if !_LIBCPP_HAS_OBJC_ARC
     if (__f_)
       _Block_release(__f_);
 #    endif
@@ -804,7 +804,7 @@ public:
     return std::__invoke(__f_, std::forward<_ArgTypes>(__arg)...);
   }
 
-#    ifndef _LIBCPP_HAS_NO_RTTI
+#    if _LIBCPP_HAS_RTTI
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual const void* target(type_info const& __ti) const _NOEXCEPT {
     if (__ti == typeid(__func::__block_type))
       return &__f_;
@@ -814,7 +814,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual const std::type_info& target_type() const _NOEXCEPT {
     return typeid(__func::__block_type);
   }
-#    endif // _LIBCPP_HAS_NO_RTTI
+#    endif // _LIBCPP_HAS_RTTI
 };
 
 #  endif // _LIBCPP_HAS_EXTENSION_BLOCKS
@@ -906,14 +906,14 @@ public:
   // function invocation:
   _LIBCPP_HIDE_FROM_ABI _Rp operator()(_ArgTypes...) const;
 
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
   // function target access:
   _LIBCPP_HIDE_FROM_ABI const std::type_info& target_type() const _NOEXCEPT;
   template <typename _Tp>
   _LIBCPP_HIDE_FROM_ABI _Tp* target() _NOEXCEPT;
   template <typename _Tp>
   _LIBCPP_HIDE_FROM_ABI const _Tp* target() const _NOEXCEPT;
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 };
 
 #  if _LIBCPP_STD_VER >= 17
@@ -990,7 +990,7 @@ _Rp function<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __arg) const {
   return __f_(std::forward<_ArgTypes>(__arg)...);
 }
 
-#  ifndef _LIBCPP_HAS_NO_RTTI
+#  if _LIBCPP_HAS_RTTI
 
 template <class _Rp, class... _ArgTypes>
 const std::type_info& function<_Rp(_ArgTypes...)>::target_type() const _NOEXCEPT {
@@ -1009,7 +1009,7 @@ const _Tp* function<_Rp(_ArgTypes...)>::target() const _NOEXCEPT {
   return __f_.template target<_Tp>();
 }
 
-#  endif // _LIBCPP_HAS_NO_RTTI
+#  endif // _LIBCPP_HAS_RTTI
 
 template <class _Rp, class... _ArgTypes>
 inline _LIBCPP_HIDE_FROM_ABI bool operator==(const function<_Rp(_ArgTypes...)>& __f, nullptr_t) _NOEXCEPT {
diff --git a/yass/third_party/libc++/trunk/include/__functional/hash.h b/yass/third_party/libc++/trunk/include/__functional/hash.h
index 59dce7ac9c..8abec99f72 100644
--- a/yass/third_party/libc++/trunk/include/__functional/hash.h
+++ b/yass/third_party/libc++/trunk/include/__functional/hash.h
@@ -356,12 +356,12 @@ struct _LIBCPP_TEMPLATE_VIS hash<unsigned char> : public __unary_function<unsign
   _LIBCPP_HIDE_FROM_ABI size_t operator()(unsigned char __v) const _NOEXCEPT { return static_cast<size_t>(__v); }
 };
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template <>
 struct _LIBCPP_TEMPLATE_VIS hash<char8_t> : public __unary_function<char8_t, size_t> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(char8_t __v) const _NOEXCEPT { return static_cast<size_t>(__v); }
 };
-#endif // !_LIBCPP_HAS_NO_CHAR8_T
+#endif // _LIBCPP_HAS_CHAR8_T
 
 template <>
 struct _LIBCPP_TEMPLATE_VIS hash<char16_t> : public __unary_function<char16_t, size_t> {
@@ -416,7 +416,7 @@ struct _LIBCPP_TEMPLATE_VIS hash<long long> : public __scalar_hash<long long> {}
 template <>
 struct _LIBCPP_TEMPLATE_VIS hash<unsigned long long> : public __scalar_hash<unsigned long long> {};
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 
 template <>
 struct _LIBCPP_TEMPLATE_VIS hash<__int128_t> : public __scalar_hash<__int128_t> {};
diff --git a/yass/third_party/libc++/trunk/include/__fwd/string.h b/yass/third_party/libc++/trunk/include/__fwd/string.h
index 2418e1f9b2..f13a359402 100644
--- a/yass/third_party/libc++/trunk/include/__fwd/string.h
+++ b/yass/third_party/libc++/trunk/include/__fwd/string.h
@@ -24,7 +24,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits;
 template <>
 struct char_traits<char>;
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template <>
 struct char_traits<char8_t>;
 #endif
@@ -48,7 +48,7 @@ using string = basic_string<char>;
 using wstring = basic_string<wchar_t>;
 #endif
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 using u8string = basic_string<char8_t>;
 #endif
 
@@ -67,7 +67,7 @@ using string _LIBCPP_AVAILABILITY_PMR = basic_string<char>;
 using wstring _LIBCPP_AVAILABILITY_PMR = basic_string<wchar_t>;
 #  endif
 
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 using u8string _LIBCPP_AVAILABILITY_PMR = basic_string<char8_t>;
 #  endif
 
@@ -83,7 +83,7 @@ class _LIBCPP_PREFERRED_NAME(string)
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
       _LIBCPP_PREFERRED_NAME(wstring)
 #endif
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
       _LIBCPP_PREFERRED_NAME(u8string)
 #endif
       _LIBCPP_PREFERRED_NAME(u16string)
@@ -93,7 +93,7 @@ class _LIBCPP_PREFERRED_NAME(string)
 #  ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
       _LIBCPP_PREFERRED_NAME(pmr::wstring)
 #  endif
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
       _LIBCPP_PREFERRED_NAME(pmr::u8string)
 #  endif
       _LIBCPP_PREFERRED_NAME(pmr::u16string)
diff --git a/yass/third_party/libc++/trunk/include/__fwd/string_view.h b/yass/third_party/libc++/trunk/include/__fwd/string_view.h
index 72a64be5b0..e1acd87425 100644
--- a/yass/third_party/libc++/trunk/include/__fwd/string_view.h
+++ b/yass/third_party/libc++/trunk/include/__fwd/string_view.h
@@ -23,7 +23,7 @@ template <class _CharT, class _Traits = char_traits<_CharT> >
 class _LIBCPP_TEMPLATE_VIS basic_string_view;
 
 typedef basic_string_view<char> string_view;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 typedef basic_string_view<char8_t> u8string_view;
 #endif
 typedef basic_string_view<char16_t> u16string_view;
@@ -38,7 +38,7 @@ class _LIBCPP_PREFERRED_NAME(string_view)
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
       _LIBCPP_PREFERRED_NAME(wstring_view)
 #endif
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
       _LIBCPP_PREFERRED_NAME(u8string_view)
 #endif
       _LIBCPP_PREFERRED_NAME(u16string_view)
diff --git a/yass/third_party/libc++/trunk/include/__hash_table b/yass/third_party/libc++/trunk/include/__hash_table
index 821d4edd8d..560e873adc 100644
--- a/yass/third_party/libc++/trunk/include/__hash_table
+++ b/yass/third_party/libc++/trunk/include/__hash_table
@@ -1210,9 +1210,9 @@ void __hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(__hash_table& __u,
     max_load_factor() = __u.max_load_factor();
     if (bucket_count() != 0) {
       __next_pointer __cache = __detach();
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
       try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
         const_iterator __i = __u.begin();
         while (__cache != nullptr && __u.size() != 0) {
           __cache->__upcast()->__get_value() = std::move(__u.remove(__i++)->__get_value());
@@ -1220,12 +1220,12 @@ void __hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(__hash_table& __u,
           __node_insert_multi(__cache->__upcast());
           __cache = __next;
         }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         __deallocate_node(__cache);
         throw;
       }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       __deallocate_node(__cache);
     }
     const_iterator __i = __u.begin();
@@ -1256,21 +1256,21 @@ void __hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_unique(_InputIterator __
 
   if (bucket_count() != 0) {
     __next_pointer __cache = __detach();
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (; __cache != nullptr && __first != __last; ++__first) {
         __cache->__upcast()->__get_value() = *__first;
         __next_pointer __next              = __cache->__next_;
         __node_insert_unique(__cache->__upcast());
         __cache = __next;
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __deallocate_node(__cache);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __deallocate_node(__cache);
   }
   for (; __first != __last; ++__first)
@@ -1288,21 +1288,21 @@ void __hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_multi(_InputIterator __f
       " or the nodes value type");
   if (bucket_count() != 0) {
     __next_pointer __cache = __detach();
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (; __cache != nullptr && __first != __last; ++__first) {
         __cache->__upcast()->__get_value() = *__first;
         __next_pointer __next              = __cache->__next_;
         __node_insert_multi(__cache->__upcast());
         __cache = __next;
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __deallocate_node(__cache);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __deallocate_node(__cache);
   }
   for (; __first != __last; ++__first)
diff --git a/yass/third_party/libc++/trunk/include/__iterator/counted_iterator.h b/yass/third_party/libc++/trunk/include/__iterator/counted_iterator.h
index d461427cce..65e178bc0c 100644
--- a/yass/third_party/libc++/trunk/include/__iterator/counted_iterator.h
+++ b/yass/third_party/libc++/trunk/include/__iterator/counted_iterator.h
@@ -132,7 +132,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator++(int) {
     _LIBCPP_ASSERT_UNCATEGORIZED(__count_ > 0, "Iterator already at or past end.");
     --__count_;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
       return __current_++;
     } catch (...) {
@@ -141,7 +141,7 @@ public:
     }
 #  else
     return __current_++;
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   }
 
   _LIBCPP_HIDE_FROM_ABI constexpr counted_iterator operator++(int)
diff --git a/yass/third_party/libc++/trunk/include/__locale b/yass/third_party/libc++/trunk/include/__locale
index 4b382764b4..5fb0c19903 100644
--- a/yass/third_party/libc++/trunk/include/__locale
+++ b/yass/third_party/libc++/trunk/include/__locale
@@ -982,7 +982,7 @@ protected:
   virtual int do_max_length() const _NOEXCEPT;
 };
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 
 // template <> class codecvt<char16_t, char8_t, mbstate_t> // C++20
 
@@ -1145,7 +1145,7 @@ protected:
   virtual int do_max_length() const _NOEXCEPT;
 };
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 
 // template <> class codecvt<char32_t, char8_t, mbstate_t> // C++20
 
@@ -1255,7 +1255,7 @@ extern template class _LIBCPP_DEPRECATED_IN_CXX20
 _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>; // deprecated in C++20
 extern template class _LIBCPP_DEPRECATED_IN_CXX20
 _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>; // deprecated in C++20
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char8_t, mbstate_t>; // C++20
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char8_t, mbstate_t>; // C++20
 #endif
diff --git a/yass/third_party/libc++/trunk/include/__memory/addressof.h b/yass/third_party/libc++/trunk/include/__memory/addressof.h
index fa590212c4..ecb68e0fe6 100644
--- a/yass/third_party/libc++/trunk/include/__memory/addressof.h
+++ b/yass/third_party/libc++/trunk/include/__memory/addressof.h
@@ -23,7 +23,7 @@ inline _LIBCPP_CONSTEXPR_SINCE_CXX17 _LIBCPP_NO_CFI _LIBCPP_HIDE_FROM_ABI _Tp* a
   return __builtin_addressof(__x);
 }
 
-#if defined(_LIBCPP_HAS_OBJC_ARC) && !defined(_LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF)
+#if _LIBCPP_HAS_OBJC_ARC && !defined(_LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF)
 // Objective-C++ Automatic Reference Counting uses qualified pointers
 // that require special addressof() signatures. When
 // _LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF is defined, the compiler
@@ -33,7 +33,7 @@ inline _LIBCPP_HIDE_FROM_ABI __strong _Tp* addressof(__strong _Tp& __x) _NOEXCEP
   return &__x;
 }
 
-#  ifdef _LIBCPP_HAS_OBJC_ARC_WEAK
+#  if _LIBCPP_HAS_OBJC_ARC_WEAK
 template <class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI __weak _Tp* addressof(__weak _Tp& __x) _NOEXCEPT {
   return &__x;
diff --git a/yass/third_party/libc++/trunk/include/__memory/aligned_alloc.h b/yass/third_party/libc++/trunk/include/__memory/aligned_alloc.h
index cb424328bc..33fe8af77d 100644
--- a/yass/third_party/libc++/trunk/include/__memory/aligned_alloc.h
+++ b/yass/third_party/libc++/trunk/include/__memory/aligned_alloc.h
@@ -19,7 +19,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#ifndef _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 
 // Low-level helpers to call the aligned allocation and deallocation functions
 // on the target platform. This is used to implement libc++'s own memory
@@ -30,7 +30,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_aligned_alloc(std::size_t __alignment, std::size_t __size) {
 #  if defined(_LIBCPP_MSVCRT_LIKE)
   return ::_aligned_malloc(__size, __alignment);
-#  elif _LIBCPP_STD_VER >= 17 && !defined(_LIBCPP_HAS_NO_C11_ALIGNED_ALLOC)
+#  elif _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_C11_ALIGNED_ALLOC
   // aligned_alloc() requires that __size is a multiple of __alignment,
   // but for C++ [new.delete.general], only states "if the value of an
   // alignment argument passed to any of these functions is not a valid
@@ -57,7 +57,7 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_aligned_free(void* __ptr) {
 #  endif
 }
 
-#endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#endif // _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 
 _LIBCPP_END_NAMESPACE_STD
 
diff --git a/yass/third_party/libc++/trunk/include/__memory/shared_ptr.h b/yass/third_party/libc++/trunk/include/__memory/shared_ptr.h
index 20c1b69f45..65870ba574 100644
--- a/yass/third_party/libc++/trunk/include/__memory/shared_ptr.h
+++ b/yass/third_party/libc++/trunk/include/__memory/shared_ptr.h
@@ -54,7 +54,7 @@
 #include <cstddef>
 #include <new>
 #include <typeinfo>
-#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
+#if _LIBCPP_HAS_ATOMIC_HEADER
 #  include <__atomic/memory_order.h>
 #endif
 
@@ -70,10 +70,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // NOTE: Relaxed and acq/rel atomics (for increment and decrement respectively)
 // should be sufficient for thread safety.
 // See https://llvm.org/PR22803
-#if defined(__clang__) && __has_builtin(__atomic_add_fetch) && defined(__ATOMIC_RELAXED) && defined(__ATOMIC_ACQ_REL)
-#  define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT
-#elif defined(_LIBCPP_COMPILER_GCC)
-#  define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT
+#if (defined(__clang__) && __has_builtin(__atomic_add_fetch) && defined(__ATOMIC_RELAXED) &&                           \
+     defined(__ATOMIC_ACQ_REL)) ||                                                                                     \
+    defined(_LIBCPP_COMPILER_GCC)
+#  define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT 1
+#else
+#  define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT 0
 #endif
 
 template <class _ValueType>
@@ -98,7 +100,7 @@ inline _LIBCPP_HIDE_FROM_ABI _ValueType __libcpp_acquire_load(_ValueType const*
 
 template <class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI _Tp __libcpp_atomic_refcount_increment(_Tp& __t) _NOEXCEPT {
-#if defined(_LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT) && !defined(_LIBCPP_HAS_NO_THREADS)
+#if _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT && !defined(_LIBCPP_HAS_NO_THREADS)
   return __atomic_add_fetch(&__t, 1, __ATOMIC_RELAXED);
 #else
   return __t += 1;
@@ -107,7 +109,7 @@ inline _LIBCPP_HIDE_FROM_ABI _Tp __libcpp_atomic_refcount_increment(_Tp& __t) _N
 
 template <class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI _Tp __libcpp_atomic_refcount_decrement(_Tp& __t) _NOEXCEPT {
-#if defined(_LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT) && !defined(_LIBCPP_HAS_NO_THREADS)
+#if _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT && !defined(_LIBCPP_HAS_NO_THREADS)
   return __atomic_add_fetch(&__t, -1, __ATOMIC_ACQ_REL);
 #else
   return __t -= 1;
@@ -124,7 +126,7 @@ public:
 };
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_weak_ptr() {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw bad_weak_ptr();
 #else
   _LIBCPP_VERBOSE_ABORT("bad_weak_ptr was thrown in -fno-exceptions mode");
@@ -206,7 +208,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI __shared_ptr_pointer(_Tp __p, _Dp __d, _Alloc __a)
       : __ptr_(__p), __deleter_(std::move(__d)), __alloc_(std::move(__a)) {}
 
-#ifndef _LIBCPP_HAS_NO_RTTI
+#if _LIBCPP_HAS_RTTI
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL const void* __get_deleter(const type_info&) const _NOEXCEPT override;
 #endif
 
@@ -215,14 +217,14 @@ private:
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared_weak() _NOEXCEPT override;
 };
 
-#ifndef _LIBCPP_HAS_NO_RTTI
+#if _LIBCPP_HAS_RTTI
 
 template <class _Tp, class _Dp, class _Alloc>
 const void* __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__get_deleter(const type_info& __t) const _NOEXCEPT {
   return __t == typeid(_Dp) ? std::addressof(__deleter_) : nullptr;
 }
 
-#endif // _LIBCPP_HAS_NO_RTTI
+#endif // _LIBCPP_HAS_RTTI
 
 template <class _Tp, class _Dp, class _Alloc>
 void __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared() _NOEXCEPT {
@@ -455,9 +457,9 @@ public:
 
   template <class _Yp, class _Dp, __enable_if_t<__shared_ptr_deleter_ctor_reqs<_Dp, _Yp, _Tp>::value, int> = 0>
   _LIBCPP_HIDE_FROM_ABI shared_ptr(_Yp* __p, _Dp __d) : __ptr_(__p) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef typename __shared_ptr_default_allocator<_Yp>::type _AllocT;
       typedef __shared_ptr_pointer<_Yp*, _Dp, _AllocT> _CntrlBlk;
 #ifndef _LIBCPP_CXX03_LANG
@@ -466,12 +468,12 @@ public:
     __cntrl_ = new _CntrlBlk(__p, __d, _AllocT());
 #endif // not _LIBCPP_CXX03_LANG
       __enable_weak_this(__p, __p);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __d(__p);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 
   template <class _Yp,
@@ -479,9 +481,9 @@ public:
             class _Alloc,
             __enable_if_t<__shared_ptr_deleter_ctor_reqs<_Dp, _Yp, _Tp>::value, int> = 0>
   _LIBCPP_HIDE_FROM_ABI shared_ptr(_Yp* __p, _Dp __d, _Alloc __a) : __ptr_(__p) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef __shared_ptr_pointer<_Yp*, _Dp, _Alloc> _CntrlBlk;
       typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
       typedef __allocator_destructor<_A2> _D2;
@@ -495,12 +497,12 @@ public:
 #endif // not _LIBCPP_CXX03_LANG
       __cntrl_ = std::addressof(*__hold2.release());
       __enable_weak_this(__p, __p);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __d(__p);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 
   template <class _Dp>
@@ -509,9 +511,9 @@ public:
       _Dp __d,
       __enable_if_t<__shared_ptr_nullptr_deleter_ctor_reqs<_Dp>::value, __nullptr_sfinae_tag> = __nullptr_sfinae_tag())
       : __ptr_(nullptr) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef typename __shared_ptr_default_allocator<_Tp>::type _AllocT;
       typedef __shared_ptr_pointer<nullptr_t, _Dp, _AllocT> _CntrlBlk;
 #ifndef _LIBCPP_CXX03_LANG
@@ -519,12 +521,12 @@ public:
 #else
     __cntrl_ = new _CntrlBlk(__p, __d, _AllocT());
 #endif // not _LIBCPP_CXX03_LANG
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __d(__p);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 
   template <class _Dp, class _Alloc>
@@ -534,9 +536,9 @@ public:
       _Alloc __a,
       __enable_if_t<__shared_ptr_nullptr_deleter_ctor_reqs<_Dp>::value, __nullptr_sfinae_tag> = __nullptr_sfinae_tag())
       : __ptr_(nullptr) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef __shared_ptr_pointer<nullptr_t, _Dp, _Alloc> _CntrlBlk;
       typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
       typedef __allocator_destructor<_A2> _D2;
@@ -549,12 +551,12 @@ public:
         _CntrlBlk(__p, __d, __a);
 #endif // not _LIBCPP_CXX03_LANG
       __cntrl_ = std::addressof(*__hold2.release());
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __d(__p);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 
   template <class _Yp>
@@ -767,12 +769,12 @@ public:
   }
 #endif
 
-#ifndef _LIBCPP_HAS_NO_RTTI
+#if _LIBCPP_HAS_RTTI
   template <class _Dp>
   _LIBCPP_HIDE_FROM_ABI _Dp* __get_deleter() const _NOEXCEPT {
     return static_cast<_Dp*>(__cntrl_ ? const_cast<void*>(__cntrl_->__get_deleter(typeid(_Dp))) : nullptr);
   }
-#endif // _LIBCPP_HAS_NO_RTTI
+#endif // _LIBCPP_HAS_RTTI
 
   template <class _Yp, class _CntrlBlk>
   _LIBCPP_HIDE_FROM_ABI static shared_ptr<_Tp> __create_with_control_block(_Yp* __p, _CntrlBlk* __cntrl) _NOEXCEPT {
@@ -1297,14 +1299,14 @@ _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> reinterpret_pointer_cast(shared_ptr<_Up>&&
 }
 #endif
 
-#ifndef _LIBCPP_HAS_NO_RTTI
+#if _LIBCPP_HAS_RTTI
 
 template <class _Dp, class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI _Dp* get_deleter(const shared_ptr<_Tp>& __p) _NOEXCEPT {
   return __p.template __get_deleter<_Dp>();
 }
 
-#endif // _LIBCPP_HAS_NO_RTTI
+#endif // _LIBCPP_HAS_RTTI
 
 template <class _Tp>
 class _LIBCPP_SHARED_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS weak_ptr {
diff --git a/yass/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h b/yass/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h
index dd72f3c10c..54af1fa1a1 100644
--- a/yass/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h
+++ b/yass/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h
@@ -59,12 +59,12 @@ template <class _ValueType, class _InputIterator, class _Sentinel1, class _Forwa
 inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitialized_copy(
     _InputIterator __ifirst, _Sentinel1 __ilast, _ForwardIterator __ofirst, _EndPredicate __stop_copying) {
   _ForwardIterator __idx = __ofirst;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
 #endif
     for (; __ifirst != __ilast && !__stop_copying(__idx); ++__ifirst, (void)++__idx)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(*__ifirst);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__ofirst, __idx);
     throw;
@@ -89,12 +89,12 @@ template <class _ValueType, class _InputIterator, class _Size, class _ForwardIte
 inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator>
 __uninitialized_copy_n(_InputIterator __ifirst, _Size __n, _ForwardIterator __ofirst, _EndPredicate __stop_copying) {
   _ForwardIterator __idx = __ofirst;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
 #endif
     for (; __n > 0 && !__stop_copying(__idx); ++__ifirst, (void)++__idx, (void)--__n)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(*__ifirst);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__ofirst, __idx);
     throw;
@@ -119,12 +119,12 @@ template <class _ValueType, class _ForwardIterator, class _Sentinel, class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
 __uninitialized_fill(_ForwardIterator __first, _Sentinel __last, const _Tp& __x) {
   _ForwardIterator __idx = __first;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
 #endif
     for (; __idx != __last; ++__idx)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(__x);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__first, __idx);
     throw;
@@ -147,12 +147,12 @@ template <class _ValueType, class _ForwardIterator, class _Size, class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
 __uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x) {
   _ForwardIterator __idx = __first;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
 #endif
     for (; __n > 0; ++__idx, (void)--__n)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(__x);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__first, __idx);
     throw;
@@ -177,12 +177,12 @@ template <class _ValueType, class _ForwardIterator, class _Sentinel>
 inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
 __uninitialized_default_construct(_ForwardIterator __first, _Sentinel __last) {
   auto __idx = __first;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
 #  endif
     for (; __idx != __last; ++__idx)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__first, __idx);
     throw;
@@ -203,12 +203,12 @@ inline _LIBCPP_HIDE_FROM_ABI void uninitialized_default_construct(_ForwardIterat
 template <class _ValueType, class _ForwardIterator, class _Size>
 inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator __uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
   auto __idx = __first;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
 #  endif
     for (; __n > 0; ++__idx, (void)--__n)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__first, __idx);
     throw;
@@ -230,12 +230,12 @@ template <class _ValueType, class _ForwardIterator, class _Sentinel>
 inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
 __uninitialized_value_construct(_ForwardIterator __first, _Sentinel __last) {
   auto __idx = __first;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
 #  endif
     for (; __idx != __last; ++__idx)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__first, __idx);
     throw;
@@ -256,12 +256,12 @@ inline _LIBCPP_HIDE_FROM_ABI void uninitialized_value_construct(_ForwardIterator
 template <class _ValueType, class _ForwardIterator, class _Size>
 inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator __uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
   auto __idx = __first;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
 #  endif
     for (; __n > 0; ++__idx, (void)--__n)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__first, __idx);
     throw;
@@ -292,13 +292,13 @@ inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitiali
     _EndPredicate __stop_moving,
     _IterMove __iter_move) {
   auto __idx = __ofirst;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
 #  endif
     for (; __ifirst != __ilast && !__stop_moving(__idx); ++__idx, (void)++__ifirst) {
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(__iter_move(__ifirst));
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__ofirst, __idx);
     throw;
@@ -330,12 +330,12 @@ template <class _ValueType,
 inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitialized_move_n(
     _InputIterator __ifirst, _Size __n, _ForwardIterator __ofirst, _EndPredicate __stop_moving, _IterMove __iter_move) {
   auto __idx = __ofirst;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
 #  endif
     for (; __n > 0 && !__stop_moving(__idx); ++__idx, (void)++__ifirst, --__n)
       ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(__iter_move(__ifirst));
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     std::__destroy(__ofirst, __idx);
     throw;
@@ -627,7 +627,7 @@ __uninitialized_allocator_relocate(_Alloc& __alloc, _Tp* __first, _Tp* __last, _
         std::__make_exception_guard(_AllocatorDestroyRangeReverse<_Alloc, _Tp*>(__alloc, __destruct_first, __result));
     auto __iter = __first;
     while (__iter != __last) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
       allocator_traits<_Alloc>::construct(__alloc, __result, std::move_if_noexcept(*__iter));
 #else
       allocator_traits<_Alloc>::construct(__alloc, __result, std::move(*__iter));
diff --git a/yass/third_party/libc++/trunk/include/__memory/unique_temporary_buffer.h b/yass/third_party/libc++/trunk/include/__memory/unique_temporary_buffer.h
index 001254e8fa..8a8c327be6 100644
--- a/yass/third_party/libc++/trunk/include/__memory/unique_temporary_buffer.h
+++ b/yass/third_party/libc++/trunk/include/__memory/unique_temporary_buffer.h
@@ -62,7 +62,7 @@ __allocate_unique_temporary_buffer(ptrdiff_t __count) {
   if (__count > __max_count)
     __count = __max_count;
   while (__count > 0) {
-#if !defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION)
+#if _LIBCPP_HAS_ALIGNED_ALLOCATION
     if (__is_overaligned_for_new(_LIBCPP_ALIGNOF(_Tp))) {
       align_val_t __al = align_val_t(_LIBCPP_ALIGNOF(_Tp));
       __ptr            = static_cast<_Tp*>(::operator new(__count * sizeof(_Tp), __al, nothrow));
diff --git a/yass/third_party/libc++/trunk/include/__mutex/mutex.h b/yass/third_party/libc++/trunk/include/__mutex/mutex.h
index 1ed0154712..9c0c9ad6b5 100644
--- a/yass/third_party/libc++/trunk/include/__mutex/mutex.h
+++ b/yass/third_party/libc++/trunk/include/__mutex/mutex.h
@@ -30,7 +30,7 @@ public:
   mutex(const mutex&)            = delete;
   mutex& operator=(const mutex&) = delete;
 
-#  if defined(_LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION)
+#  if _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION
   _LIBCPP_HIDE_FROM_ABI ~mutex() = default;
 #  else
   ~mutex() _NOEXCEPT;
diff --git a/yass/third_party/libc++/trunk/include/__ostream/basic_ostream.h b/yass/third_party/libc++/trunk/include/__ostream/basic_ostream.h
index 1f7fe8338c..1b1c026706 100644
--- a/yass/third_party/libc++/trunk/include/__ostream/basic_ostream.h
+++ b/yass/third_party/libc++/trunk/include/__ostream/basic_ostream.h
@@ -156,15 +156,15 @@ basic_ostream<_CharT, _Traits>::sentry::sentry(basic_ostream<_CharT, _Traits>& _
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>::sentry::~sentry() {
   if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf) && uncaught_exceptions() == 0) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (__os_.rdbuf()->pubsync() == -1)
         __os_.setstate(ios_base::badbit);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -185,15 +185,15 @@ basic_ostream<_CharT, _Traits>::~basic_ostream() {}
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>&
 basic_ostream<_CharT, _Traits>::operator<<(basic_streambuf<char_type, traits_type>* __sb) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       if (__sb) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
         try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
           typedef istreambuf_iterator<_CharT, _Traits> _Ip;
           typedef ostreambuf_iterator<_CharT, _Traits> _Op;
           _Ip __i(__sb);
@@ -207,27 +207,27 @@ basic_ostream<_CharT, _Traits>::operator<<(basic_streambuf<char_type, traits_typ
           }
           if (__c == 0)
             this->setstate(ios_base::failbit);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
         } catch (...) {
           this->__set_failbit_and_consider_rethrow();
         }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       } else
         this->setstate(ios_base::badbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(bool __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -235,19 +235,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(bool
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(short __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
@@ -262,19 +262,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(short
               .failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsigned short __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -282,19 +282,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsig
       if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(int __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
@@ -309,19 +309,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(int _
               .failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsigned int __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -329,19 +329,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsig
       if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -349,19 +349,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsigned long __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -369,19 +369,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsig
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long long __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -389,19 +389,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsigned long long __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -409,19 +409,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(unsig
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(float __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -429,19 +429,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(float
       if (__f.put(*this, *this, this->fill(), static_cast<double>(__n)).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(double __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -449,19 +449,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(doubl
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long double __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -469,19 +469,19 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(const void* __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
@@ -489,20 +489,20 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(const
       if (__f.put(*this, *this, this->fill(), __n).failed())
         this->setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 __put_character_sequence(basic_ostream<_CharT, _Traits>& __os, const _CharT* __str, size_t __len) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
     if (__s) {
       typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
@@ -516,11 +516,11 @@ __put_character_sequence(basic_ostream<_CharT, _Traits>& __os, const _CharT* __s
               .failed())
         __os.setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __os.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __os;
 }
 
@@ -531,9 +531,9 @@ _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_
 
 template <class _CharT, class _Traits>
 _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, char __cn) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
     if (__s) {
       _CharT __c = __os.widen(__cn);
@@ -548,11 +548,11 @@ _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_
               .failed())
         __os.setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __os.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __os;
 }
 
@@ -580,9 +580,9 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const _CharT* __str) {
 template <class _CharT, class _Traits>
 _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
     if (__s) {
       typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
@@ -609,11 +609,11 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn) {
               .failed())
         __os.setstate(ios_base::badbit | ios_base::failbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __os.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __os;
 }
 
@@ -638,9 +638,9 @@ operator<<(basic_ostream<char, _Traits>& __os, const unsigned char* __str) {
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::put(char_type __c) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __s(*this);
     if (__s) {
       typedef ostreambuf_iterator<_CharT, _Traits> _Op;
@@ -649,37 +649,37 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::put(char_type __
       if (__o.failed())
         this->setstate(ios_base::badbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::write(const char_type* __s, streamsize __n) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     sentry __sen(*this);
     if (__sen && __n) {
       if (this->rdbuf()->sputn(__s, __n) != __n)
         this->setstate(ios_base::badbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::flush() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     if (this->rdbuf()) {
       sentry __s(*this);
       if (__s) {
@@ -687,11 +687,11 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::flush() {
           this->setstate(ios_base::badbit);
       }
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return *this;
 }
 
@@ -823,7 +823,7 @@ basic_ostream<wchar_t, _Traits>& operator<<(basic_ostream<wchar_t, _Traits>&, co
 
 #    endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 
-#    ifndef _LIBCPP_HAS_NO_CHAR8_T
+#    if _LIBCPP_HAS_CHAR8_T
 template <class _Traits>
 basic_ostream<char, _Traits>& operator<<(basic_ostream<char, _Traits>&, char8_t) = delete;
 
diff --git a/yass/third_party/libc++/trunk/include/__ostream/print.h b/yass/third_party/libc++/trunk/include/__ostream/print.h
index 6c82b11e1d..82eb93a845 100644
--- a/yass/third_party/libc++/trunk/include/__ostream/print.h
+++ b/yass/third_party/libc++/trunk/include/__ostream/print.h
@@ -52,9 +52,9 @@ __vprint_nonunicode(ostream& __os, string_view __fmt, format_args __args, bool _
     const char* __str = __o.data();
     size_t __len      = __o.size();
 
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
     try {
-#    endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#    endif // _LIBCPP_HAS_EXCEPTIONS
       typedef ostreambuf_iterator<char> _Ip;
       if (std::__pad_and_output(
               _Ip(__os),
@@ -66,11 +66,11 @@ __vprint_nonunicode(ostream& __os, string_view __fmt, format_args __args, bool _
               .failed())
         __os.setstate(ios_base::badbit | ios_base::failbit);
 
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __os.__set_badbit_and_consider_rethrow();
     }
-#    endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#    endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -115,9 +115,9 @@ _LIBCPP_HIDE_FROM_ABI void __vprint_unicode(ostream& __os, string_view __fmt, fo
   // This is the path for the native API, start with flushing.
   __os.flush();
 
-#        ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#        if _LIBCPP_HAS_EXCEPTIONS
   try {
-#        endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#        endif // _LIBCPP_HAS_EXCEPTIONS
     ostream::sentry __s(__os);
     if (__s) {
 #        ifndef _LIBCPP_WIN32API
@@ -129,11 +129,11 @@ _LIBCPP_HIDE_FROM_ABI void __vprint_unicode(ostream& __os, string_view __fmt, fo
 #        endif
     }
 
-#        ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#        if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __os.__set_badbit_and_consider_rethrow();
   }
-#        endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#        endif // _LIBCPP_HAS_EXCEPTIONS
 #      endif   // _LIBCPP_AVAILABILITY_HAS_PRINT
 }
 
diff --git a/yass/third_party/libc++/trunk/include/__pstl/backends/libdispatch.h b/yass/third_party/libc++/trunk/include/__pstl/backends/libdispatch.h
index 2d6ab49c8f..a92d0978e5 100644
--- a/yass/third_party/libc++/trunk/include/__pstl/backends/libdispatch.h
+++ b/yass/third_party/libc++/trunk/include/__pstl/backends/libdispatch.h
@@ -142,11 +142,11 @@ struct __cpu_traits<__libdispatch_backend_tag> {
 
     unique_ptr<__merge_range_t[], decltype(__destroy)> __ranges(
         [&]() -> __merge_range_t* {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
           try {
 #  endif
             return std::allocator<__merge_range_t>().allocate(__n_ranges);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
           } catch (const std::bad_alloc&) {
             return nullptr;
           }
diff --git a/yass/third_party/libc++/trunk/include/__random/is_valid.h b/yass/third_party/libc++/trunk/include/__random/is_valid.h
index a3e0f143ae..f6679b3fdc 100644
--- a/yass/third_party/libc++/trunk/include/__random/is_valid.h
+++ b/yass/third_party/libc++/trunk/include/__random/is_valid.h
@@ -66,12 +66,12 @@ struct __libcpp_random_is_valid_inttype<unsigned long> : true_type {};
 template <>
 struct __libcpp_random_is_valid_inttype<unsigned long long> : true_type {};
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 template <>
 struct __libcpp_random_is_valid_inttype<__int128_t> : true_type {}; // extension
 template <>
 struct __libcpp_random_is_valid_inttype<__uint128_t> : true_type {}; // extension
-#endif                                                               // _LIBCPP_HAS_NO_INT128
+#endif                                                               // _LIBCPP_HAS_INT128
 
 // [rand.req.urng]/3:
 // A class G meets the uniform random bit generator requirements if G models
diff --git a/yass/third_party/libc++/trunk/include/__random/linear_congruential_engine.h b/yass/third_party/libc++/trunk/include/__random/linear_congruential_engine.h
index 9d77649e9c..a0afda4945 100644
--- a/yass/third_party/libc++/trunk/include/__random/linear_congruential_engine.h
+++ b/yass/third_party/libc++/trunk/include/__random/linear_congruential_engine.h
@@ -48,7 +48,7 @@ struct __lce_alg_picker {
       : _Schrage ? _LCE_Schrage
                  : _LCE_Promote;
 
-#ifdef _LIBCPP_HAS_NO_INT128
+#if !_LIBCPP_HAS_INT128
   static_assert(_Mp != (unsigned long long)(-1) || _Full || _Part || _Schrage,
                 "The current values for a, c, and m are not currently supported on platforms without __int128");
 #endif
@@ -63,7 +63,7 @@ struct __lce_ta;
 
 // 64
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 template <unsigned long long _Ap, unsigned long long _Cp, unsigned long long _Mp>
 struct __lce_ta<_Ap, _Cp, _Mp, (unsigned long long)(-1), _LCE_Promote> {
   typedef unsigned long long result_type;
diff --git a/yass/third_party/libc++/trunk/include/__random/log2.h b/yass/third_party/libc++/trunk/include/__random/log2.h
index 74b4889c64..c96a5247ff 100644
--- a/yass/third_party/libc++/trunk/include/__random/log2.h
+++ b/yass/third_party/libc++/trunk/include/__random/log2.h
@@ -38,7 +38,7 @@ struct __log2_imp<unsigned long long, 0, _Rp> {
   static const size_t value = _Rp + 1;
 };
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 
 template <__uint128_t _Xp, size_t _Rp>
 struct __log2_imp<__uint128_t, _Xp, _Rp> {
@@ -47,16 +47,16 @@ struct __log2_imp<__uint128_t, _Xp, _Rp> {
                   : __log2_imp<unsigned long long, _Xp, 63>::value;
 };
 
-#endif // _LIBCPP_HAS_NO_INT128
+#endif // _LIBCPP_HAS_INT128
 
 template <class _UIntType, _UIntType _Xp>
 struct __log2 {
   static const size_t value = __log2_imp<
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
       __conditional_t<sizeof(_UIntType) <= sizeof(unsigned long long), unsigned long long, __uint128_t>,
 #else
       unsigned long long,
-#endif // _LIBCPP_HAS_NO_INT128
+#endif // _LIBCPP_HAS_INT128
       _Xp,
       sizeof(_UIntType) * __CHAR_BIT__ - 1>::value;
 };
diff --git a/yass/third_party/libc++/trunk/include/__split_buffer b/yass/third_party/libc++/trunk/include/__split_buffer
index 7916769bd8..dfe552fbb4 100644
--- a/yass/third_party/libc++/trunk/include/__split_buffer
+++ b/yass/third_party/libc++/trunk/include/__split_buffer
@@ -440,9 +440,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::reserve(size
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT {
   if (capacity() > size()) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       __split_buffer<value_type, __alloc_rr&> __t(size(), 0, __alloc());
       __t.__construct_at_end(move_iterator<pointer>(__begin_), move_iterator<pointer>(__end_));
       __t.__end_ = __t.__begin_ + (__end_ - __begin_);
@@ -450,10 +450,10 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::shrink_to_fi
       std::swap(__begin_, __t.__begin_);
       std::swap(__end_, __t.__end_);
       std::swap(__end_cap(), __t.__end_cap());
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
diff --git a/yass/third_party/libc++/trunk/include/__string/char_traits.h b/yass/third_party/libc++/trunk/include/__string/char_traits.h
index 9b7d567dd3..107f0a96a0 100644
--- a/yass/third_party/libc++/trunk/include/__string/char_traits.h
+++ b/yass/third_party/libc++/trunk/include/__string/char_traits.h
@@ -257,7 +257,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t> : __char_traits_base<wchar_t, w
 };
 #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 
 template <>
 struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
@@ -277,7 +277,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
   }
 };
 
-#endif // _LIBCPP_HAS_NO_CHAR8_T
+#endif // _LIBCPP_HAS_CHAR8_T
 
 template <>
 struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>
diff --git a/yass/third_party/libc++/trunk/include/__string/constexpr_c_functions.h b/yass/third_party/libc++/trunk/include/__string/constexpr_c_functions.h
index 9b8871e2e7..e62a7b0cd1 100644
--- a/yass/third_party/libc++/trunk/include/__string/constexpr_c_functions.h
+++ b/yass/third_party/libc++/trunk/include/__string/constexpr_c_functions.h
@@ -43,7 +43,7 @@ inline const bool __is_char_type = false;
 template <>
 inline const bool __is_char_type<char> = true;
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template <>
 inline const bool __is_char_type<char8_t> = true;
 #endif
diff --git a/yass/third_party/libc++/trunk/include/__system_error/system_error.h b/yass/third_party/libc++/trunk/include/__system_error/system_error.h
index 3ffa1029ca..2763aaba88 100644
--- a/yass/third_party/libc++/trunk/include/__system_error/system_error.h
+++ b/yass/third_party/libc++/trunk/include/__system_error/system_error.h
@@ -41,7 +41,7 @@ public:
 
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_system_error(int __ev, const char* __what_arg);
 [[__noreturn__]] _LIBCPP_HIDE_FROM_ABI inline void __throw_system_error(error_code __ec, const char* __what_arg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw system_error(__ec, __what_arg);
 #else
   _LIBCPP_VERBOSE_ABORT(
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/container_traits.h b/yass/third_party/libc++/trunk/include/__type_traits/container_traits.h
new file mode 100644
index 0000000000..5262cef94c
--- /dev/null
+++ b/yass/third_party/libc++/trunk/include/__type_traits/container_traits.h
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___TYPE_TRAITS_CONTAINER_TRAITS_H
+#define _LIBCPP___TYPE_TRAITS_CONTAINER_TRAITS_H
+
+#include <__config>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+// // __container_traits is a general purpose utility containing traits describing various containers operations.
+// It currently only has one trait: `__emplacement_has_strong_exception_safety_guarantee`, but it's
+// intended to be extended in the future.
+//
+// These traits should only be used for optimization or QoI purposes. In particular, since this is a libc++ internal
+// mechanism, no user-defined containers should be expected to specialize these traits (in fact it would be illegal for
+// them to do so). Hence, when using these traits to implement something, make sure that a container that fails to
+// specialize these traits does not result in non-conforming code.
+//
+// When a trait is nonsensical for a type, this class still provides a fallback value for that trait.
+// For example, `std::array` does not support `insert` or `emplace`, so
+// `__emplacement_has_strong_exception_safety_guarantee` is false for such types.
+template <class _Container>
+struct __container_traits {
+  // A trait that tells whether a single element insertion/emplacement via member function
+  // `insert(...)` or `emplace(...)` has strong exception guarantee, that is, if the function
+  // exits via an exception, the original container is unaffected
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = false;
+};
+
+_LIBCPP_END_NAMESPACE_STD
+
+#endif // _LIBCPP___TYPE_TRAITS_CONTAINER_TRAITS_H
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/is_integral.h b/yass/third_party/libc++/trunk/include/__type_traits/is_integral.h
index 26969885af..61178720a5 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/is_integral.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/is_integral.h
@@ -28,7 +28,7 @@ template <>          struct __libcpp_is_integral<unsigned char>      { enum { va
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 template <>          struct __libcpp_is_integral<wchar_t>            { enum { value = 1 }; };
 #endif
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template <>          struct __libcpp_is_integral<char8_t>            { enum { value = 1 }; };
 #endif
 template <>          struct __libcpp_is_integral<char16_t>           { enum { value = 1 }; };
@@ -41,7 +41,7 @@ template <>          struct __libcpp_is_integral<long>               { enum { va
 template <>          struct __libcpp_is_integral<unsigned long>      { enum { value = 1 }; };
 template <>          struct __libcpp_is_integral<long long>          { enum { value = 1 }; };
 template <>          struct __libcpp_is_integral<unsigned long long> { enum { value = 1 }; };
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 template <>          struct __libcpp_is_integral<__int128_t>         { enum { value = 1 }; };
 template <>          struct __libcpp_is_integral<__uint128_t>        { enum { value = 1 }; };
 #endif
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/is_pointer.h b/yass/third_party/libc++/trunk/include/__type_traits/is_pointer.h
index 38eb7996c6..9701e57807 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/is_pointer.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/is_pointer.h
@@ -40,7 +40,7 @@ template <class _Tp>
 struct __libcpp_remove_objc_qualifiers {
   typedef _Tp type;
 };
-#  if defined(_LIBCPP_HAS_OBJC_ARC)
+#  if _LIBCPP_HAS_OBJC_ARC
 // clang-format off
 template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __strong> { typedef _Tp type; };
 template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __weak> { typedef _Tp type; };
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/is_scalar.h b/yass/third_party/libc++/trunk/include/__type_traits/is_scalar.h
index 455200de47..242023a687 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/is_scalar.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/is_scalar.h
@@ -37,7 +37,7 @@ inline constexpr bool is_scalar_v = __is_scalar(_Tp);
 
 template <class _Tp>
 struct __is_block : false_type {};
-#  if defined(_LIBCPP_HAS_EXTENSION_BLOCKS)
+#  if _LIBCPP_HAS_EXTENSION_BLOCKS
 template <class _Rp, class... _Args>
 struct __is_block<_Rp (^)(_Args...)> : true_type {};
 #  endif
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h b/yass/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h
index 467548d0aa..a3e19a66f2 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h
@@ -25,7 +25,7 @@ template <>          struct __libcpp_is_signed_integer<signed short>     : publi
 template <>          struct __libcpp_is_signed_integer<signed int>       : public true_type {};
 template <>          struct __libcpp_is_signed_integer<signed long>      : public true_type {};
 template <>          struct __libcpp_is_signed_integer<signed long long> : public true_type {};
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 template <>          struct __libcpp_is_signed_integer<__int128_t>       : public true_type {};
 #endif
 // clang-format on
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/is_unsigned_integer.h b/yass/third_party/libc++/trunk/include/__type_traits/is_unsigned_integer.h
index 265894b32d..86e42a1e81 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/is_unsigned_integer.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/is_unsigned_integer.h
@@ -25,7 +25,7 @@ template <>          struct __libcpp_is_unsigned_integer<unsigned short>     : p
 template <>          struct __libcpp_is_unsigned_integer<unsigned int>       : public true_type {};
 template <>          struct __libcpp_is_unsigned_integer<unsigned long>      : public true_type {};
 template <>          struct __libcpp_is_unsigned_integer<unsigned long long> : public true_type {};
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 template <>          struct __libcpp_is_unsigned_integer<__uint128_t>        : public true_type {};
 #endif
 // clang-format on
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h b/yass/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h
index f7f2e81735..70f84fcd18 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h
@@ -35,7 +35,7 @@ using __make_32_64_or_128_bit_t =
     __copy_unsigned_t<_Tp,
         __conditional_t<sizeof(_Tp) <= sizeof(int32_t),    int32_t,
         __conditional_t<sizeof(_Tp) <= sizeof(int64_t),    int64_t,
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
         __conditional_t<sizeof(_Tp) <= sizeof(__int128_t), __int128_t,
         /* else */                                         void>
 #else
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/make_signed.h b/yass/third_party/libc++/trunk/include/__type_traits/make_signed.h
index d09d6ed4a1..8070690b3a 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/make_signed.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/make_signed.h
@@ -35,11 +35,11 @@ typedef __type_list<signed char,
         __type_list<signed int,
         __type_list<signed long,
         __type_list<signed long long,
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
         __type_list<__int128_t,
 #  endif
         __nat
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
         >
 #  endif
         > > > > > __signed_types;
@@ -63,7 +63,7 @@ template <> struct __make_signed<  signed long,      true> {typedef long      ty
 template <> struct __make_signed<unsigned long,      true> {typedef long      type;};
 template <> struct __make_signed<  signed long long, true> {typedef long long type;};
 template <> struct __make_signed<unsigned long long, true> {typedef long long type;};
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 template <> struct __make_signed<__int128_t,         true> {typedef __int128_t type;};
 template <> struct __make_signed<__uint128_t,        true> {typedef __int128_t type;};
 #  endif
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/make_unsigned.h b/yass/third_party/libc++/trunk/include/__type_traits/make_unsigned.h
index 8757f451eb..562f7bab8a 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/make_unsigned.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/make_unsigned.h
@@ -37,11 +37,11 @@ typedef __type_list<unsigned char,
         __type_list<unsigned int,
         __type_list<unsigned long,
         __type_list<unsigned long long,
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
         __type_list<__uint128_t,
 #  endif
         __nat
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
         >
 #  endif
         > > > > > __unsigned_types;
@@ -65,7 +65,7 @@ template <> struct __make_unsigned<  signed long,      true> {typedef unsigned l
 template <> struct __make_unsigned<unsigned long,      true> {typedef unsigned long      type;};
 template <> struct __make_unsigned<  signed long long, true> {typedef unsigned long long type;};
 template <> struct __make_unsigned<unsigned long long, true> {typedef unsigned long long type;};
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
 template <> struct __make_unsigned<__int128_t,         true> {typedef __uint128_t        type;};
 template <> struct __make_unsigned<__uint128_t,        true> {typedef __uint128_t        type;};
 #  endif
diff --git a/yass/third_party/libc++/trunk/include/__type_traits/promote.h b/yass/third_party/libc++/trunk/include/__type_traits/promote.h
index 2b2a6843b9..0f545bc507 100644
--- a/yass/third_party/libc++/trunk/include/__type_traits/promote.h
+++ b/yass/third_party/libc++/trunk/include/__type_traits/promote.h
@@ -39,7 +39,7 @@ class __promote {
   static double __test(unsigned long);
   static double __test(long long);
   static double __test(unsigned long long);
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   static double __test(__int128_t);
   static double __test(__uint128_t);
 #  endif
@@ -63,7 +63,7 @@ struct __numeric_type {
   static double __test(unsigned long);
   static double __test(long long);
   static double __test(unsigned long long);
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   static double __test(__int128_t);
   static double __test(__uint128_t);
 #  endif
diff --git a/yass/third_party/libc++/trunk/include/__utility/convert_to_integral.h b/yass/third_party/libc++/trunk/include/__utility/convert_to_integral.h
index f1fcdd9801..8947c349d8 100644
--- a/yass/third_party/libc++/trunk/include/__utility/convert_to_integral.h
+++ b/yass/third_party/libc++/trunk/include/__utility/convert_to_integral.h
@@ -42,7 +42,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR long long __convert_to_integral(_
   return __val;
 }
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __int128_t __convert_to_integral(__int128_t __val) { return __val; }
 
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __uint128_t __convert_to_integral(__uint128_t __val) { return __val; }
diff --git a/yass/third_party/libc++/trunk/include/__utility/exception_guard.h b/yass/third_party/libc++/trunk/include/__utility/exception_guard.h
index 9f732ca265..a03bd7e8f3 100644
--- a/yass/third_party/libc++/trunk/include/__utility/exception_guard.h
+++ b/yass/third_party/libc++/trunk/include/__utility/exception_guard.h
@@ -44,7 +44,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // less common, especially one that tries to catch an exception through -fno-exceptions code.
 //
 // __exception_guard can help greatly simplify code that would normally be cluttered by
-// `#if _LIBCPP_HAS_NO_EXCEPTIONS`. For example:
+// `#if _LIBCPP_HAS_EXCEPTIONS`. For example:
 //
 //    template <class Iterator, class Size, class OutputIterator>
 //    Iterator uninitialized_copy_n(Iterator iter, Size n, OutputIterator out) {
@@ -124,7 +124,7 @@ private:
 
 _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__exception_guard_noexceptions);
 
-#ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#if !_LIBCPP_HAS_EXCEPTIONS
 template <class _Rollback>
 using __exception_guard = __exception_guard_noexceptions<_Rollback>;
 #else
diff --git a/yass/third_party/libc++/trunk/include/any b/yass/third_party/libc++/trunk/include/any
index 6e4ff31ff9..e32aa7f8e8 100644
--- a/yass/third_party/libc++/trunk/include/any
+++ b/yass/third_party/libc++/trunk/include/any
@@ -128,7 +128,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
 
 [[noreturn]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST void __throw_bad_any_cast() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw bad_any_cast();
 #  else
   _LIBCPP_VERBOSE_ABORT("bad_any_cast was thrown in -fno-exceptions mode");
@@ -176,7 +176,7 @@ inline _LIBCPP_HIDE_FROM_ABI constexpr const void* __get_fallback_typeid() {
 
 template <class _Tp>
 inline _LIBCPP_HIDE_FROM_ABI bool __compare_typeid(type_info const* __id, const void* __fallback_id) {
-#  if !defined(_LIBCPP_HAS_NO_RTTI)
+#  if _LIBCPP_HAS_RTTI
   if (__id && *__id == typeid(_Tp))
     return true;
 #  endif
@@ -266,7 +266,7 @@ public:
   // 6.3.4 any observers
   _LIBCPP_HIDE_FROM_ABI bool has_value() const _NOEXCEPT { return __h_ != nullptr; }
 
-#  if !defined(_LIBCPP_HAS_NO_RTTI)
+#  if _LIBCPP_HAS_RTTI
   _LIBCPP_HIDE_FROM_ABI const type_info& type() const _NOEXCEPT {
     if (__h_) {
       return *static_cast<type_info const*>(this->__call(_Action::_TypeInfo));
@@ -372,7 +372,7 @@ private:
   }
 
   _LIBCPP_HIDE_FROM_ABI static void* __type_info() {
-#  if !defined(_LIBCPP_HAS_NO_RTTI)
+#  if _LIBCPP_HAS_RTTI
     return const_cast<void*>(static_cast<void const*>(&typeid(_Tp)));
 #  else
     return nullptr;
@@ -444,7 +444,7 @@ private:
   }
 
   _LIBCPP_HIDE_FROM_ABI static void* __type_info() {
-#  if !defined(_LIBCPP_HAS_NO_RTTI)
+#  if _LIBCPP_HAS_RTTI
     return const_cast<void*>(static_cast<void const*>(&typeid(_Tp)));
 #  else
     return nullptr;
@@ -579,7 +579,7 @@ _LIBCPP_HIDE_FROM_ABI add_pointer_t<_ValueType> any_cast(any* __any) _NOEXCEPT {
     void* __p = __any->__call(
         _Action::_Get,
         nullptr,
-#  if !defined(_LIBCPP_HAS_NO_RTTI)
+#  if _LIBCPP_HAS_RTTI
         &typeid(_ValueType),
 #  else
         nullptr,
diff --git a/yass/third_party/libc++/trunk/include/atomic b/yass/third_party/libc++/trunk/include/atomic
index bf65750672..ebd46238ee 100644
--- a/yass/third_party/libc++/trunk/include/atomic
+++ b/yass/third_party/libc++/trunk/include/atomic
@@ -613,7 +613,7 @@ template <class T>
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_HAS_NO_ATOMIC_HEADER
+#if !_LIBCPP_HAS_ATOMIC_HEADER
 #  error <atomic> is not implemented
 #endif
 
diff --git a/yass/third_party/libc++/trunk/include/cuchar b/yass/third_party/libc++/trunk/include/cuchar
index bfc26f03aa..1d156eb7aa 100644
--- a/yass/third_party/libc++/trunk/include/cuchar
+++ b/yass/third_party/libc++/trunk/include/cuchar
@@ -59,7 +59,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
 
-#  if !defined(_LIBCPP_HAS_NO_C8RTOMB_MBRTOC8)
+#  if _LIBCPP_HAS_C8RTOMB_MBRTOC8
 using ::mbrtoc8 _LIBCPP_USING_IF_EXISTS;
 using ::c8rtomb _LIBCPP_USING_IF_EXISTS;
 #  endif
diff --git a/yass/third_party/libc++/trunk/include/deque b/yass/third_party/libc++/trunk/include/deque
index bab0526629..11219d1a99 100644
--- a/yass/third_party/libc++/trunk/include/deque
+++ b/yass/third_party/libc++/trunk/include/deque
@@ -220,6 +220,8 @@ template <class T, class Allocator, class Predicate>
 #include <__ranges/size.h>
 #include <__split_buffer>
 #include <__type_traits/conditional.h>
+#include <__type_traits/container_traits.h>
+#include <__type_traits/disjunction.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_convertible.h>
@@ -918,7 +920,7 @@ private:
     (void)__end;
     (void)__annotation_type;
     (void)__place;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     // __beg - index of the first item to annotate
     // __end - index behind the last item to annotate (so last item + 1)
     // __annotation_type - __asan_unposion or __asan_poison
@@ -1011,23 +1013,23 @@ private:
       std::__annotate_double_ended_contiguous_container<_Allocator>(
           __mem_beg, __mem_end, __old_beg, __old_end, __new_beg, __new_end);
     }
-#endif // !_LIBCPP_HAS_NO_ASAN
+#endif // _LIBCPP_HAS_ASAN
   }
 
   _LIBCPP_HIDE_FROM_ABI void __annotate_new(size_type __current_size) const _NOEXCEPT {
     (void)__current_size;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     if (__current_size == 0)
       __annotate_from_to(0, __map_.size() * __block_size, __asan_poison, __asan_back_moved);
     else {
       __annotate_from_to(0, __start_, __asan_poison, __asan_front_moved);
       __annotate_from_to(__start_ + __current_size, __map_.size() * __block_size, __asan_poison, __asan_back_moved);
     }
-#endif
+#endif // _LIBCPP_HAS_ASAN
   }
 
   _LIBCPP_HIDE_FROM_ABI void __annotate_delete() const _NOEXCEPT {
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     if (empty()) {
       for (size_t __i = 0; __i < __map_.size(); ++__i) {
         __annotate_whole_block(__i, __asan_unposion);
@@ -1036,19 +1038,19 @@ private:
       __annotate_from_to(0, __start_, __asan_unposion, __asan_front_moved);
       __annotate_from_to(__start_ + size(), __map_.size() * __block_size, __asan_unposion, __asan_back_moved);
     }
-#endif
+#endif // _LIBCPP_HAS_ASAN
   }
 
   _LIBCPP_HIDE_FROM_ABI void __annotate_increase_front(size_type __n) const _NOEXCEPT {
     (void)__n;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_from_to(__start_ - __n, __start_, __asan_unposion, __asan_front_moved);
 #endif
   }
 
   _LIBCPP_HIDE_FROM_ABI void __annotate_increase_back(size_type __n) const _NOEXCEPT {
     (void)__n;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_from_to(__start_ + size(), __start_ + size() + __n, __asan_unposion, __asan_back_moved);
 #endif
   }
@@ -1056,7 +1058,7 @@ private:
   _LIBCPP_HIDE_FROM_ABI void __annotate_shrink_front(size_type __old_size, size_type __old_start) const _NOEXCEPT {
     (void)__old_size;
     (void)__old_start;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_from_to(__old_start, __old_start + (__old_size - size()), __asan_poison, __asan_front_moved);
 #endif
   }
@@ -1064,7 +1066,7 @@ private:
   _LIBCPP_HIDE_FROM_ABI void __annotate_shrink_back(size_type __old_size, size_type __old_start) const _NOEXCEPT {
     (void)__old_size;
     (void)__old_start;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_from_to(__old_start + size(), __old_start + __old_size, __asan_poison, __asan_back_moved);
 #endif
   }
@@ -1077,7 +1079,7 @@ private:
   __annotate_whole_block(size_t __block_index, __asan_annotation_type __annotation_type) const _NOEXCEPT {
     (void)__block_index;
     (void)__annotation_type;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __map_const_iterator __block_it = __map_.begin() + __block_index;
     const void* __block_start       = std::__to_address(*__block_it);
     const void* __block_end         = std::__to_address(*__block_it + __block_size);
@@ -1090,7 +1092,7 @@ private:
     }
 #endif
   }
-#if !defined(_LIBCPP_HAS_NO_ASAN)
+#if _LIBCPP_HAS_ASAN
 
 public:
   _LIBCPP_HIDE_FROM_ABI bool __verify_asan_annotations() const _NOEXCEPT {
@@ -1152,7 +1154,7 @@ public:
   }
 
 private:
-#endif // _LIBCPP_VERIFY_ASAN_DEQUE_ANNOTATIONS
+#endif // _LIBCPP_HAS_ASAN
   _LIBCPP_HIDE_FROM_ABI bool __maybe_remove_front_spare(bool __keep_one = true) {
     if (__front_spare_blocks() >= 2 || (!__keep_one && __front_spare_blocks())) {
       __annotate_whole_block(0, __asan_unposion);
@@ -2123,22 +2125,22 @@ void deque<_Tp, _Allocator>::__add_front_capacity(size_type __n) {
     size_type __ds = (__nb + __back_capacity) * __block_size - __map_.empty();
     __split_buffer<pointer, __pointer_allocator&> __buf(
         std::max<size_type>(2 * __map_.capacity(), __nb + __map_.size()), 0, __map_.__alloc());
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (; __nb > 0; --__nb) {
         __buf.push_back(__alloc_traits::allocate(__a, __block_size));
         // ASan: this is empty container, we have to poison whole block
         __annotate_poison_block(std::__to_address(__buf.back()), std::__to_address(__buf.back() + __block_size));
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __annotate_delete();
       for (__map_pointer __i = __buf.begin(); __i != __buf.end(); ++__i)
         __alloc_traits::deallocate(__a, *__i, __block_size);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     for (; __back_capacity > 0; --__back_capacity) {
       __buf.push_back(__map_.back());
       __map_.pop_back();
@@ -2248,22 +2250,22 @@ void deque<_Tp, _Allocator>::__add_back_capacity(size_type __n) {
         std::max<size_type>(2 * __map_.capacity(), __nb + __map_.size()),
         __map_.size() - __front_capacity,
         __map_.__alloc());
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (; __nb > 0; --__nb) {
         __buf.push_back(__alloc_traits::allocate(__a, __block_size));
         // ASan: this is an empty container, we have to poison the whole block
         __annotate_poison_block(std::__to_address(__buf.back()), std::__to_address(__buf.back() + __block_size));
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __annotate_delete();
       for (__map_pointer __i = __buf.begin(); __i != __buf.end(); ++__i)
         __alloc_traits::deallocate(__a, *__i, __block_size);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     for (; __front_capacity > 0; --__front_capacity) {
       __buf.push_back(__map_.front());
       __map_.pop_front();
@@ -2609,6 +2611,17 @@ inline constexpr bool __format::__enable_insertable<std::deque<wchar_t>> = true;
 
 #endif // _LIBCPP_STD_VER >= 20
 
+template <class _Tp, class _Allocator>
+struct __container_traits<deque<_Tp, _Allocator> > {
+  // http://eel.is/c++draft/deque.modifiers#3
+  //  If an exception is thrown other than by the copy constructor, move constructor, assignment operator, or move
+  //  assignment operator of T, there are no effects. If an exception is thrown while inserting a single element at
+  //  either end, there are no effects. Otherwise, if an exception is thrown by the move constructor of a
+  //  non-Cpp17CopyInsertable T, the effects are unspecified.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee =
+      _Or<is_nothrow_move_constructible<_Tp>, __is_cpp17_copy_insertable<_Allocator> >::value;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/experimental/__simd/utility.h b/yass/third_party/libc++/trunk/include/experimental/__simd/utility.h
index 0103b06b71..01736925d1 100644
--- a/yass/third_party/libc++/trunk/include/experimental/__simd/utility.h
+++ b/yass/third_party/libc++/trunk/include/experimental/__simd/utility.h
@@ -47,7 +47,7 @@ _LIBCPP_HIDE_FROM_ABI auto __choose_mask_type() {
   } else if constexpr (sizeof(_Tp) == 8) {
     return uint64_t{};
   }
-#  ifndef _LIBCPP_HAS_NO_INT128
+#  if _LIBCPP_HAS_INT128
   else if constexpr (sizeof(_Tp) == 16) {
     return __uint128_t{};
   }
diff --git a/yass/third_party/libc++/trunk/include/forward_list b/yass/third_party/libc++/trunk/include/forward_list
index c5ae8add51..d3262fb8ea 100644
--- a/yass/third_party/libc++/trunk/include/forward_list
+++ b/yass/third_party/libc++/trunk/include/forward_list
@@ -218,6 +218,7 @@ template <class T, class Allocator, class Predicate>
 #include <__ranges/container_compatible_range.h>
 #include <__ranges/from_range.h>
 #include <__type_traits/conditional.h>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_const.h>
@@ -1122,13 +1123,13 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n, const
   if (__n > 0) {
     __node_pointer __first = this->__create_node(/* next = */ nullptr, __v);
     __node_pointer __last  = __first;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (--__n; __n != 0; --__n, __last = __last->__next_) {
         __last->__next_ = this->__create_node(/* next = */ nullptr, __v);
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       while (__first != nullptr) {
         __node_pointer __next = __first->__next_;
@@ -1137,7 +1138,7 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n, const
       }
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __last->__next_ = __r->__next_;
     __r->__next_    = __first;
     __r             = static_cast<__begin_node_pointer>(__last);
@@ -1162,13 +1163,13 @@ forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _Inp
     __node_pointer __first = this->__create_node(/* next = */ nullptr, *__f);
     __node_pointer __last  = __first;
 
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (++__f; __f != __l; ++__f, ((void)(__last = __last->__next_))) {
         __last->__next_ = this->__create_node(/* next = */ nullptr, *__f);
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       while (__first != nullptr) {
         __node_pointer __next = __first->__next_;
@@ -1177,7 +1178,7 @@ forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _Inp
       }
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 
     __last->__next_ = __r->__next_;
     __r->__next_    = __first;
@@ -1544,6 +1545,17 @@ erase(forward_list<_Tp, _Allocator>& __c, const _Up& __v) {
 }
 #endif
 
+template <class _Tp, class _Allocator>
+struct __container_traits<forward_list<_Tp, _Allocator> > {
+  // http://eel.is/c++draft/container.reqmts
+  // Unless otherwise specified (see [associative.reqmts.except], [unord.req.except], [deque.modifiers],
+  // [inplace.vector.modifiers], and [vector.modifiers]) all container types defined in this Clause meet the following
+  // additional requirements:
+  // - If an exception is thrown by an insert() or emplace() function while inserting a single element, that
+  // function has no effects.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = true;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/fstream b/yass/third_party/libc++/trunk/include/fstream
index de7c614836..dce0efc71d 100644
--- a/yass/third_party/libc++/trunk/include/fstream
+++ b/yass/third_party/libc++/trunk/include/fstream
@@ -211,8 +211,10 @@ typedef basic_fstream<wchar_t> wfstream;
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 
-#if defined(_LIBCPP_MSVCRT) || defined(_NEWLIB_VERSION)
-#  define _LIBCPP_HAS_NO_OFF_T_FUNCTIONS
+#if !defined(_LIBCPP_MSVCRT) && !defined(_NEWLIB_VERSION)
+#  define _LIBCPP_HAS_OFF_T_FUNCTIONS 1
+#else
+#  define _LIBCPP_HAS_OFF_T_FUNCTIONS 0
 #endif
 
 #if !defined(_LIBCPP_HAS_NO_FILESYSTEM) && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
@@ -254,7 +256,7 @@ public:
   // 27.9.1.4 Members:
   _LIBCPP_HIDE_FROM_ABI bool is_open() const;
   basic_filebuf* open(const char* __s, ios_base::openmode __mode);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   basic_filebuf* open(const wchar_t* __s, ios_base::openmode __mode);
 #  endif
   _LIBCPP_HIDE_FROM_ABI basic_filebuf* open(const string& __s, ios_base::openmode __mode);
@@ -281,7 +283,7 @@ public:
 #  endif //  _LIBCPP_STD_VER >= 26
 
   _LIBCPP_HIDE_FROM_ABI inline static const char* __make_mdstring(ios_base::openmode __mode) _NOEXCEPT;
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   _LIBCPP_HIDE_FROM_ABI inline static const wchar_t* __make_mdwstring(ios_base::openmode __mode) _NOEXCEPT;
 #  endif
 
@@ -485,14 +487,14 @@ inline basic_filebuf<_CharT, _Traits>& basic_filebuf<_CharT, _Traits>::operator=
 
 template <class _CharT, class _Traits>
 basic_filebuf<_CharT, _Traits>::~basic_filebuf() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     close();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   if (__owns_eb_)
     delete[] __extbuf_;
   if (__owns_ib_)
@@ -630,7 +632,7 @@ const char* basic_filebuf<_CharT, _Traits>::__make_mdstring(ios_base::openmode _
   __libcpp_unreachable();
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 const wchar_t* basic_filebuf<_CharT, _Traits>::__make_mdwstring(ios_base::openmode __mode) _NOEXCEPT {
   switch (__mode & ~ios_base::ate) {
@@ -705,7 +707,7 @@ inline basic_filebuf<_CharT, _Traits>* basic_filebuf<_CharT, _Traits>::__open(in
   return __do_open(fdopen(__fd, __mdstr), __mode);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 // This is basically the same as the char* overload except that it uses _wfopen
 // and long mode strings.
 template <class _CharT, class _Traits>
@@ -929,7 +931,7 @@ basic_filebuf<_CharT, _Traits>::seekoff(off_type __off, ios_base::seekdir __way,
   default:
     return pos_type(off_type(-1));
   }
-#  if defined(_LIBCPP_HAS_NO_OFF_T_FUNCTIONS)
+#  if !_LIBCPP_HAS_OFF_T_FUNCTIONS
   if (fseek(__file_, __width > 0 ? __width * __off : 0, __whence))
     return pos_type(off_type(-1));
   pos_type __r = ftell(__file_);
@@ -947,7 +949,7 @@ typename basic_filebuf<_CharT, _Traits>::pos_type
 basic_filebuf<_CharT, _Traits>::seekpos(pos_type __sp, ios_base::openmode) {
   if (__file_ == nullptr || sync())
     return pos_type(off_type(-1));
-#  if defined(_LIBCPP_HAS_NO_OFF_T_FUNCTIONS)
+#  if !_LIBCPP_HAS_OFF_T_FUNCTIONS
   if (fseek(__file_, __sp, SEEK_SET))
     return pos_type(off_type(-1));
 #  else
@@ -1000,7 +1002,7 @@ int basic_filebuf<_CharT, _Traits>::sync() {
         }
       }
     }
-#  if defined(_LIBCPP_HAS_NO_OFF_T_FUNCTIONS)
+#  if !_LIBCPP_HAS_OFF_T_FUNCTIONS
     if (fseek(__file_, -__c, SEEK_CUR))
       return -1;
 #  else
@@ -1098,7 +1100,7 @@ public:
 
   _LIBCPP_HIDE_FROM_ABI basic_ifstream();
   _LIBCPP_HIDE_FROM_ABI explicit basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   _LIBCPP_HIDE_FROM_ABI explicit basic_ifstream(const wchar_t* __s, ios_base::openmode __mode = ios_base::in);
 #  endif
   _LIBCPP_HIDE_FROM_ABI explicit basic_ifstream(const string& __s, ios_base::openmode __mode = ios_base::in);
@@ -1118,7 +1120,7 @@ public:
 #  endif
   _LIBCPP_HIDE_FROM_ABI bool is_open() const;
   void open(const char* __s, ios_base::openmode __mode = ios_base::in);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   void open(const wchar_t* __s, ios_base::openmode __mode = ios_base::in);
 #  endif
   void open(const string& __s, ios_base::openmode __mode = ios_base::in);
@@ -1147,7 +1149,7 @@ inline basic_ifstream<_CharT, _Traits>::basic_ifstream(const char* __s, ios_base
     this->setstate(ios_base::failbit);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 inline basic_ifstream<_CharT, _Traits>::basic_ifstream(const wchar_t* __s, ios_base::openmode __mode)
     : basic_istream<char_type, traits_type>(std::addressof(__sb_)) {
@@ -1206,7 +1208,7 @@ void basic_ifstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode _
     this->setstate(ios_base::failbit);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 void basic_ifstream<_CharT, _Traits>::open(const wchar_t* __s, ios_base::openmode __mode) {
   if (__sb_.open(__s, __mode | ios_base::in))
@@ -1254,7 +1256,7 @@ public:
 
   _LIBCPP_HIDE_FROM_ABI basic_ofstream();
   _LIBCPP_HIDE_FROM_ABI explicit basic_ofstream(const char* __s, ios_base::openmode __mode = ios_base::out);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   _LIBCPP_HIDE_FROM_ABI explicit basic_ofstream(const wchar_t* __s, ios_base::openmode __mode = ios_base::out);
 #  endif
   _LIBCPP_HIDE_FROM_ABI explicit basic_ofstream(const string& __s, ios_base::openmode __mode = ios_base::out);
@@ -1276,7 +1278,7 @@ public:
 #  endif
   _LIBCPP_HIDE_FROM_ABI bool is_open() const;
   void open(const char* __s, ios_base::openmode __mode = ios_base::out);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   void open(const wchar_t* __s, ios_base::openmode __mode = ios_base::out);
 #  endif
   void open(const string& __s, ios_base::openmode __mode = ios_base::out);
@@ -1306,7 +1308,7 @@ inline basic_ofstream<_CharT, _Traits>::basic_ofstream(const char* __s, ios_base
     this->setstate(ios_base::failbit);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 inline basic_ofstream<_CharT, _Traits>::basic_ofstream(const wchar_t* __s, ios_base::openmode __mode)
     : basic_ostream<char_type, traits_type>(std::addressof(__sb_)) {
@@ -1365,7 +1367,7 @@ void basic_ofstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode _
     this->setstate(ios_base::failbit);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 void basic_ofstream<_CharT, _Traits>::open(const wchar_t* __s, ios_base::openmode __mode) {
   if (__sb_.open(__s, __mode | ios_base::out))
@@ -1414,7 +1416,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI basic_fstream();
   _LIBCPP_HIDE_FROM_ABI explicit basic_fstream(const char* __s,
                                                ios_base::openmode __mode = ios_base::in | ios_base::out);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   _LIBCPP_HIDE_FROM_ABI explicit basic_fstream(const wchar_t* __s,
                                                ios_base::openmode __mode = ios_base::in | ios_base::out);
 #  endif
@@ -1440,7 +1442,7 @@ public:
 #  endif
   _LIBCPP_HIDE_FROM_ABI bool is_open() const;
   _LIBCPP_HIDE_FROM_ABI void open(const char* __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
   void open(const wchar_t* __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
 #  endif
   _LIBCPP_HIDE_FROM_ABI void open(const string& __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
@@ -1469,7 +1471,7 @@ inline basic_fstream<_CharT, _Traits>::basic_fstream(const char* __s, ios_base::
     this->setstate(ios_base::failbit);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 inline basic_fstream<_CharT, _Traits>::basic_fstream(const wchar_t* __s, ios_base::openmode __mode)
     : basic_iostream<char_type, traits_type>(std::addressof(__sb_)) {
@@ -1528,7 +1530,7 @@ void basic_fstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __
     this->setstate(ios_base::failbit);
 }
 
-#  ifdef _LIBCPP_HAS_OPEN_WITH_WCHAR
+#  if _LIBCPP_HAS_OPEN_WITH_WCHAR
 template <class _CharT, class _Traits>
 void basic_fstream<_CharT, _Traits>::open(const wchar_t* __s, ios_base::openmode __mode) {
   if (__sb_.open(__s, __mode))
diff --git a/yass/third_party/libc++/trunk/include/future b/yass/third_party/libc++/trunk/include/future
index 7dc38a3354..dfa373d659 100644
--- a/yass/third_party/libc++/trunk/include/future
+++ b/yass/third_party/libc++/trunk/include/future
@@ -500,7 +500,7 @@ public:
 
 // Declared above std::future_error
 void __throw_future_error(future_errc __ev) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw future_error(make_error_code(__ev));
 #  else
   (void)__ev;
@@ -779,15 +779,15 @@ inline __deferred_assoc_state<_Rp, _Fp>::__deferred_assoc_state(_Fp&& __f) : __f
 
 template <class _Rp, class _Fp>
 void __deferred_assoc_state<_Rp, _Fp>::__execute() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->set_value(__func_());
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->set_exception(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _Fp>
@@ -809,16 +809,16 @@ inline __deferred_assoc_state<void, _Fp>::__deferred_assoc_state(_Fp&& __f) : __
 
 template <class _Fp>
 void __deferred_assoc_state<void, _Fp>::__execute() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __func_();
     this->set_value();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->set_exception(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _Rp, class _Fp>
@@ -840,15 +840,15 @@ inline __async_assoc_state<_Rp, _Fp>::__async_assoc_state(_Fp&& __f) : __func_(s
 
 template <class _Rp, class _Fp>
 void __async_assoc_state<_Rp, _Fp>::__execute() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->set_value(__func_());
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->set_exception(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _Rp, class _Fp>
@@ -876,16 +876,16 @@ inline __async_assoc_state<void, _Fp>::__async_assoc_state(_Fp&& __f) : __func_(
 
 template <class _Fp>
 void __async_assoc_state<void, _Fp>::__execute() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __func_();
     this->set_value();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     this->set_exception(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _Fp>
@@ -1656,15 +1656,15 @@ void packaged_task<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __args) {
     __throw_future_error(future_errc::no_state);
   if (__p_.__state_->__has_value())
     __throw_future_error(future_errc::promise_already_satisfied);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __p_.set_value(__f_(std::forward<_ArgTypes>(__args)...));
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __p_.set_exception(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _Rp, class... _ArgTypes>
@@ -1673,15 +1673,15 @@ void packaged_task<_Rp(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __
     __throw_future_error(future_errc::no_state);
   if (__p_.__state_->__has_value())
     __throw_future_error(future_errc::promise_already_satisfied);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __p_.set_value_at_thread_exit(__f_(std::forward<_ArgTypes>(__args)...));
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __p_.set_exception_at_thread_exit(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _Rp, class... _ArgTypes>
@@ -1758,16 +1758,16 @@ void packaged_task<void(_ArgTypes...)>::operator()(_ArgTypes... __args) {
     __throw_future_error(future_errc::no_state);
   if (__p_.__state_->__has_value())
     __throw_future_error(future_errc::promise_already_satisfied);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __f_(std::forward<_ArgTypes>(__args)...);
     __p_.set_value();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __p_.set_exception(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class... _ArgTypes>
@@ -1776,16 +1776,16 @@ void packaged_task<void(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... _
     __throw_future_error(future_errc::no_state);
   if (__p_.__state_->__has_value())
     __throw_future_error(future_errc::promise_already_satisfied);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __f_(std::forward<_ArgTypes>(__args)...);
     __p_.set_value_at_thread_exit();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __p_.set_exception_at_thread_exit(current_exception());
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class... _ArgTypes>
@@ -1857,13 +1857,13 @@ async(launch __policy, _Fp&& __f, _Args&&... __args) {
   typedef __async_func<__decay_t<_Fp>, __decay_t<_Args>...> _BF;
   typedef typename _BF::_Rp _Rp;
 
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
   try {
 #    endif
     if (__does_policy_contain(__policy, launch::async))
       return std::__make_async_assoc_state<_Rp>(
           _BF(_LIBCPP_AUTO_CAST(std::forward<_Fp>(__f)), _LIBCPP_AUTO_CAST(std::forward<_Args>(__args))...));
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     if (__policy == launch::async)
       throw;
diff --git a/yass/third_party/libc++/trunk/include/iomanip b/yass/third_party/libc++/trunk/include/iomanip
index 2c4023d4ee..538fc413bb 100644
--- a/yass/third_party/libc++/trunk/include/iomanip
+++ b/yass/third_party/libc++/trunk/include/iomanip
@@ -236,9 +236,9 @@ public:
 template <class _CharT, class _Traits, class _MoneyT>
 _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_istream<_CharT, _Traits>::sentry __s(__is);
     if (__s) {
       typedef istreambuf_iterator<_CharT, _Traits> _Ip;
@@ -248,11 +248,11 @@ operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x) {
       __mf.get(_Ip(__is), _Ip(), __x.__intl_, __is, __err, __x.__mon_);
       __is.setstate(__err);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __is.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __is;
 }
 
@@ -285,9 +285,9 @@ public:
 template <class _CharT, class _Traits, class _MoneyT>
 _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
     if (__s) {
       typedef ostreambuf_iterator<_CharT, _Traits> _Op;
@@ -296,11 +296,11 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x) {
       if (__mf.put(_Op(__os), __x.__intl_, __os, __os.fill(), __x.__mon_).failed())
         __os.setstate(ios_base::badbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __os.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __os;
 }
 
@@ -333,9 +333,9 @@ public:
 template <class _CharT, class _Traits>
 _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_istream<_CharT, _Traits>::sentry __s(__is);
     if (__s) {
       typedef istreambuf_iterator<_CharT, _Traits> _Ip;
@@ -345,11 +345,11 @@ operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x) {
       __tf.get(_Ip(__is), _Ip(), __is, __err, __x.__tm_, __x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_));
       __is.setstate(__err);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __is.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __is;
 }
 
@@ -382,9 +382,9 @@ public:
 template <class _CharT, class _Traits>
 _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
     if (__s) {
       typedef ostreambuf_iterator<_CharT, _Traits> _Op;
@@ -394,11 +394,11 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x) {
               .failed())
         __os.setstate(ios_base::badbit);
     }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __os.__set_badbit_and_consider_rethrow();
   }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   return __os;
 }
 
diff --git a/yass/third_party/libc++/trunk/include/ios b/yass/third_party/libc++/trunk/include/ios
index d4f15a269a..546c5462f2 100644
--- a/yass/third_party/libc++/trunk/include/ios
+++ b/yass/third_party/libc++/trunk/include/ios
@@ -232,7 +232,7 @@ storage-class-specifier const error_category& iostream_category() noexcept;
 // [ios.syn]
 #  include <iosfwd>
 
-#  if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
+#  if _LIBCPP_HAS_ATOMIC_HEADER
 #    include <__atomic/atomic.h> // for __xindex_
 #  endif
 
@@ -441,7 +441,7 @@ public:
 };
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_failure(char const* __msg) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw ios_base::failure(__msg);
 #  else
   _LIBCPP_VERBOSE_ABORT("ios_base::failure was thrown in -fno-exceptions mode with message \"%s\"", __msg);
diff --git a/yass/third_party/libc++/trunk/include/iosfwd b/yass/third_party/libc++/trunk/include/iosfwd
index eeafcc37c5..9079ce2151 100644
--- a/yass/third_party/libc++/trunk/include/iosfwd
+++ b/yass/third_party/libc++/trunk/include/iosfwd
@@ -134,7 +134,7 @@ typedef fpos<mbstate_t> streampos;
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 typedef fpos<mbstate_t> wstreampos;
 #endif
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 typedef fpos<mbstate_t> u8streampos;
 #endif
 typedef fpos<mbstate_t> u16streampos;
diff --git a/yass/third_party/libc++/trunk/include/istream b/yass/third_party/libc++/trunk/include/istream
index 8ee29ba330..45ca95369c 100644
--- a/yass/third_party/libc++/trunk/include/istream
+++ b/yass/third_party/libc++/trunk/include/istream
@@ -357,13 +357,13 @@ __input_arithmetic(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __s(__is);
   if (__s) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       typedef istreambuf_iterator<_CharT, _Traits> _Ip;
       typedef num_get<_CharT, _Ip> _Fp;
       std::use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __n);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -438,9 +438,9 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __s(__is);
   if (__s) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       typedef istreambuf_iterator<_CharT, _Traits> _Ip;
       typedef num_get<_CharT, _Ip> _Fp;
       long __temp;
@@ -454,7 +454,7 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp
       } else {
         __n = static_cast<_Tp>(__temp);
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -462,7 +462,7 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __is.setstate(__state);
   }
   return __is;
@@ -484,7 +484,7 @@ __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n)
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
 #  endif
       _CharT* __s               = __p;
@@ -505,7 +505,7 @@ __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n)
       __is.width(0);
       if (__s == __p)
         __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -572,7 +572,7 @@ _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>& operator>>(basic_istream<_
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
 #  endif
       typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
@@ -580,7 +580,7 @@ _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>& operator>>(basic_istream<_
         __state |= ios_base::eofbit | ios_base::failbit;
       else
         __c = _Traits::to_char_type(__i);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -614,9 +614,9 @@ basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_typ
   sentry __s(*this, true);
   if (__s) {
     if (__sb) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
         while (true) {
           typename traits_type::int_type __i = this->rdbuf()->sgetc();
           if (traits_type::eq_int_type(__i, _Traits::eof())) {
@@ -630,7 +630,7 @@ basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_typ
         }
         if (__gc_ == 0)
           __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         __state |= ios_base::badbit;
         if (__gc_ == 0)
@@ -641,7 +641,7 @@ basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_typ
           throw;
         }
       }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     } else {
       __state |= ios_base::failbit;
     }
@@ -657,7 +657,7 @@ typename basic_istream<_CharT, _Traits>::int_type basic_istream<_CharT, _Traits>
   int_type __r              = traits_type::eof();
   sentry __s(*this, true);
   if (__s) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
 #  endif
       __r = this->rdbuf()->sbumpc();
@@ -665,7 +665,7 @@ typename basic_istream<_CharT, _Traits>::int_type basic_istream<_CharT, _Traits>
         __state |= ios_base::failbit | ios_base::eofbit;
       else
         __gc_ = 1;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       this->__setstate_nothrow(this->rdstate() | ios_base::badbit);
       if (this->exceptions() & ios_base::badbit) {
@@ -685,7 +685,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::get(char_type* _
   sentry __sen(*this, true);
   if (__sen) {
     if (__n > 0) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       try {
 #  endif
         while (__gc_ < __n - 1) {
@@ -703,7 +703,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::get(char_type* _
         }
         if (__gc_ == 0)
           __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         __state |= ios_base::badbit;
         this->__setstate_nothrow(__state);
@@ -734,9 +734,9 @@ basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __s
   __gc_                     = 0;
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       while (true) {
         typename traits_type::int_type __i = this->rdbuf()->sgetc();
         if (traits_type::eq_int_type(__i, traits_type::eof())) {
@@ -751,12 +751,12 @@ basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __s
         __inc_gcount();
         this->rdbuf()->sbumpc();
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       // according to the spec, exceptions here are caught but not rethrown
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     if (__gc_ == 0)
       __state |= ios_base::failbit;
     this->setstate(__state);
@@ -771,9 +771,9 @@ basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_typ
   __gc_                     = 0;
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       while (true) {
         typename traits_type::int_type __i = this->rdbuf()->sgetc();
         if (traits_type::eq_int_type(__i, traits_type::eof())) {
@@ -794,7 +794,7 @@ basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_typ
         this->rdbuf()->sbumpc();
         __inc_gcount();
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -806,7 +806,7 @@ basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_typ
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   }
   if (__n > 0)
     *__s = char_type();
@@ -822,9 +822,9 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::ignore(streamsiz
   __gc_                     = 0;
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (__n == numeric_limits<streamsize>::max()) {
         while (true) {
           typename traits_type::int_type __i = this->rdbuf()->sbumpc();
@@ -848,7 +848,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::ignore(streamsiz
             break;
         }
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -856,7 +856,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::ignore(streamsiz
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->setstate(__state);
   }
   return *this;
@@ -869,13 +869,13 @@ typename basic_istream<_CharT, _Traits>::int_type basic_istream<_CharT, _Traits>
   int_type __r              = traits_type::eof();
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       __r = this->rdbuf()->sgetc();
       if (traits_type::eq_int_type(__r, traits_type::eof()))
         __state |= ios_base::eofbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -883,7 +883,7 @@ typename basic_istream<_CharT, _Traits>::int_type basic_istream<_CharT, _Traits>
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->setstate(__state);
   }
   return __r;
@@ -895,13 +895,13 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::read(char_type*
   __gc_                     = 0;
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       __gc_ = this->rdbuf()->sgetn(__s, __n);
       if (__gc_ != __n)
         __state |= ios_base::failbit | ios_base::eofbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -909,7 +909,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::read(char_type*
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   } else {
     __state |= ios_base::failbit;
   }
@@ -923,9 +923,9 @@ streamsize basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize _
   __gc_                     = 0;
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       streamsize __c = this->rdbuf()->in_avail();
       switch (__c) {
       case -1:
@@ -940,7 +940,7 @@ streamsize basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize _
           __state |= ios_base::failbit | ios_base::eofbit;
         break;
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -948,7 +948,7 @@ streamsize basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize _
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   } else {
     __state |= ios_base::failbit;
   }
@@ -963,12 +963,12 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::putback(char_typ
   this->clear(__state);
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (this->rdbuf() == nullptr || this->rdbuf()->sputbackc(__c) == traits_type::eof())
         __state |= ios_base::badbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -976,7 +976,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::putback(char_typ
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   } else {
     __state |= ios_base::failbit;
   }
@@ -991,12 +991,12 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::unget() {
   this->clear(__state);
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (this->rdbuf() == nullptr || this->rdbuf()->sungetc() == traits_type::eof())
         __state |= ios_base::badbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -1004,7 +1004,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::unget() {
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   } else {
     __state |= ios_base::failbit;
   }
@@ -1021,14 +1021,14 @@ int basic_istream<_CharT, _Traits>::sync() {
 
   int __r = 0;
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (this->rdbuf()->pubsync() == -1) {
         __state |= ios_base::badbit;
         __r = -1;
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -1036,7 +1036,7 @@ int basic_istream<_CharT, _Traits>::sync() {
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->setstate(__state);
   }
   return __r;
@@ -1048,11 +1048,11 @@ typename basic_istream<_CharT, _Traits>::pos_type basic_istream<_CharT, _Traits>
   pos_type __r(-1);
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -1060,7 +1060,7 @@ typename basic_istream<_CharT, _Traits>::pos_type basic_istream<_CharT, _Traits>
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->setstate(__state);
   }
   return __r;
@@ -1072,12 +1072,12 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::seekg(pos_type _
   this->clear(__state);
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (this->rdbuf()->pubseekpos(__pos, ios_base::in) == pos_type(-1))
         __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -1085,7 +1085,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::seekg(pos_type _
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->setstate(__state);
   }
   return *this;
@@ -1097,12 +1097,12 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::seekg(off_type _
   this->clear(__state);
   sentry __sen(*this, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::in) == pos_type(-1))
         __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       this->__setstate_nothrow(__state);
@@ -1110,7 +1110,7 @@ basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>::seekg(off_type _
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     this->setstate(__state);
   }
   return *this;
@@ -1121,9 +1121,9 @@ _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>& ws(basic_istream<_CharT, _
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
       while (true) {
         typename _Traits::int_type __i = __is.rdbuf()->sgetc();
@@ -1135,7 +1135,7 @@ _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>& ws(basic_istream<_CharT, _
           break;
         __is.rdbuf()->sbumpc();
       }
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -1143,7 +1143,7 @@ _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>& ws(basic_istream<_CharT, _
         throw;
       }
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     __is.setstate(__state);
   }
   return __is;
@@ -1211,7 +1211,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
 #  endif
       __str.clear();
@@ -1243,7 +1243,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _
       __is.width(0);
       if (__c == 0)
         __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -1263,7 +1263,7 @@ getline(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _All
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
 #  endif
       __str.clear();
@@ -1286,7 +1286,7 @@ getline(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _All
       }
       if (__extr == 0)
         __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
@@ -1324,7 +1324,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x) {
   ios_base::iostate __state = ios_base::goodbit;
   typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
   if (__sen) {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
 #  endif
       basic_string<_CharT, _Traits> __str;
@@ -1348,7 +1348,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x) {
       __x = bitset<_Size>(__str);
       if (_Size > 0 && __c == 0)
         __state |= ios_base::failbit;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __state |= ios_base::badbit;
       __is.__setstate_nothrow(__state);
diff --git a/yass/third_party/libc++/trunk/include/list b/yass/third_party/libc++/trunk/include/list
index 05234f7696..4a169b08d8 100644
--- a/yass/third_party/libc++/trunk/include/list
+++ b/yass/third_party/libc++/trunk/include/list
@@ -225,6 +225,7 @@ template <class T, class Allocator, class Predicate>
 #include <__ranges/container_compatible_range.h>
 #include <__ranges/from_range.h>
 #include <__type_traits/conditional.h>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_nothrow_assignable.h>
@@ -1157,13 +1158,13 @@ list<_Tp, _Alloc>::insert(const_iterator __p, size_type __n, const value_type& _
     ++__ds;
     __r          = iterator(__node->__as_link());
     iterator __e = __r;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (--__n; __n != 0; --__n, (void)++__e, ++__ds) {
         __e.__ptr_->__next_ = this->__create_node(/* prev = */ __e.__ptr_, /* next = */ nullptr, __x)->__as_link();
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       while (true) {
         __base_pointer __prev    = __e.__ptr_->__prev_;
@@ -1175,7 +1176,7 @@ list<_Tp, _Alloc>::insert(const_iterator __p, size_type __n, const value_type& _
       }
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __link_nodes(__p.__ptr_, __r.__ptr_, __e.__ptr_);
     base::__sz() += __ds;
   }
@@ -1199,13 +1200,13 @@ list<_Tp, _Alloc>::__insert_with_sentinel(const_iterator __p, _Iterator __f, _Se
     ++__ds;
     __r          = iterator(__node->__as_link());
     iterator __e = __r;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (++__f; __f != __l; ++__f, (void)++__e, ++__ds) {
         __e.__ptr_->__next_ = this->__create_node(/* prev = */ __e.__ptr_, /* next = */ nullptr, *__f)->__as_link();
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       while (true) {
         __base_pointer __prev    = __e.__ptr_->__prev_;
@@ -1217,7 +1218,7 @@ list<_Tp, _Alloc>::__insert_with_sentinel(const_iterator __p, _Iterator __f, _Se
       }
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __link_nodes(__p.__ptr_, __r.__ptr_, __e.__ptr_);
     base::__sz() += __ds;
   }
@@ -1370,13 +1371,13 @@ void list<_Tp, _Alloc>::resize(size_type __n) {
     ++__ds;
     iterator __r = iterator(__node->__as_link());
     iterator __e = __r;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (--__n; __n != 0; --__n, (void)++__e, ++__ds) {
         __e.__ptr_->__next_ = this->__create_node(/* prev = */ __e.__ptr_, /* next = */ nullptr)->__as_link();
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       while (true) {
         __base_pointer __prev    = __e.__ptr_->__prev_;
@@ -1388,7 +1389,7 @@ void list<_Tp, _Alloc>::resize(size_type __n) {
       }
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __link_nodes_at_back(__r.__ptr_, __e.__ptr_);
     base::__sz() += __ds;
   }
@@ -1406,13 +1407,13 @@ void list<_Tp, _Alloc>::resize(size_type __n, const value_type& __x) {
     __base_pointer __nl = __node->__as_link();
     iterator __r        = iterator(__nl);
     iterator __e        = __r;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (--__n; __n != 0; --__n, (void)++__e, ++__ds) {
         __e.__ptr_->__next_ = this->__create_node(/* prev = */ __e.__ptr_, /* next = */ nullptr, __x)->__as_link();
       }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       while (true) {
         __base_pointer __prev    = __e.__ptr_->__prev_;
@@ -1424,7 +1425,7 @@ void list<_Tp, _Alloc>::resize(size_type __n, const value_type& __x) {
       }
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __link_nodes(base::__end_as_link(), __r.__ptr_, __e.__ptr_);
     base::__sz() += __ds;
   }
@@ -1715,6 +1716,17 @@ inline constexpr bool __format::__enable_insertable<std::list<wchar_t>> = true;
 
 #endif // _LIBCPP_STD_VER >= 20
 
+template <class _Tp, class _Allocator>
+struct __container_traits<list<_Tp, _Allocator> > {
+  // http://eel.is/c++draft/container.reqmts
+  // Unless otherwise specified (see [associative.reqmts.except], [unord.req.except], [deque.modifiers],
+  // [inplace.vector.modifiers], and [vector.modifiers]) all container types defined in this Clause meet the following
+  // additional requirements:
+  // - If an exception is thrown by an insert() or emplace() function while inserting a single element, that
+  // function has no effects.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = true;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/locale b/yass/third_party/libc++/trunk/include/locale
index 573910a85b..782475ea7e 100644
--- a/yass/third_party/libc++/trunk/include/locale
+++ b/yass/third_party/libc++/trunk/include/locale
@@ -223,7 +223,11 @@ template <class charT> class messages_byname;
 #    if !defined(__BIONIC__) && !defined(_NEWLIB_VERSION) && !defined(__EMSCRIPTEN__)
 #      define _LIBCPP_HAS_CATOPEN 1
 #      include <nl_types.h>
+#    else
+#      define _LIBCPP_HAS_CATOPEN 0
 #    endif
+#  else
+#    define _LIBCPP_HAS_CATOPEN 0
 #  endif
 
 #  ifdef _LIBCPP_LOCALE__L_EXTENSIONS
@@ -3074,7 +3078,7 @@ locale::id messages<_CharT>::id;
 
 template <class _CharT>
 typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const {
-#  ifdef _LIBCPP_HAS_CATOPEN
+#  if _LIBCPP_HAS_CATOPEN
   return (catalog)catopen(__nm.c_str(), NL_CAT_LOCALE);
 #  else  // !_LIBCPP_HAS_CATOPEN
   (void)__nm;
@@ -3085,7 +3089,7 @@ typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<
 template <class _CharT>
 typename messages<_CharT>::string_type
 messages<_CharT>::do_get(catalog __c, int __set, int __msgid, const string_type& __dflt) const {
-#  ifdef _LIBCPP_HAS_CATOPEN
+#  if _LIBCPP_HAS_CATOPEN
   string __ndflt;
   __narrow_to_utf8<sizeof(char_type) * __CHAR_BIT__>()(
       std::back_inserter(__ndflt), __dflt.c_str(), __dflt.c_str() + __dflt.size());
@@ -3105,7 +3109,7 @@ messages<_CharT>::do_get(catalog __c, int __set, int __msgid, const string_type&
 
 template <class _CharT>
 void messages<_CharT>::do_close(catalog __c) const {
-#  ifdef _LIBCPP_HAS_CATOPEN
+#  if _LIBCPP_HAS_CATOPEN
   catclose((nl_catd)__c);
 #  else  // !_LIBCPP_HAS_CATOPEN
   (void)__c;
diff --git a/yass/third_party/libc++/trunk/include/map b/yass/third_party/libc++/trunk/include/map
index 7fca4c8a08..fabf39512a 100644
--- a/yass/third_party/libc++/trunk/include/map
+++ b/yass/third_party/libc++/trunk/include/map
@@ -594,6 +594,7 @@ erase_if(multimap<Key, T, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__ranges/container_compatible_range.h>
 #include <__ranges/from_range.h>
 #include <__tree>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/remove_const.h>
 #include <__type_traits/type_identity.h>
@@ -1644,6 +1645,14 @@ erase_if(map<_Key, _Tp, _Compare, _Allocator>& __c, _Predicate __pred) {
 }
 #endif
 
+template <class _Key, class _Tp, class _Compare, class _Allocator>
+struct __container_traits<map<_Key, _Tp, _Compare, _Allocator> > {
+  // http://eel.is/c++draft/associative.reqmts.except#2
+  // For associative containers, if an exception is thrown by any operation from within
+  // an insert or emplace function inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = true;
+};
+
 template <class _Key, class _Tp, class _Compare = less<_Key>, class _Allocator = allocator<pair<const _Key, _Tp> > >
 class _LIBCPP_TEMPLATE_VIS multimap {
 public:
@@ -2158,6 +2167,14 @@ erase_if(multimap<_Key, _Tp, _Compare, _Allocator>& __c, _Predicate __pred) {
 }
 #endif
 
+template <class _Key, class _Tp, class _Compare, class _Allocator>
+struct __container_traits<multimap<_Key, _Tp, _Compare, _Allocator> > {
+  // http://eel.is/c++draft/associative.reqmts.except#2
+  // For associative containers, if an exception is thrown by any operation from within
+  // an insert or emplace function inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = true;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/module.modulemap b/yass/third_party/libc++/trunk/include/module.modulemap
index 3ea91274a9..5a0e199394 100644
--- a/yass/third_party/libc++/trunk/include/module.modulemap
+++ b/yass/third_party/libc++/trunk/include/module.modulemap
@@ -79,6 +79,7 @@ module std_core [system] {
     }
     module conditional                                { header "__type_traits/conditional.h" }
     module conjunction                                { header "__type_traits/conjunction.h" }
+    module container_traits                           { header "__type_traits/container_traits.h" }
     module copy_cv                                    { header "__type_traits/copy_cv.h" }
     module copy_cvref                                 { header "__type_traits/copy_cvref.h" }
     module datasizeof                                 { header "__type_traits/datasizeof.h" }
diff --git a/yass/third_party/libc++/trunk/include/new b/yass/third_party/libc++/trunk/include/new
index 3252b0bb1a..2947ee1795 100644
--- a/yass/third_party/libc++/trunk/include/new
+++ b/yass/third_party/libc++/trunk/include/new
@@ -103,16 +103,22 @@ void  operator delete[](void* ptr, void*) noexcept;
 #  pragma GCC system_header
 #endif
 
-#if !defined(__cpp_sized_deallocation) || __cpp_sized_deallocation < 201309L
-#  define _LIBCPP_HAS_NO_LANGUAGE_SIZED_DEALLOCATION
+#if defined(__cpp_sized_deallocation) && __cpp_sized_deallocation >= 201309L
+#  define _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION 1
+#else
+#  define _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION 0
 #endif
 
-#if !defined(_LIBCPP_BUILDING_LIBRARY) && _LIBCPP_STD_VER < 14 && defined(_LIBCPP_HAS_NO_LANGUAGE_SIZED_DEALLOCATION)
-#  define _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
+#if _LIBCPP_STD_VER >= 14 || _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION
+#  define _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION 1
+#else
+#  define _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION 0
 #endif
 
-#if defined(_LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION) || defined(_LIBCPP_HAS_NO_LANGUAGE_SIZED_DEALLOCATION)
-#  define _LIBCPP_HAS_NO_SIZED_DEALLOCATION
+#if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION && _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION
+#  define _LIBCPP_HAS_SIZED_DEALLOCATION 1
+#else
+#  define _LIBCPP_HAS_SIZED_DEALLOCATION 0
 #endif
 
 namespace std // purposefully not using versioning namespace
@@ -169,14 +175,14 @@ public:
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_bad_alloc(); // not in C++ spec
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_array_new_length() {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw bad_array_new_length();
 #else
   _LIBCPP_VERBOSE_ABORT("bad_array_new_length was thrown in -fno-exceptions mode");
 #endif
 }
 
-#if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) && !defined(_LIBCPP_ABI_VCRUNTIME)
+#if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION && !defined(_LIBCPP_ABI_VCRUNTIME)
 #  ifndef _LIBCPP_CXX03_LANG
 enum class align_val_t : size_t {};
 #  else
@@ -208,7 +214,7 @@ inline constexpr destroying_delete_t destroying_delete{};
     _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT;
-#  ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
+#  if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, std::size_t __sz) _NOEXCEPT;
 #  endif
 
@@ -217,17 +223,17 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, std::size_t __sz) _
     _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
-#  ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
+#  if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, std::size_t __sz) _NOEXCEPT;
 #  endif
 
-#  ifndef _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#  if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 [[__nodiscard__]] _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz, std::align_val_t) _THROW_BAD_ALLOC;
 [[__nodiscard__]] _LIBCPP_OVERRIDABLE_FUNC_VIS void*
 operator new(std::size_t __sz, std::align_val_t, const std::nothrow_t&) _NOEXCEPT _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, std::align_val_t) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, std::align_val_t, const std::nothrow_t&) _NOEXCEPT;
-#    ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
+#    if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, std::size_t __sz, std::align_val_t) _NOEXCEPT;
 #    endif
 
@@ -237,7 +243,7 @@ operator new[](std::size_t __sz, std::align_val_t) _THROW_BAD_ALLOC;
 operator new[](std::size_t __sz, std::align_val_t, const std::nothrow_t&) _NOEXCEPT _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, std::align_val_t) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, std::align_val_t, const std::nothrow_t&) _NOEXCEPT;
-#    ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
+#    if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
 _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, std::size_t __sz, std::align_val_t) _NOEXCEPT;
 #    endif
 #  endif
@@ -284,7 +290,7 @@ _LIBCPP_HIDE_FROM_ABI void __libcpp_operator_delete(_Args... __args) {
 }
 
 inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_allocate(size_t __size, size_t __align) {
-#ifndef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#if _LIBCPP_HAS_ALIGNED_ALLOCATION
   if (__is_overaligned_for_new(__align)) {
     const align_val_t __align_val = static_cast<align_val_t>(__align);
     return __libcpp_operator_new(__size, __align_val);
@@ -297,7 +303,7 @@ inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_allocate(size_t __size, size_t __ali
 
 template <class... _Args>
 _LIBCPP_HIDE_FROM_ABI void __do_deallocate_handle_size(void* __ptr, size_t __size, _Args... __args) {
-#ifdef _LIBCPP_HAS_NO_SIZED_DEALLOCATION
+#if !_LIBCPP_HAS_SIZED_DEALLOCATION
   (void)__size;
   return std::__libcpp_operator_delete(__ptr, __args...);
 #else
@@ -306,7 +312,7 @@ _LIBCPP_HIDE_FROM_ABI void __do_deallocate_handle_size(void* __ptr, size_t __siz
 }
 
 inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate(void* __ptr, size_t __size, size_t __align) {
-#if defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION)
+#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
   (void)__align;
   return __do_deallocate_handle_size(__ptr, __size);
 #else
@@ -320,7 +326,7 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate(void* __ptr, size_t __size
 }
 
 inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate_unsized(void* __ptr, size_t __align) {
-#if defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION)
+#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
   (void)__align;
   return __libcpp_operator_delete(__ptr);
 #else
diff --git a/yass/third_party/libc++/trunk/include/optional b/yass/third_party/libc++/trunk/include/optional
index 4e44ef990f..b9dcf90536 100644
--- a/yass/third_party/libc++/trunk/include/optional
+++ b/yass/third_party/libc++/trunk/include/optional
@@ -260,7 +260,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 [[noreturn]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_THROW_BAD_OPTIONAL_ACCESS void
 __throw_bad_optional_access() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw bad_optional_access();
 #  else
   _LIBCPP_VERBOSE_ABORT("bad_optional_access was thrown in -fno-exceptions mode");
diff --git a/yass/third_party/libc++/trunk/include/regex b/yass/third_party/libc++/trunk/include/regex
index d6b8768a25..074b19865c 100644
--- a/yass/third_party/libc++/trunk/include/regex
+++ b/yass/third_party/libc++/trunk/include/regex
@@ -984,7 +984,7 @@ public:
 
 template <regex_constants::error_type _Ev>
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_regex_error() {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw regex_error(_Ev);
 #else
   _LIBCPP_VERBOSE_ABORT("regex_error was thrown in -fno-exceptions mode");
diff --git a/yass/third_party/libc++/trunk/include/set b/yass/third_party/libc++/trunk/include/set
index 0c2ca64139..5db0db8086 100644
--- a/yass/third_party/libc++/trunk/include/set
+++ b/yass/third_party/libc++/trunk/include/set
@@ -531,6 +531,7 @@ erase_if(multiset<Key, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__ranges/container_compatible_range.h>
 #include <__ranges/from_range.h>
 #include <__tree>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_nothrow_assignable.h>
@@ -1022,6 +1023,14 @@ erase_if(set<_Key, _Compare, _Allocator>& __c, _Predicate __pred) {
 }
 #endif
 
+template <class _Key, class _Compare, class _Allocator>
+struct __container_traits<set<_Key, _Compare, _Allocator> > {
+  // http://eel.is/c++draft/associative.reqmts.except#2
+  // For associative containers, if an exception is thrown by any operation from within
+  // an insert or emplace function inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = true;
+};
+
 template <class _Key, class _Compare = less<_Key>, class _Allocator = allocator<_Key> >
 class _LIBCPP_TEMPLATE_VIS multiset {
 public:
@@ -1481,6 +1490,14 @@ erase_if(multiset<_Key, _Compare, _Allocator>& __c, _Predicate __pred) {
 }
 #endif
 
+template <class _Key, class _Compare, class _Allocator>
+struct __container_traits<multiset<_Key, _Compare, _Allocator> > {
+  // http://eel.is/c++draft/associative.reqmts.except#2
+  // For associative containers, if an exception is thrown by any operation from within
+  // an insert or emplace function inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee = true;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/sstream b/yass/third_party/libc++/trunk/include/sstream
index c29abab9c5..df03919499 100644
--- a/yass/third_party/libc++/trunk/include/sstream
+++ b/yass/third_party/libc++/trunk/include/sstream
@@ -786,9 +786,9 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c) {
     if (this->pptr() == this->epptr()) {
       if (!(__mode_ & ios_base::out))
         return traits_type::eof();
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
         ptrdiff_t __nout = this->pptr() - this->pbase();
         ptrdiff_t __hm   = __hm_ - this->pbase();
         __str_.push_back(char_type());
@@ -797,11 +797,11 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c) {
         this->setp(__p, __p + __str_.size());
         this->__pbump(__nout);
         __hm_ = this->pbase() + __hm;
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         return traits_type::eof();
       }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
     }
     __hm_ = std::max(this->pptr() + 1, __hm_);
     if (__mode_ & ios_base::in) {
diff --git a/yass/third_party/libc++/trunk/include/stdatomic.h b/yass/third_party/libc++/trunk/include/stdatomic.h
index 3206f7da8c..2f25b057df 100644
--- a/yass/third_party/libc++/trunk/include/stdatomic.h
+++ b/yass/third_party/libc++/trunk/include/stdatomic.h
@@ -156,7 +156,7 @@ using std::atomic_long _LIBCPP_USING_IF_EXISTS;
 using std::atomic_ulong _LIBCPP_USING_IF_EXISTS;
 using std::atomic_llong _LIBCPP_USING_IF_EXISTS;
 using std::atomic_ullong _LIBCPP_USING_IF_EXISTS;
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 using std::atomic_char8_t _LIBCPP_USING_IF_EXISTS;
 #  endif
 using std::atomic_char16_t _LIBCPP_USING_IF_EXISTS;
diff --git a/yass/third_party/libc++/trunk/include/stdexcept b/yass/third_party/libc++/trunk/include/stdexcept
index bdfc27aeac..daa7b501a8 100644
--- a/yass/third_party/libc++/trunk/include/stdexcept
+++ b/yass/third_party/libc++/trunk/include/stdexcept
@@ -212,7 +212,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_runtime_error(const char*);
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_logic_error(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw logic_error(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("logic_error was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -220,7 +220,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_domain_error(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw domain_error(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("domain_error was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -228,7 +228,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_invalid_argument(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw invalid_argument(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("invalid_argument was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -236,7 +236,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_length_error(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw length_error(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("length_error was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -244,7 +244,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_out_of_range(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw out_of_range(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("out_of_range was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -252,7 +252,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_range_error(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw range_error(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("range_error was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -260,7 +260,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_overflow_error(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw overflow_error(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("overflow_error was thrown in -fno-exceptions mode with message \"%s\"", __msg);
@@ -268,7 +268,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 }
 
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_underflow_error(const char* __msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw underflow_error(__msg);
 #else
   _LIBCPP_VERBOSE_ABORT("underflow_error was thrown in -fno-exceptions mode with message \"%s\"", __msg);
diff --git a/yass/third_party/libc++/trunk/include/string b/yass/third_party/libc++/trunk/include/string
index 685dbcbd44..4b5017f5e7 100644
--- a/yass/third_party/libc++/trunk/include/string
+++ b/yass/third_party/libc++/trunk/include/string
@@ -672,7 +672,7 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
 #  define _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS __attribute__((__no_sanitize__("address")))
 // This macro disables AddressSanitizer (ASan) instrumentation for a specific function,
 // allowing memory accesses that would normally trigger ASan errors to proceed without crashing.
@@ -785,7 +785,7 @@ public:
   //
   // This string implementation doesn't contain any references into itself. It only contains a bit that says whether
   // it is in small or large string mode, so the entire structure is trivially relocatable if its members are.
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
   // When compiling with AddressSanitizer (ASan), basic_string cannot be trivially
   // relocatable. Because the object's memory might be poisoned when its content
   // is kept inside objects memory (short string optimization), instead of in allocated
@@ -799,7 +799,8 @@ public:
       basic_string,
       void>;
 #endif
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __asan_volatile_wrapper(pointer const& __ptr) const {
     if (__libcpp_is_constant_evaluated())
       return __ptr;
@@ -2018,7 +2019,7 @@ private:
   __annotate_contiguous_container(const void* __old_mid, const void* __new_mid) const {
     (void)__old_mid;
     (void)__new_mid;
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
 #  if defined(__APPLE__)
     // TODO: remove after addressing issue #96099 (https://github.com/llvm/llvm-project/issues/96099)
     if (!__is_long())
@@ -2030,14 +2031,14 @@ private:
 
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_new(size_type __current_size) const _NOEXCEPT {
     (void)__current_size;
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
     if (!__libcpp_is_constant_evaluated())
       __annotate_contiguous_container(data() + capacity() + 1, data() + __current_size + 1);
 #endif
   }
 
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_delete() const _NOEXCEPT {
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
     if (!__libcpp_is_constant_evaluated())
       __annotate_contiguous_container(data() + size() + 1, data() + capacity() + 1);
 #endif
@@ -2045,7 +2046,7 @@ private:
 
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_increase(size_type __n) const _NOEXCEPT {
     (void)__n;
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
     if (!__libcpp_is_constant_evaluated())
       __annotate_contiguous_container(data() + size() + 1, data() + size() + 1 + __n);
 #endif
@@ -2053,7 +2054,7 @@ private:
 
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_shrink(size_type __old_size) const _NOEXCEPT {
     (void)__old_size;
-#if !defined(_LIBCPP_HAS_NO_ASAN) && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if _LIBCPP_HAS_ASAN && defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
     if (!__libcpp_is_constant_evaluated())
       __annotate_contiguous_container(data() + __old_size + 1, data() + size() + 1);
 #endif
@@ -2416,19 +2417,19 @@ basic_string<_CharT, _Traits, _Allocator>::__init_with_sentinel(_InputIterator _
   __rep_ = __rep();
   __annotate_new(0);
 
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     for (; __first != __last; ++__first)
       push_back(*__first);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     __annotate_delete();
     if (__is_long())
       __alloc_traits::deallocate(__alloc_, __get_long_pointer(), __get_long_cap());
     throw;
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class _CharT, class _Traits, class _Allocator>
@@ -2463,18 +2464,18 @@ basic_string<_CharT, _Traits, _Allocator>::__init_with_size(_InputIterator __fir
     __set_long_size(__sz);
   }
 
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     auto __end = __copy_non_overlapping_range(__first, __last, std::__to_address(__p));
     traits_type::assign(*__end, value_type());
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     if (__is_long())
       __alloc_traits::deallocate(__alloc_, __get_long_pointer(), __get_long_cap());
     throw;
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   __annotate_new(__sz);
 }
 
@@ -3376,9 +3377,9 @@ basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target
       // Shrink
       // - called from shrink_to_fit should not throw.
       // - called from reserve may throw but is not required to.
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
       try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
         auto __allocation = std::__allocate_at_least(__alloc_, __target_capacity + 1);
 
         // The Standard mandates shrink_to_fit() does not increase the capacity.
@@ -3391,11 +3392,11 @@ basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target
         }
         __new_data        = __allocation.ptr;
         __target_capacity = __allocation.count - 1;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         return;
       }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     }
     __begin_lifetime(__new_data, __target_capacity + 1);
     __now_long = true;
@@ -4234,7 +4235,7 @@ struct __string_hash : public __unary_function<basic_string<_CharT, char_traits<
 template <class _Allocator>
 struct hash<basic_string<char, char_traits<char>, _Allocator> > : __string_hash<char, _Allocator> {};
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template <class _Allocator>
 struct hash<basic_string<char8_t, char_traits<char8_t>, _Allocator> > : __string_hash<char8_t, _Allocator> {};
 #endif
@@ -4308,7 +4309,7 @@ operator""s(const wchar_t* __str, size_t __len) {
 }
 #  endif
 
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 inline _LIBCPP_HIDE_FROM_ABI constexpr basic_string<char8_t> operator""s(const char8_t* __str, size_t __len) {
   return basic_string<char8_t>(__str, __len);
 }
diff --git a/yass/third_party/libc++/trunk/include/string_view b/yass/third_party/libc++/trunk/include/string_view
index 3b32117386..5beac404fb 100644
--- a/yass/third_party/libc++/trunk/include/string_view
+++ b/yass/third_party/libc++/trunk/include/string_view
@@ -901,7 +901,7 @@ struct __string_view_hash : public __unary_function<basic_string_view<_CharT, ch
 template <>
 struct hash<basic_string_view<char, char_traits<char> > > : __string_view_hash<char> {};
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template <>
 struct hash<basic_string_view<char8_t, char_traits<char8_t> > > : __string_view_hash<char8_t> {};
 #endif
@@ -931,7 +931,7 @@ operator""sv(const wchar_t* __str, size_t __len) noexcept {
 }
 #  endif
 
-#  ifndef _LIBCPP_HAS_NO_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
 inline _LIBCPP_HIDE_FROM_ABI constexpr basic_string_view<char8_t>
 operator""sv(const char8_t* __str, size_t __len) noexcept {
   return basic_string_view<char8_t>(__str, __len);
diff --git a/yass/third_party/libc++/trunk/include/syncstream b/yass/third_party/libc++/trunk/include/syncstream
index a2e1c7edad..72a5f6ca5c 100644
--- a/yass/third_party/libc++/trunk/include/syncstream
+++ b/yass/third_party/libc++/trunk/include/syncstream
@@ -273,14 +273,14 @@ public:
   }
 
   _LIBCPP_HIDE_FROM_ABI ~basic_syncbuf() {
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
     try {
-#    endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#    endif // _LIBCPP_HAS_EXCEPTIONS
       emit();
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
     }
-#    endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#    endif // _LIBCPP_HAS_EXCEPTIONS
     __dec_reference();
   }
 
@@ -337,7 +337,7 @@ protected:
       return traits_type::not_eof(__c);
 
     if (this->pptr() == this->epptr()) {
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
       try {
 #    endif
         size_t __size = __str_.size();
@@ -348,7 +348,7 @@ protected:
         this->setp(__p, __p + __str_.size());
         this->pbump(__size);
 
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         return traits_type::eof();
       }
@@ -480,13 +480,13 @@ public:
     // TODO validate other unformatted output functions.
     typename basic_ostream<char_type, traits_type>::sentry __s(*this);
     if (__s) {
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
       try {
 #    endif
 
         if (__sb_.emit() == false)
           this->setstate(ios::badbit);
-#    ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if _LIBCPP_HAS_EXCEPTIONS
       } catch (...) {
         this->__set_badbit_and_consider_rethrow();
       }
diff --git a/yass/third_party/libc++/trunk/include/typeinfo b/yass/third_party/libc++/trunk/include/typeinfo
index a44fa4d73e..252afe59a0 100644
--- a/yass/third_party/libc++/trunk/include/typeinfo
+++ b/yass/third_party/libc++/trunk/include/typeinfo
@@ -374,7 +374,7 @@ private:
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 [[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_cast() {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw bad_cast();
 #else
   _LIBCPP_VERBOSE_ABORT("bad_cast was thrown in -fno-exceptions mode");
diff --git a/yass/third_party/libc++/trunk/include/unordered_map b/yass/third_party/libc++/trunk/include/unordered_map
index 0d71a51ee9..05aa01a3b7 100644
--- a/yass/third_party/libc++/trunk/include/unordered_map
+++ b/yass/third_party/libc++/trunk/include/unordered_map
@@ -604,7 +604,9 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 #include <__ranges/concepts.h>
 #include <__ranges/container_compatible_range.h>
 #include <__ranges/from_range.h>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/enable_if.h>
+#include <__type_traits/invoke.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_integral.h>
 #include <__type_traits/remove_const.h>
@@ -1830,6 +1832,16 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const unordered_map<_Key, _Tp, _Has
 
 #endif
 
+template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
+struct __container_traits<unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc> > {
+  // http://eel.is/c++draft/unord.req.except#2
+  //  For unordered associative containers, if an exception is thrown by any operation
+  //  other than the container's hash function from within an insert or emplace function
+  //  inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee =
+      __nothrow_invokable<_Hash, const _Key&>::value;
+};
+
 template <class _Key,
           class _Tp,
           class _Hash  = hash<_Key>,
@@ -2520,6 +2532,16 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const unordered_multimap<_Key, _Tp,
 
 #endif
 
+template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
+struct __container_traits<unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc> > {
+  // http://eel.is/c++draft/unord.req.except#2
+  //  For unordered associative containers, if an exception is thrown by any operation
+  //  other than the container's hash function from within an insert or emplace function
+  //  inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee =
+      __nothrow_invokable<_Hash, const _Key&>::value;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/unordered_set b/yass/third_party/libc++/trunk/include/unordered_set
index 2b09c72b86..7ab1c651b8 100644
--- a/yass/third_party/libc++/trunk/include/unordered_set
+++ b/yass/third_party/libc++/trunk/include/unordered_set
@@ -550,7 +550,9 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <__ranges/concepts.h>
 #include <__ranges/container_compatible_range.h>
 #include <__ranges/from_range.h>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/enable_if.h>
+#include <__type_traits/invoke.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_integral.h>
 #include <__type_traits/is_nothrow_assignable.h>
@@ -1183,6 +1185,16 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const unordered_set<_Value, _Hash,
 
 #endif
 
+template <class _Value, class _Hash, class _Pred, class _Alloc>
+struct __container_traits<unordered_set<_Value, _Hash, _Pred, _Alloc> > {
+  // http://eel.is/c++draft/unord.req.except#2
+  //  For unordered associative containers, if an exception is thrown by any operation
+  //  other than the container's hash function from within an insert or emplace function
+  //  inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee =
+      __nothrow_invokable<_Hash, const _Value&>::value;
+};
+
 template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>, class _Alloc = allocator<_Value> >
 class _LIBCPP_TEMPLATE_VIS unordered_multiset {
 public:
@@ -1793,6 +1805,16 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const unordered_multiset<_Value, _H
 
 #endif
 
+template <class _Value, class _Hash, class _Pred, class _Alloc>
+struct __container_traits<unordered_multiset<_Value, _Hash, _Pred, _Alloc> > {
+  // http://eel.is/c++draft/unord.req.except#2
+  //  For unordered associative containers, if an exception is thrown by any operation
+  //  other than the container's hash function from within an insert or emplace function
+  //  inserting a single element, the insertion has no effect.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee =
+      __nothrow_invokable<_Hash, const _Value&>::value;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/valarray b/yass/third_party/libc++/trunk/include/valarray
index 44341eb2ba..b3b48958f9 100644
--- a/yass/third_party/libc++/trunk/include/valarray
+++ b/yass/third_party/libc++/trunk/include/valarray
@@ -1984,17 +1984,17 @@ template <class _Tp>
 inline valarray<_Tp>::valarray(size_t __n) : __begin_(nullptr), __end_(nullptr) {
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (size_t __n_left = __n; __n_left; --__n_left, ++__end_)
         ::new ((void*)__end_) value_type();
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2007,17 +2007,17 @@ template <class _Tp>
 valarray<_Tp>::valarray(const value_type* __p, size_t __n) : __begin_(nullptr), __end_(nullptr) {
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (size_t __n_left = __n; __n_left; ++__end_, ++__p, --__n_left)
         ::new ((void*)__end_) value_type(*__p);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2025,17 +2025,17 @@ template <class _Tp>
 valarray<_Tp>::valarray(const valarray& __v) : __begin_(nullptr), __end_(nullptr) {
   if (__v.size()) {
     __begin_ = __end_ = allocator<value_type>().allocate(__v.size());
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (value_type* __p = __v.__begin_; __p != __v.__end_; ++__end_, ++__p)
         ::new ((void*)__end_) value_type(*__p);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__v.size());
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2051,18 +2051,18 @@ valarray<_Tp>::valarray(initializer_list<value_type> __il) : __begin_(nullptr),
   const size_t __n = __il.size();
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     try {
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
       size_t __n_left = __n;
       for (const value_type* __p = __il.begin(); __n_left; ++__end_, ++__p, --__n_left)
         ::new ((void*)__end_) value_type(*__p);
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#  endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#  endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2073,18 +2073,18 @@ valarray<_Tp>::valarray(const slice_array<value_type>& __sa) : __begin_(nullptr)
   const size_t __n = __sa.__size_;
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       size_t __n_left = __n;
       for (const value_type* __p = __sa.__vp_; __n_left; ++__end_, __p += __sa.__stride_, --__n_left)
         ::new ((void*)__end_) value_type(*__p);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2093,19 +2093,19 @@ valarray<_Tp>::valarray(const gslice_array<value_type>& __ga) : __begin_(nullptr
   const size_t __n = __ga.__1d_.size();
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef const size_t* _Ip;
       const value_type* __s = __ga.__vp_;
       for (_Ip __i = __ga.__1d_.__begin_, __e = __ga.__1d_.__end_; __i != __e; ++__i, ++__end_)
         ::new ((void*)__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2114,19 +2114,19 @@ valarray<_Tp>::valarray(const mask_array<value_type>& __ma) : __begin_(nullptr),
   const size_t __n = __ma.__1d_.size();
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef const size_t* _Ip;
       const value_type* __s = __ma.__vp_;
       for (_Ip __i = __ma.__1d_.__begin_, __e = __ma.__1d_.__end_; __i != __e; ++__i, ++__end_)
         ::new ((void*)__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2135,19 +2135,19 @@ valarray<_Tp>::valarray(const indirect_array<value_type>& __ia) : __begin_(nullp
   const size_t __n = __ia.__1d_.size();
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       typedef const size_t* _Ip;
       const value_type* __s = __ia.__vp_;
       for (_Ip __i = __ia.__1d_.__begin_, __e = __ia.__1d_.__end_; __i != __e; ++__i, ++__end_)
         ::new ((void*)__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2636,17 +2636,17 @@ void valarray<_Tp>::resize(size_t __n, value_type __x) {
   __clear(size());
   if (__n) {
     __begin_ = __end_ = allocator<value_type>().allocate(__n);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (size_t __n_left = __n; __n_left; --__n_left, ++__end_)
         ::new ((void*)__end_) value_type(__x);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       __clear(__n);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
diff --git a/yass/third_party/libc++/trunk/include/variant b/yass/third_party/libc++/trunk/include/variant
index fd3aebaea0..2e158a4eea 100644
--- a/yass/third_party/libc++/trunk/include/variant
+++ b/yass/third_party/libc++/trunk/include/variant
@@ -307,7 +307,7 @@ struct __farray {
 
 [[noreturn]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS void
 __throw_bad_variant_access() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw bad_variant_access();
 #  else
   _LIBCPP_VERBOSE_ABORT("bad_variant_access was thrown in -fno-exceptions mode");
@@ -1062,7 +1062,7 @@ public:
         std::swap(__lhs, __rhs);
       }
       __impl __tmp(std::move(*__rhs));
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
       if constexpr (__all<is_nothrow_move_constructible_v<_Types>...>::value) {
         this->__generic_construct(*__rhs, std::move(*__lhs));
       } else {
@@ -1300,7 +1300,7 @@ public:
     __impl_.__swap(__that.__impl_);
   }
 
-#  if _LIBCPP_STD_VER >= 26 && defined(_LIBCPP_HAS_EXPLICIT_THIS_PARAMETER)
+#  if _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
   // Helper class to implement [variant.visit]/10
   //   Constraints: The call to visit does not use an explicit template-argument-list
   //   that begins with a type template-argument.
diff --git a/yass/third_party/libc++/trunk/include/vector b/yass/third_party/libc++/trunk/include/vector
index 7d3aac5989..dc31f31838 100644
--- a/yass/third_party/libc++/trunk/include/vector
+++ b/yass/third_party/libc++/trunk/include/vector
@@ -356,6 +356,8 @@ template<class T, class charT> requires is-vector-bool-reference<T> // Since C++
 #include <__ranges/size.h>
 #include <__split_buffer>
 #include <__type_traits/conditional.h>
+#include <__type_traits/container_traits.h>
+#include <__type_traits/disjunction.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_constructible.h>
@@ -917,27 +919,27 @@ private:
 
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __annotate_new(size_type __current_size) const _NOEXCEPT {
     (void)__current_size;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_contiguous_container(data() + capacity(), data() + __current_size);
 #endif
   }
 
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __annotate_delete() const _NOEXCEPT {
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_contiguous_container(data() + size(), data() + capacity());
 #endif
   }
 
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __annotate_increase(size_type __n) const _NOEXCEPT {
     (void)__n;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_contiguous_container(data() + size(), data() + size() + __n);
 #endif
   }
 
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __annotate_shrink(size_type __old_size) const _NOEXCEPT {
     (void)__old_size;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
     __annotate_contiguous_container(data() + __old_size, data() + size());
 #endif
   }
@@ -945,14 +947,14 @@ private:
   struct _ConstructTransaction {
     _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit _ConstructTransaction(vector& __v, size_type __n)
         : __v_(__v), __pos_(__v.__end_), __new_end_(__v.__end_ + __n) {
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
       __v_.__annotate_increase(__n);
 #endif
     }
 
     _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~_ConstructTransaction() {
       __v_.__end_ = __pos_;
-#ifndef _LIBCPP_HAS_NO_ASAN
+#if _LIBCPP_HAS_ASAN
       if (__pos_ != __new_end_) {
         __v_.__annotate_shrink(__new_end_ - __v_.__begin_);
       }
@@ -1482,9 +1484,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::reserve(size_type __
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT {
   if (capacity() > size()) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       allocator_type& __a = this->__alloc();
       __split_buffer<value_type, allocator_type&> __v(size(), size(), __a);
       // The Standard mandates shrink_to_fit() does not increase the capacity.
@@ -1492,10 +1494,10 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::shrink_to_fit() _NOE
       // due to swapping the elements.
       if (__v.capacity() < capacity())
         __swap_out_circular_buffer(__v);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -1733,21 +1735,21 @@ vector<_Tp, _Allocator>::__insert_with_sentinel(const_iterator __position, _Inpu
   }
   __split_buffer<value_type, allocator_type&> __v(__a);
   if (__first != __last) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       __v.__construct_at_end_with_sentinel(std::move(__first), std::move(__last));
       difference_type __old_size = __old_last - this->__begin_;
       difference_type __old_p    = __p - this->__begin_;
       reserve(__recommend(size() + __v.size()));
       __p        = this->__begin_ + __old_p;
       __old_last = this->__begin_ + __old_size;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       erase(__make_iter(__old_last), end());
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
   __p = std::rotate(__p, __old_last, this->__end_);
   insert(__make_iter(__p), std::make_move_iterator(__v.begin()), std::make_move_iterator(__v.end()));
@@ -2190,18 +2192,18 @@ private:
   template <class _InputIterator, class _Sentinel>
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void
   __init_with_sentinel(_InputIterator __first, _Sentinel __last) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       for (; __first != __last; ++__first)
         push_back(*__first);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       if (__begin_ != nullptr)
         __storage_traits::deallocate(__alloc(), __begin_, __cap());
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 
   template <class _Iterator, class _Sentinel>
@@ -2648,14 +2650,14 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<bool, _Allocator>::reserve(size_type _
 template <class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<bool, _Allocator>::shrink_to_fit() _NOEXCEPT {
   if (__external_cap_to_internal(size()) > __cap()) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       vector(*this, allocator_type(__alloc())).swap(*this);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
 }
 
@@ -2744,21 +2746,21 @@ vector<bool, _Allocator>::__insert_with_sentinel(const_iterator __position, _Inp
   }
   vector __v(get_allocator());
   if (__first != __last) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       __v.__assign_with_sentinel(std::move(__first), std::move(__last));
       difference_type __old_size = static_cast<difference_type>(__old_end - begin());
       difference_type __old_p    = __p - begin();
       reserve(__recommend(size() + __v.size()));
       __p       = begin() + __old_p;
       __old_end = begin() + __old_size;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       erase(__old_end, end());
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   }
   __p = std::rotate(__p, __old_end, end());
   insert(__p, __v.begin(), __v.end());
@@ -3005,6 +3007,18 @@ public:
 };
 #endif // _LIBCPP_STD_VER >= 23
 
+template <class _Tp, class _Allocator>
+struct __container_traits<vector<_Tp, _Allocator> > {
+  // http://eel.is/c++draft/vector.modifiers#2
+  //  If an exception is thrown other than by the copy constructor, move constructor, assignment operator, or move
+  //  assignment operator of T or by any InputIterator operation, there are no effects. If an exception is thrown while
+  //  inserting a single element at the end and T is Cpp17CopyInsertable or is_nothrow_move_constructible_v<T> is true,
+  //  there are no effects. Otherwise, if an exception is thrown by the move constructor of a non-Cpp17CopyInsertable T,
+  //  the effects are unspecified.
+  static _LIBCPP_CONSTEXPR const bool __emplacement_has_strong_exception_safety_guarantee =
+      _Or<is_nothrow_move_constructible<_Tp>, __is_cpp17_copy_insertable<_Allocator> >::value;
+};
+
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER >= 17
diff --git a/yass/third_party/libc++/trunk/include/version b/yass/third_party/libc++/trunk/include/version
index 88387e3116..5ab4f28a04 100644
--- a/yass/third_party/libc++/trunk/include/version
+++ b/yass/third_party/libc++/trunk/include/version
@@ -384,7 +384,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_bit_cast                             201806L
 # define __cpp_lib_bitops                               201907L
 # define __cpp_lib_bounded_array_traits                 201902L
-# if !defined(_LIBCPP_HAS_NO_CHAR8_T)
+# if _LIBCPP_HAS_CHAR8_T
 #   define __cpp_lib_char8_t                            201907L
 # endif
 # define __cpp_lib_concepts                             202002L
diff --git a/yass/third_party/libc++/trunk/modules/std.compat/cuchar.inc b/yass/third_party/libc++/trunk/modules/std.compat/cuchar.inc
index d1a511cade..119a851125 100644
--- a/yass/third_party/libc++/trunk/modules/std.compat/cuchar.inc
+++ b/yass/third_party/libc++/trunk/modules/std.compat/cuchar.inc
@@ -17,7 +17,7 @@ export {
   // size_t is conditionally here, but always present in cstddef.cppm. To avoid
   // conflicing declarations omit the using here.
 
-#if !defined(_LIBCPP_HAS_NO_C8RTOMB_MBRTOC8)
+#if _LIBCPP_HAS_C8RTOMB_MBRTOC8
   using ::mbrtoc8 _LIBCPP_USING_IF_EXISTS;
   using ::c8rtomb _LIBCPP_USING_IF_EXISTS;
 #endif
diff --git a/yass/third_party/libc++/trunk/modules/std.cppm.in b/yass/third_party/libc++/trunk/modules/std.cppm.in
index 0575774f6f..64ed8d4088 100644
--- a/yass/third_party/libc++/trunk/modules/std.cppm.in
+++ b/yass/third_party/libc++/trunk/modules/std.cppm.in
@@ -20,7 +20,7 @@ module;
 #include <algorithm>
 #include <any>
 #include <array>
-#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
+#if _LIBCPP_HAS_ATOMIC_HEADER
 #  include <atomic>
 #endif
 #include <barrier>
diff --git a/yass/third_party/libc++/trunk/modules/std/atomic.inc b/yass/third_party/libc++/trunk/modules/std/atomic.inc
index e8cf90d012..6ed0f7e9c4 100644
--- a/yass/third_party/libc++/trunk/modules/std/atomic.inc
+++ b/yass/third_party/libc++/trunk/modules/std/atomic.inc
@@ -60,7 +60,7 @@ export namespace std {
   using std::atomic_char _LIBCPP_USING_IF_EXISTS;
   using std::atomic_char16_t _LIBCPP_USING_IF_EXISTS;
   using std::atomic_char32_t _LIBCPP_USING_IF_EXISTS;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   using std::atomic_char8_t _LIBCPP_USING_IF_EXISTS;
 #endif
   using std::atomic_int _LIBCPP_USING_IF_EXISTS;
diff --git a/yass/third_party/libc++/trunk/modules/std/cuchar.inc b/yass/third_party/libc++/trunk/modules/std/cuchar.inc
index fd80110d11..4a0b21c17b 100644
--- a/yass/third_party/libc++/trunk/modules/std/cuchar.inc
+++ b/yass/third_party/libc++/trunk/modules/std/cuchar.inc
@@ -17,7 +17,7 @@ export namespace std {
   // size_t is conditionally here, but always present in cstddef.cppm. To avoid
   // conflicing declarations omit the using here.
 
-#if !defined(_LIBCPP_HAS_NO_C8RTOMB_MBRTOC8)
+#if _LIBCPP_HAS_C8RTOMB_MBRTOC8
   using std::mbrtoc8 _LIBCPP_USING_IF_EXISTS;
   using std::c8rtomb _LIBCPP_USING_IF_EXISTS;
 #endif
diff --git a/yass/third_party/libc++/trunk/modules/std/iosfwd.inc b/yass/third_party/libc++/trunk/modules/std/iosfwd.inc
index 090d990d06..952057d691 100644
--- a/yass/third_party/libc++/trunk/modules/std/iosfwd.inc
+++ b/yass/third_party/libc++/trunk/modules/std/iosfwd.inc
@@ -14,7 +14,7 @@ export namespace std {
 #endif
   using std::u16streampos;
   using std::u32streampos;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   using std::u8streampos;
 #endif
 
diff --git a/yass/third_party/libc++/trunk/modules/std/memory.inc b/yass/third_party/libc++/trunk/modules/std/memory.inc
index c15f37a212..4c4cccfd7c 100644
--- a/yass/third_party/libc++/trunk/modules/std/memory.inc
+++ b/yass/third_party/libc++/trunk/modules/std/memory.inc
@@ -154,9 +154,9 @@ export namespace std {
   using std::reinterpret_pointer_cast;
   using std::static_pointer_cast;
 
-#ifndef _LIBCPP_HAS_NO_RTTI
+#if _LIBCPP_HAS_RTTI
   using std::get_deleter;
-#endif // _LIBCPP_HAS_NO_RTTI
+#endif // _LIBCPP_HAS_RTTI
 
   // [util.smartptr.shared.io], shared_ptr I/O
 
diff --git a/yass/third_party/libc++/trunk/modules/std/string.inc b/yass/third_party/libc++/trunk/modules/std/string.inc
index 9808a96215..322317c98c 100644
--- a/yass/third_party/libc++/trunk/modules/std/string.inc
+++ b/yass/third_party/libc++/trunk/modules/std/string.inc
@@ -34,7 +34,7 @@ export namespace std {
   using std::string;
   using std::u16string;
   using std::u32string;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   using std::u8string;
 #endif
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
@@ -60,7 +60,7 @@ export namespace std {
     using std::pmr::string;
     using std::pmr::u16string;
     using std::pmr::u32string;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
     using std::pmr::u8string;
 #endif
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
diff --git a/yass/third_party/libc++/trunk/modules/std/string_view.inc b/yass/third_party/libc++/trunk/modules/std/string_view.inc
index f4f9d80ddb..1237f4516e 100644
--- a/yass/third_party/libc++/trunk/modules/std/string_view.inc
+++ b/yass/third_party/libc++/trunk/modules/std/string_view.inc
@@ -27,7 +27,7 @@ export namespace std {
   using std::string_view;
   using std::u16string_view;
   using std::u32string_view;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   using std::u8string_view;
 #endif
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
diff --git a/yass/third_party/libc++/trunk/src/condition_variable_destructor.cpp b/yass/third_party/libc++/trunk/src/condition_variable_destructor.cpp
index 59811ed7ff..f6ffe33685 100644
--- a/yass/third_party/libc++/trunk/src/condition_variable_destructor.cpp
+++ b/yass/third_party/libc++/trunk/src/condition_variable_destructor.cpp
@@ -14,7 +14,7 @@
 #include <__config>
 #include <__thread/support.h>
 
-#if _LIBCPP_ABI_VERSION == 1 || !defined(_LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION)
+#if _LIBCPP_ABI_VERSION == 1 || !_LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
 #  define NEEDS_CONDVAR_DESTRUCTOR
 #endif
 
diff --git a/yass/third_party/libc++/trunk/src/filesystem/error.h b/yass/third_party/libc++/trunk/src/filesystem/error.h
index 09020fbede..07ba7fc3ee 100644
--- a/yass/third_party/libc++/trunk/src/filesystem/error.h
+++ b/yass/third_party/libc++/trunk/src/filesystem/error.h
@@ -186,16 +186,16 @@ struct ErrorHandler {
   T report(const error_code& ec, const char* msg, ...) const {
     va_list ap;
     va_start(ap, msg);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       report_impl(ec, msg, ap);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       va_end(ap);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     va_end(ap);
     return error_value<T>();
   }
@@ -206,16 +206,16 @@ struct ErrorHandler {
   T report(errc const& err, const char* msg, ...) const {
     va_list ap;
     va_start(ap, msg);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
       report_impl(make_error_code(err), msg, ap);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
       va_end(ap);
       throw;
     }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     va_end(ap);
     return error_value<T>();
   }
diff --git a/yass/third_party/libc++/trunk/src/filesystem/format_string.h b/yass/third_party/libc++/trunk/src/filesystem/format_string.h
index 81c5a95ae3..ad6c57579a 100644
--- a/yass/third_party/libc++/trunk/src/filesystem/format_string.h
+++ b/yass/third_party/libc++/trunk/src/filesystem/format_string.h
@@ -56,16 +56,16 @@ inline _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 1, 2) string format_string(const cha
   string ret;
   va_list ap;
   va_start(ap, msg);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     ret = detail::vformat_string(msg, ap);
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     va_end(ap);
     throw;
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
   va_end(ap);
   return ret;
 }
diff --git a/yass/third_party/libc++/trunk/src/filesystem/int128_builtins.cpp b/yass/third_party/libc++/trunk/src/filesystem/int128_builtins.cpp
index 72b7cb4a8d..da6f39e7d7 100644
--- a/yass/third_party/libc++/trunk/src/filesystem/int128_builtins.cpp
+++ b/yass/third_party/libc++/trunk/src/filesystem/int128_builtins.cpp
@@ -16,7 +16,7 @@
 #include <__config>
 #include <climits>
 
-#if !defined(_LIBCPP_HAS_NO_INT128)
+#if _LIBCPP_HAS_INT128
 
 extern "C" __attribute__((no_sanitize("undefined"))) _LIBCPP_EXPORTED_FROM_ABI __int128_t
 __muloti4(__int128_t a, __int128_t b, int* overflow) {
diff --git a/yass/third_party/libc++/trunk/src/future.cpp b/yass/third_party/libc++/trunk/src/future.cpp
index e2c14c8321..04e6fb8db6 100644
--- a/yass/third_party/libc++/trunk/src/future.cpp
+++ b/yass/third_party/libc++/trunk/src/future.cpp
@@ -142,10 +142,10 @@ promise<void>::promise() : __state_(new __assoc_sub_state) {}
 
 promise<void>::~promise() {
   if (__state_) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
     if (!__state_->__has_value() && __state_->use_count() > 1)
       __state_->set_exception(make_exception_ptr(future_error(future_errc::broken_promise)));
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     __state_->__release_shared();
   }
 }
diff --git a/yass/third_party/libc++/trunk/src/ios.cpp b/yass/third_party/libc++/trunk/src/ios.cpp
index a727855c46..74d33b4b2f 100644
--- a/yass/third_party/libc++/trunk/src/ios.cpp
+++ b/yass/third_party/libc++/trunk/src/ios.cpp
@@ -361,18 +361,18 @@ void ios_base::swap(ios_base& rhs) noexcept {
 
 void ios_base::__set_badbit_and_consider_rethrow() {
   __rdstate_ |= badbit;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   if (__exceptions_ & badbit)
     throw;
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 void ios_base::__set_failbit_and_consider_rethrow() {
   __rdstate_ |= failbit;
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   if (__exceptions_ & failbit)
     throw;
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 bool ios_base::sync_with_stdio(bool sync) {
diff --git a/yass/third_party/libc++/trunk/src/locale.cpp b/yass/third_party/libc++/trunk/src/locale.cpp
index 484963dced..99a2d50f20 100644
--- a/yass/third_party/libc++/trunk/src/locale.cpp
+++ b/yass/third_party/libc++/trunk/src/locale.cpp
@@ -174,7 +174,7 @@ locale::__imp::__imp(size_t refs) : facet(refs), facets_(N), name_("C") {
   install(&make<codecvt<char16_t, char, mbstate_t> >(1u));
   install(&make<codecvt<char32_t, char, mbstate_t> >(1u));
   _LIBCPP_SUPPRESS_DEPRECATED_POP
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   install(&make<codecvt<char16_t, char8_t, mbstate_t> >(1u));
   install(&make<codecvt<char32_t, char8_t, mbstate_t> >(1u));
 #endif
@@ -219,9 +219,9 @@ locale::__imp::__imp(size_t refs) : facet(refs), facets_(N), name_("C") {
 }
 
 locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N), name_(name) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     facets_ = locale::classic().__locale_->facets_;
     for (unsigned i = 0; i < facets_.size(); ++i)
       if (facets_[i])
@@ -242,7 +242,7 @@ locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N),
     install(new codecvt_byname<char16_t, char, mbstate_t>(name_));
     install(new codecvt_byname<char32_t, char, mbstate_t>(name_));
     _LIBCPP_SUPPRESS_DEPRECATED_POP
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
     install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name_));
     install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name_));
 #endif
@@ -268,14 +268,14 @@ locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N),
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
     install(new messages_byname<wchar_t>(name_));
 #endif
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     for (unsigned i = 0; i < facets_.size(); ++i)
       if (facets_[i])
         facets_[i]->__release_shared();
     throw;
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 locale::__imp::__imp(const __imp& other) : facets_(max<size_t>(N, other.facets_.size())), name_(other.name_) {
@@ -291,9 +291,9 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)
   for (unsigned i = 0; i < facets_.size(); ++i)
     if (facets_[i])
       facets_[i]->__add_shared();
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     if (c & locale::collate) {
       install(new collate_byname<char>(name));
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
@@ -313,7 +313,7 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)
       install(new codecvt_byname<char16_t, char, mbstate_t>(name));
       install(new codecvt_byname<char32_t, char, mbstate_t>(name));
       _LIBCPP_SUPPRESS_DEPRECATED_POP
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
       install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name));
       install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name));
 #endif
@@ -348,14 +348,14 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)
       install(new messages_byname<wchar_t>(name));
 #endif
     }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     for (unsigned i = 0; i < facets_.size(); ++i)
       if (facets_[i])
         facets_[i]->__release_shared();
     throw;
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 template <class F>
@@ -370,9 +370,9 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)
   for (unsigned i = 0; i < facets_.size(); ++i)
     if (facets_[i])
       facets_[i]->__add_shared();
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     if (c & locale::collate) {
       install_from<std::collate<char> >(one);
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
@@ -389,7 +389,7 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)
       install_from<std::codecvt<char16_t, char, mbstate_t> >(one);
       install_from<std::codecvt<char32_t, char, mbstate_t> >(one);
       _LIBCPP_SUPPRESS_DEPRECATED_POP
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
       install_from<std::codecvt<char16_t, char8_t, mbstate_t> >(one);
       install_from<std::codecvt<char32_t, char8_t, mbstate_t> >(one);
 #endif
@@ -443,14 +443,14 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)
       install_from<std::messages<wchar_t> >(one);
 #endif
     }
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     for (unsigned i = 0; i < facets_.size(); ++i)
       if (facets_[i])
         facets_[i]->__release_shared();
     throw;
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 locale::__imp::__imp(const __imp& other, facet* f, long id)
@@ -2815,7 +2815,7 @@ int codecvt<char16_t, char, mbstate_t>::do_length(
 
 int codecvt<char16_t, char, mbstate_t>::do_max_length() const noexcept { return 4; }
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 
 // template <> class codecvt<char16_t, char8_t, mbstate_t>
 
@@ -2949,7 +2949,7 @@ int codecvt<char32_t, char, mbstate_t>::do_length(
 
 int codecvt<char32_t, char, mbstate_t>::do_max_length() const noexcept { return 4; }
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 
 // template <> class codecvt<char32_t, char8_t, mbstate_t>
 
@@ -5707,7 +5707,7 @@ template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_
     codecvt_byname<char16_t, char, mbstate_t>;
 template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
     codecvt_byname<char32_t, char, mbstate_t>;
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char16_t, char8_t, mbstate_t>;
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char32_t, char8_t, mbstate_t>;
 #endif
diff --git a/yass/third_party/libc++/trunk/src/memory_resource.cpp b/yass/third_party/libc++/trunk/src/memory_resource.cpp
index d2ff3509c5..299f810948 100644
--- a/yass/third_party/libc++/trunk/src/memory_resource.cpp
+++ b/yass/third_party/libc++/trunk/src/memory_resource.cpp
@@ -9,7 +9,7 @@
 #include <memory>
 #include <memory_resource>
 
-#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
+#if _LIBCPP_HAS_ATOMIC_HEADER
 #  include <atomic>
 #elif !defined(_LIBCPP_HAS_NO_THREADS)
 #  include <mutex>
@@ -28,7 +28,7 @@ memory_resource::~memory_resource() = default;
 
 // new_delete_resource()
 
-#ifdef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
 static bool is_aligned_to(void* ptr, size_t align) {
   void* p2     = ptr;
   size_t space = 1;
@@ -39,7 +39,7 @@ static bool is_aligned_to(void* ptr, size_t align) {
 
 class _LIBCPP_EXPORTED_FROM_ABI __new_delete_memory_resource_imp : public memory_resource {
   void* do_allocate(size_t bytes, size_t align) override {
-#ifndef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#if _LIBCPP_HAS_ALIGNED_ALLOCATION
     return std::__libcpp_allocate(bytes, align);
 #else
     if (bytes == 0)
@@ -91,7 +91,7 @@ memory_resource* null_memory_resource() noexcept { return &res_init.resources.nu
 // default_memory_resource()
 
 static memory_resource* __default_memory_resource(bool set = false, memory_resource* new_res = nullptr) noexcept {
-#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
+#if _LIBCPP_HAS_ATOMIC_HEADER
   static constinit atomic<memory_resource*> __res{&res_init.resources.new_delete_res};
   if (set) {
     new_res = new_res ? new_res : new_delete_resource();
diff --git a/yass/third_party/libc++/trunk/src/mutex_destructor.cpp b/yass/third_party/libc++/trunk/src/mutex_destructor.cpp
index a6ceaaaf23..9f991721f0 100644
--- a/yass/third_party/libc++/trunk/src/mutex_destructor.cpp
+++ b/yass/third_party/libc++/trunk/src/mutex_destructor.cpp
@@ -19,7 +19,7 @@
 #include <__config>
 #include <__thread/support.h>
 
-#if _LIBCPP_ABI_VERSION == 1 || !defined(_LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION)
+#if _LIBCPP_ABI_VERSION == 1 || !_LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION
 #  define NEEDS_MUTEX_DESTRUCTOR
 #endif
 
diff --git a/yass/third_party/libc++/trunk/src/new.cpp b/yass/third_party/libc++/trunk/src/new.cpp
index b0c731678c..e010fe4c4f 100644
--- a/yass/third_party/libc++/trunk/src/new.cpp
+++ b/yass/third_party/libc++/trunk/src/new.cpp
@@ -51,7 +51,7 @@ _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void* operator new(std
 }
 
 _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
-#  ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if !_LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t)>(&operator new)),
@@ -79,7 +79,7 @@ _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void* operator new[](s
 }
 
 _LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {
-#  ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if !_LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t)>(&operator new[])),
@@ -114,7 +114,7 @@ _LIBCPP_WEAK void operator delete[](void* ptr, const std::nothrow_t&) noexcept {
 
 _LIBCPP_WEAK void operator delete[](void* ptr, size_t) noexcept { ::operator delete[](ptr); }
 
-#  if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
+#  if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 
 static void* operator_new_aligned_impl(std::size_t size, std::align_val_t alignment) {
   if (size == 0)
@@ -145,7 +145,7 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC {
 }
 
 _LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
-#    ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if !_LIBCPP_HAS_EXCEPTIONS
 #      if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t, std::align_val_t)>(&operator new)),
@@ -174,7 +174,7 @@ operator new[](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC {
 }
 
 _LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
-#    ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#    if !_LIBCPP_HAS_EXCEPTIONS
 #      if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t, std::align_val_t)>(&operator new[])),
@@ -220,7 +220,7 @@ _LIBCPP_WEAK void operator delete[](void* ptr, size_t, std::align_val_t alignmen
   ::operator delete[](ptr, alignment);
 }
 
-#  endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#  endif // _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 // ------------------ END COPY ------------------
 
 #endif // !__GLIBCXX__ && !_LIBCPP_ABI_VCRUNTIME
diff --git a/yass/third_party/libc++/trunk/src/new_helpers.cpp b/yass/third_party/libc++/trunk/src/new_helpers.cpp
index 6560d0188e..2119d82b3e 100644
--- a/yass/third_party/libc++/trunk/src/new_helpers.cpp
+++ b/yass/third_party/libc++/trunk/src/new_helpers.cpp
@@ -18,7 +18,7 @@ const nothrow_t nothrow{};
 #ifndef LIBSTDCXX
 
 void __throw_bad_alloc() {
-#  ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if _LIBCPP_HAS_EXCEPTIONS
   throw bad_alloc();
 #  else
   _LIBCPP_VERBOSE_ABORT("bad_alloc was thrown in -fno-exceptions mode");
diff --git a/yass/third_party/libc++/trunk/src/ostream.cpp b/yass/third_party/libc++/trunk/src/ostream.cpp
index e1a9a4bc1d..f036aaf29d 100644
--- a/yass/third_party/libc++/trunk/src/ostream.cpp
+++ b/yass/third_party/libc++/trunk/src/ostream.cpp
@@ -24,7 +24,7 @@ _LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os) {
   // Returning a nullptr means the stream is not considered a terminal and the
   // special terminal handling is not done. The terminal handling is mainly of
   // importance on Windows.
-#ifndef _LIBCPP_HAS_NO_RTTI
+#if _LIBCPP_HAS_RTTI
   auto* __rdbuf = __os.rdbuf();
 #  ifndef _LIBCPP_HAS_NO_FILESYSTEM
   if (auto* __buffer = dynamic_cast<filebuf*>(__rdbuf))
@@ -33,7 +33,7 @@ _LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os) {
 
   if (auto* __buffer = dynamic_cast<__stdoutbuf<char>*>(__rdbuf))
     return __buffer->__file_;
-#endif // _LIBCPP_HAS_NO_RTTI
+#endif // _LIBCPP_HAS_RTTI
 
   return nullptr;
 }
diff --git a/yass/third_party/libc++/trunk/src/ryu/d2s.cpp b/yass/third_party/libc++/trunk/src/ryu/d2s.cpp
index 32d617cb55..5b80ed8a70 100644
--- a/yass/third_party/libc++/trunk/src/ryu/d2s.cpp
+++ b/yass/third_party/libc++/trunk/src/ryu/d2s.cpp
@@ -478,7 +478,7 @@ struct __floating_decimal_64 {
           36893488u, 7378697u, 1475739u, 295147u, 59029u, 11805u, 2361u, 472u, 94u, 18u, 3u };
 
         unsigned long _Trailing_zero_bits;
-#ifdef _LIBCPP_HAS_BITSCAN64
+#if _LIBCPP_HAS_BITSCAN64
         (void) _BitScanForward64(&_Trailing_zero_bits, __v.__mantissa); // __v.__mantissa is guaranteed nonzero
 #else // ^^^ 64-bit ^^^ / vvv 32-bit vvv
         const uint32_t _Low_mantissa = static_cast<uint32_t>(__v.__mantissa);
diff --git a/yass/third_party/libc++/trunk/src/stdexcept.cpp b/yass/third_party/libc++/trunk/src/stdexcept.cpp
index 134d28efb7..0ee438bef0 100644
--- a/yass/third_party/libc++/trunk/src/stdexcept.cpp
+++ b/yass/third_party/libc++/trunk/src/stdexcept.cpp
@@ -20,7 +20,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 void __throw_runtime_error(const char* msg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw runtime_error(msg);
 #else
   _LIBCPP_VERBOSE_ABORT("runtime_error was thrown in -fno-exceptions mode with message \"%s\"", msg);
diff --git a/yass/third_party/libc++/trunk/src/support/runtime/exception_fallback.ipp b/yass/third_party/libc++/trunk/src/support/runtime/exception_fallback.ipp
index bedb16e585..ba283aee22 100644
--- a/yass/third_party/libc++/trunk/src/support/runtime/exception_fallback.ipp
+++ b/yass/third_party/libc++/trunk/src/support/runtime/exception_fallback.ipp
@@ -34,18 +34,18 @@ terminate_handler set_terminate(terminate_handler func) noexcept {
 terminate_handler get_terminate() noexcept { return __libcpp_atomic_load(&__terminate_handler); }
 
 [[noreturn]] void terminate() noexcept {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     (*get_terminate())();
     // handler should not return
     __libcpp_verbose_abort("terminate_handler unexpectedly returned\n");
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     // handler should not throw exception
     __libcpp_verbose_abort("terminate_handler unexpectedly threw an exception\n");
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 bool uncaught_exception() noexcept { return uncaught_exceptions() > 0; }
diff --git a/yass/third_party/libc++/trunk/src/support/runtime/exception_msvc.ipp b/yass/third_party/libc++/trunk/src/support/runtime/exception_msvc.ipp
index 869b64d2f5..2ae004bb02 100644
--- a/yass/third_party/libc++/trunk/src/support/runtime/exception_msvc.ipp
+++ b/yass/third_party/libc++/trunk/src/support/runtime/exception_msvc.ipp
@@ -42,18 +42,18 @@ terminate_handler set_terminate(terminate_handler func) noexcept { return ::set_
 terminate_handler get_terminate() noexcept { return ::_get_terminate(); }
 
 [[noreturn]] void terminate() noexcept {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   try {
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
     (*get_terminate())();
     // handler should not return
     __libcpp_verbose_abort("terminate_handler unexpectedly returned\n");
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   } catch (...) {
     // handler should not throw exception
     __libcpp_verbose_abort("terminate_handler unexpectedly threw an exception\n");
   }
-#endif // _LIBCPP_HAS_NO_EXCEPTIONS
+#endif // _LIBCPP_HAS_EXCEPTIONS
 }
 
 bool uncaught_exception() noexcept { return uncaught_exceptions() > 0; }
diff --git a/yass/third_party/libc++/trunk/src/system_error.cpp b/yass/third_party/libc++/trunk/src/system_error.cpp
index 3367bd56bd..476729310d 100644
--- a/yass/third_party/libc++/trunk/src/system_error.cpp
+++ b/yass/third_party/libc++/trunk/src/system_error.cpp
@@ -211,7 +211,7 @@ system_error::system_error(int ev, const error_category& ecat)
 system_error::~system_error() noexcept {}
 
 void __throw_system_error(int ev, const char* what_arg) {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   std::__throw_system_error(error_code(ev, system_category()), what_arg);
 #else
   // The above could also handle the no-exception case, but for size, avoid referencing system_category() unnecessarily.
diff --git a/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_integer.compile.pass.cpp b/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_integer.compile.pass.cpp
index 55b5929847..563580b687 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_integer.compile.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_integer.compile.pass.cpp
@@ -30,7 +30,7 @@ static_assert(std::__libcpp_integer<unsigned int>);
 static_assert(std::__libcpp_integer<unsigned long int>);
 static_assert(std::__libcpp_integer<unsigned long long int>);
 static_assert(std::__libcpp_integer<unsigned short int>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 static_assert(std::__libcpp_integer<__uint128_t>);
 #endif
 // Signed
@@ -40,7 +40,7 @@ static_assert(std::__libcpp_integer<int>);
 static_assert(std::__libcpp_integer<long int>);
 static_assert(std::__libcpp_integer<long long int>);
 static_assert(std::__libcpp_integer<short int>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 static_assert(std::__libcpp_integer<__int128_t>);
 #endif
 // Non-integer
diff --git a/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_signed_integer.compile.pass.cpp b/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_signed_integer.compile.pass.cpp
index 5bf7aa526f..d1e21ee96b 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_signed_integer.compile.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_signed_integer.compile.pass.cpp
@@ -30,7 +30,7 @@ static_assert(!std::__libcpp_signed_integer<unsigned int>);
 static_assert(!std::__libcpp_signed_integer<unsigned long int>);
 static_assert(!std::__libcpp_signed_integer<unsigned long long int>);
 static_assert(!std::__libcpp_signed_integer<unsigned short int>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 static_assert(!std::__libcpp_signed_integer<__uint128_t>);
 #endif
 // Signed
@@ -40,7 +40,7 @@ static_assert(std::__libcpp_signed_integer<int>);
 static_assert(std::__libcpp_signed_integer<long int>);
 static_assert(std::__libcpp_signed_integer<long long int>);
 static_assert(std::__libcpp_signed_integer<short int>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 static_assert(std::__libcpp_signed_integer<__int128_t>);
 #endif
 // Non-integer
diff --git a/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_unsigned_integer.compile.pass.cpp b/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_unsigned_integer.compile.pass.cpp
index 163ec53e17..c671f03cbf 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_unsigned_integer.compile.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/concepts/concepts.arithmetic/__libcpp_unsigned_integer.compile.pass.cpp
@@ -30,7 +30,7 @@ static_assert(std::__libcpp_unsigned_integer<unsigned int>);
 static_assert(std::__libcpp_unsigned_integer<unsigned long int>);
 static_assert(std::__libcpp_unsigned_integer<unsigned long long int>);
 static_assert(std::__libcpp_unsigned_integer<unsigned short int>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 static_assert(std::__libcpp_unsigned_integer<__uint128_t>);
 #endif
 // Signed
@@ -40,7 +40,7 @@ static_assert(!std::__libcpp_unsigned_integer<int>);
 static_assert(!std::__libcpp_unsigned_integer<long int>);
 static_assert(!std::__libcpp_unsigned_integer<long long int>);
 static_assert(!std::__libcpp_unsigned_integer<short int>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#if _LIBCPP_HAS_INT128
 static_assert(!std::__libcpp_unsigned_integer<__int128_t>);
 #endif
 // Non-integer
diff --git a/yass/third_party/libc++/trunk/test/libcxx/containers/container_traits.compile.pass.cpp b/yass/third_party/libc++/trunk/test/libcxx/containers/container_traits.compile.pass.cpp
new file mode 100644
index 0000000000..1452bfbaf3
--- /dev/null
+++ b/yass/third_party/libc++/trunk/test/libcxx/containers/container_traits.compile.pass.cpp
@@ -0,0 +1,163 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// <__type_traits/container_traits.h>
+//
+
+#include <__type_traits/container_traits.h>
+
+#include <deque>
+#include <forward_list>
+#include <list>
+#include <vector>
+#include <map>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "test_allocator.h"
+#include "test_macros.h"
+#include "MoveOnly.h"
+
+struct ThrowOnMove {
+  ThrowOnMove();
+  ThrowOnMove(const ThrowOnMove&) TEST_NOEXCEPT_COND(false);
+  ThrowOnMove(ThrowOnMove&&) TEST_NOEXCEPT_COND(false);
+  ThrowOnMove& operator=(ThrowOnMove&&) TEST_NOEXCEPT_COND(false);
+  ThrowOnMove& operator=(const ThrowOnMove&) TEST_NOEXCEPT_COND(false);
+
+  bool operator<(ThrowOnMove const&) const;
+  bool operator==(ThrowOnMove const&) const;
+};
+
+struct NonCopyThrowOnMove {
+  NonCopyThrowOnMove();
+  NonCopyThrowOnMove(NonCopyThrowOnMove&&) TEST_NOEXCEPT_COND(false);
+  NonCopyThrowOnMove(const NonCopyThrowOnMove&) = delete;
+  NonCopyThrowOnMove& operator=(NonCopyThrowOnMove&&) TEST_NOEXCEPT_COND(false);
+  NonCopyThrowOnMove& operator=(const NonCopyThrowOnMove&) = delete;
+
+  bool operator<(NonCopyThrowOnMove const&) const;
+  bool operator==(NonCopyThrowOnMove const&) const;
+};
+
+struct ThrowingHash {
+  template <class T>
+  std::size_t operator()(const T&) const TEST_NOEXCEPT_COND(false);
+};
+
+struct NoThrowHash {
+  template <class T>
+  std::size_t operator()(const T&) const TEST_NOEXCEPT;
+};
+
+template <bool Expected, class Container>
+void check() {
+  static_assert(
+      std::__container_traits<Container>::__emplacement_has_strong_exception_safety_guarantee == Expected, "");
+}
+
+void test() {
+  check<true, std::list<int> >();
+  check<true, std::list<int, test_allocator<int> > >();
+  check<true, std::list<MoveOnly> >();
+  check<true, std::list<ThrowOnMove> >();
+  check<true, std::list<NonCopyThrowOnMove> >();
+
+  check<true, std::forward_list<int> >();
+  check<true, std::forward_list<int, test_allocator<int> > >();
+  check<true, std::forward_list<MoveOnly> >();
+  check<true, std::forward_list<ThrowOnMove> >();
+  check<true, std::forward_list<NonCopyThrowOnMove> >();
+
+  check<true, std::deque<int> >();
+  check<true, std::deque<int, test_allocator<int> > >();
+  check<true, std::deque<MoveOnly> >();
+  check<true, std::deque<ThrowOnMove> >();
+  check<false, std::deque<NonCopyThrowOnMove> >();
+
+  check<true, std::vector<int> >();
+  check<true, std::vector<int, test_allocator<int> > >();
+  check<true, std::vector<MoveOnly> >();
+  check<true, std::vector<ThrowOnMove> >();
+  check<false, std::vector<NonCopyThrowOnMove> >();
+
+  check<true, std::set<int> >();
+  check<true, std::set<int, std::less<int>, test_allocator<int> > >();
+  check<true, std::set<MoveOnly> >();
+  check<true, std::set<ThrowOnMove> >();
+  check<true, std::set<NonCopyThrowOnMove> >();
+
+  check<true, std::multiset<int> >();
+  check<true, std::multiset<int, std::less<int>, test_allocator<int> > >();
+  check<true, std::multiset<MoveOnly> >();
+  check<true, std::multiset<ThrowOnMove> >();
+  check<true, std::multiset<NonCopyThrowOnMove> >();
+
+  check<true, std::map<int, int> >();
+  check<true, std::map<int, int, std::less<int>, test_allocator<int> > >();
+  check<true, std::map<MoveOnly, MoveOnly> >();
+  check<true, std::map<ThrowOnMove, ThrowOnMove> >();
+  check<true, std::map<NonCopyThrowOnMove, NonCopyThrowOnMove> >();
+
+  check<true, std::multimap<int, int> >();
+  check<true, std::multimap<int, int, std::less<int>, test_allocator<int> > >();
+  check<true, std::multimap<MoveOnly, MoveOnly> >();
+  check<true, std::multimap<ThrowOnMove, ThrowOnMove> >();
+  check<true, std::multimap<NonCopyThrowOnMove, NonCopyThrowOnMove> >();
+
+#if TEST_STD_VER < 11
+  check<false, std::unordered_set<int> >();
+  check<false, std::unordered_set<int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_set<MoveOnly> >();
+  check<false, std::unordered_set<MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_set<MoveOnly, ThrowingHash> >();
+
+  check<false, std::unordered_multiset<int> >();
+  check<false, std::unordered_multiset<int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_multiset<MoveOnly> >();
+  check<false, std::unordered_multiset<MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_multiset<MoveOnly, ThrowingHash> >();
+
+  check<false, std::unordered_map<int, int> >();
+  check<false, std::unordered_map<int, int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_map<MoveOnly, MoveOnly> >();
+  check<false, std::unordered_map<MoveOnly, MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_map<MoveOnly, MoveOnly, ThrowingHash> >();
+
+  check<false, std::unordered_multimap<int, int> >();
+  check<false, std::unordered_multimap<int, int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_multimap<MoveOnly, MoveOnly> >();
+  check<false, std::unordered_multimap<MoveOnly, MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_multimap<MoveOnly, MoveOnly, ThrowingHash> >();
+#else
+  check<true, std::unordered_set<int> >();
+  check<true, std::unordered_set<int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_set<MoveOnly> >();
+  check<true, std::unordered_set<MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_set<MoveOnly, ThrowingHash> >();
+
+  check<true, std::unordered_multiset<int> >();
+  check<true, std::unordered_multiset<int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_multiset<MoveOnly> >();
+  check<true, std::unordered_multiset<MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_multiset<MoveOnly, ThrowingHash> >();
+
+  check<true, std::unordered_map<int, int> >();
+  check<true, std::unordered_map<int, int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_map<MoveOnly, MoveOnly> >();
+  check<true, std::unordered_map<MoveOnly, MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_map<MoveOnly, MoveOnly, ThrowingHash> >();
+
+  check<true, std::unordered_multimap<int, int> >();
+  check<true, std::unordered_multimap<int, int, std::hash<int>, std::less<int>, test_allocator<int> > >();
+  check<false, std::unordered_multimap<MoveOnly, MoveOnly> >();
+  check<true, std::unordered_multimap<MoveOnly, MoveOnly, NoThrowHash> >();
+  check<false, std::unordered_multimap<MoveOnly, MoveOnly, ThrowingHash> >();
+#endif
+}
diff --git a/yass/third_party/libc++/trunk/test/libcxx/diagnostics/new.nodiscard.verify.cpp b/yass/third_party/libc++/trunk/test/libcxx/diagnostics/new.nodiscard.verify.cpp
index 578afaabbd..505618c0b8 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/diagnostics/new.nodiscard.verify.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/diagnostics/new.nodiscard.verify.cpp
@@ -21,12 +21,12 @@ void test() {
   ::operator new(0, std::nothrow);                        // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
   ::operator new[](0);                                    // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
   ::operator new[](0, std::nothrow);                      // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-#ifndef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#if _LIBCPP_HAS_ALIGNED_ALLOCATION
   ::operator new(0, std::align_val_t{1});                 // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
   ::operator new(0, std::align_val_t{1}, std::nothrow);   // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
   ::operator new[](0, std::align_val_t{1});               // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
   ::operator new[](0, std::align_val_t{1}, std::nothrow); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
-#endif // _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#endif // _LIBCPP_HAS_ALIGNED_ALLOCATION
 
 #if TEST_STD_VER >= 17
   int* ptr = nullptr;
diff --git a/yass/third_party/libc++/trunk/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp b/yass/third_party/libc++/trunk/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp
index 34a3146e26..6249c52814 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp
@@ -12,7 +12,6 @@
 
 #include "test_macros.h"
 
-
-#ifdef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
-#   error "libc++ should have aligned allocation in C++17 and up when targeting a platform that supports it"
+#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
+#  error "libc++ should have aligned allocation in C++17 and up when targeting a platform that supports it"
 #endif
diff --git a/yass/third_party/libc++/trunk/test/libcxx/type_traits/is_trivially_relocatable.compile.pass.cpp b/yass/third_party/libc++/trunk/test/libcxx/type_traits/is_trivially_relocatable.compile.pass.cpp
index 64d2c54e7d..8bd82bacc5 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/type_traits/is_trivially_relocatable.compile.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/type_traits/is_trivially_relocatable.compile.pass.cpp
@@ -79,7 +79,7 @@ static_assert(!std::__libcpp_is_trivially_relocatable<std::array<NotTriviallyCop
 static_assert(std::__libcpp_is_trivially_relocatable<std::array<std::unique_ptr<int>, 1> >::value, "");
 
 // basic_string
-#if defined(_LIBCPP_HAS_NO_ASAN) || !defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
+#if !_LIBCPP_HAS_ASAN || !defined(_LIBCPP_INSTRUMENTED_WITH_ASAN)
 struct MyChar {
   char c;
 };
diff --git a/yass/third_party/libc++/trunk/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp b/yass/third_party/libc++/trunk/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
index 00ba267a4f..d2b62a9b6a 100644
--- a/yass/third_party/libc++/trunk/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
+++ b/yass/third_party/libc++/trunk/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
@@ -121,7 +121,7 @@ void test() {
     }
   }
 // These diagnostics happen when we try to construct bad_expected_access from the non copy-constructible error type.
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   // expected-error-re@*:* {{call to deleted constructor of{{.*}}}}
   // expected-error-re@*:* {{call to deleted constructor of{{.*}}}}
   // expected-error-re@*:* {{call to deleted constructor of{{.*}}}}
diff --git a/yass/third_party/libc++/trunk/test/std/atomics/stdatomic.h.syn/types.compile.pass.cpp b/yass/third_party/libc++/trunk/test/std/atomics/stdatomic.h.syn/types.compile.pass.cpp
index 85d9337987..50bc157157 100644
--- a/yass/third_party/libc++/trunk/test/std/atomics/stdatomic.h.syn/types.compile.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/std/atomics/stdatomic.h.syn/types.compile.pass.cpp
@@ -168,7 +168,7 @@ void f() {
   static_assert(std::is_same_v<std::atomic<long long>, ::atomic_llong>);
   static_assert(std::is_same_v<std::atomic<unsigned long long>, ::atomic_ullong>);
 
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   static_assert(std::is_same_v<std::atomic<char8_t>,  ::atomic_char8_t>);
 #endif
   static_assert(std::is_same_v<std::atomic<char16_t>, ::atomic_char16_t>);
diff --git a/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/alg.pass.cpp b/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/alg.pass.cpp
index 159cb19f65..772c3c5630 100644
--- a/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/alg.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/alg.pass.cpp
@@ -82,7 +82,7 @@ int main(int, char**)
     assert(e4() < 0x7fffffffu);
     assert(e4() < 0x7fffffffu);
 
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
     // m might overflow. The overflow is not OK, result will be in bounds,
     // and Schrage's algorithm is incompatible here. Need to use 128 bit arithmetic.
     typedef std::linear_congruential_engine<T, 0x100000001ull, 0ull, (1ull << 61) - 1ull> E5;
diff --git a/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp b/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp
index a85c63d26e..423f4d021a 100644
--- a/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp
@@ -84,7 +84,7 @@ int main(int, char**)
     test_ext<unsigned long>();
     test<unsigned long long>();
     // This isn't implemented on platforms without __int128
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
     test_ext<unsigned long long>();
 #endif
 
diff --git a/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp b/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp
index 66b4e6ab4d..f238c12cff 100644
--- a/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/std/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp
@@ -117,7 +117,7 @@ int main(int, char**)
     test_ext<unsigned long>();
     test<unsigned long long>();
     // This isn't implemented on platforms without __int128
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
     test_ext<unsigned long long>();
 #endif
 
diff --git a/yass/third_party/libc++/trunk/test/std/strings/c.strings/no_c8rtomb_mbrtoc8.verify.cpp b/yass/third_party/libc++/trunk/test/std/strings/c.strings/no_c8rtomb_mbrtoc8.verify.cpp
index bc058d400f..1d4a225668 100644
--- a/yass/third_party/libc++/trunk/test/std/strings/c.strings/no_c8rtomb_mbrtoc8.verify.cpp
+++ b/yass/third_party/libc++/trunk/test/std/strings/c.strings/no_c8rtomb_mbrtoc8.verify.cpp
@@ -19,7 +19,7 @@
 #if !defined(TEST_HAS_NO_CHAR8_T)
 using U = decltype(::c8rtomb);
 using V = decltype(::mbrtoc8);
-#  if defined(_LIBCPP_HAS_NO_C8RTOMB_MBRTOC8)
+#  if !_LIBCPP_HAS_C8RTOMB_MBRTOC8
 // expected-error@-3 {{no member named 'c8rtomb' in the global namespace}}
 // expected-error@-3 {{no member named 'mbrtoc8' in the global namespace}}
 #  else
diff --git a/yass/third_party/libc++/trunk/test/support/test.support/make_string_header.pass.cpp b/yass/third_party/libc++/trunk/test/support/test.support/make_string_header.pass.cpp
index 8fcc05ec49..45aaa2cfef 100644
--- a/yass/third_party/libc++/trunk/test/support/test.support/make_string_header.pass.cpp
+++ b/yass/third_party/libc++/trunk/test/support/test.support/make_string_header.pass.cpp
@@ -31,7 +31,7 @@ int main(int, char**) {
     ==  L" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMN"
              "OPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~");
 #endif
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
+#if _LIBCPP_HAS_CHAR8_T
   assert(MAKE_STRING(char8_t,
          " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMN"
              "OPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~")
diff --git a/yass/third_party/libc++/trunk/test/support/test_macros.h b/yass/third_party/libc++/trunk/test/support/test_macros.h
index ae171b3f22..5dcd775e86 100644
--- a/yass/third_party/libc++/trunk/test/support/test_macros.h
+++ b/yass/third_party/libc++/trunk/test/support/test_macros.h
@@ -214,10 +214,10 @@
 #define TEST_IS_EXECUTED_IN_A_SLOW_ENVIRONMENT
 #endif
 
-#if defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) || \
-  (!(TEST_STD_VER > 14 || \
-    (defined(__cpp_aligned_new) && __cpp_aligned_new >= 201606L)))
-#define TEST_HAS_NO_ALIGNED_ALLOCATION
+#if defined(_LIBCPP_VERSION) && !_LIBCPP_HAS_ALIGNED_ALLOCATION
+#  define TEST_HAS_NO_ALIGNED_ALLOCATION
+#elif TEST_STD_VER < 17 && (!defined(__cpp_aligned_new) || __cpp_aligned_new < 201606L)
+#  define TEST_HAS_NO_ALIGNED_ALLOCATION
 #endif
 
 #if TEST_STD_VER > 17
@@ -397,12 +397,12 @@ inline Tp const& DoNotOptimize(Tp const& value) {
 #   define TEST_HAS_NO_UNICODE
 #endif
 
-#if defined(_LIBCPP_HAS_OPEN_WITH_WCHAR)
+#if defined(_LIBCPP_VERSION) && _LIBCPP_HAS_OPEN_WITH_WCHAR
 #  define TEST_HAS_OPEN_WITH_WCHAR
 #endif
 
-#if defined(_LIBCPP_HAS_NO_INT128) || defined(_MSVC_STL_VERSION)
-#   define TEST_HAS_NO_INT128
+#if (defined(_LIBCPP_VERSION) && !_LIBCPP_HAS_INT128) || defined(_MSVC_STL_VERSION)
+#  define TEST_HAS_NO_INT128
 #endif
 
 #if defined(_LIBCPP_HAS_NO_LOCALIZATION)
@@ -421,7 +421,7 @@ inline Tp const& DoNotOptimize(Tp const& value) {
 #  define TEST_HAS_NO_FILESYSTEM
 #endif
 
-#if defined(_LIBCPP_HAS_NO_C8RTOMB_MBRTOC8)
+#if defined(_LIBCPP_VERSION) && !_LIBCPP_HAS_C8RTOMB_MBRTOC8
 #  define TEST_HAS_NO_C8RTOMB_MBRTOC8
 #endif
 
@@ -495,7 +495,7 @@ inline Tp const& DoNotOptimize(Tp const& value) {
 #endif
 
 // Clang-18 has support for deducing this, but it does not set the FTM.
-#ifdef _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
+#if defined(_LIBCPP_VERSION) && _LIBCPP_HAS_EXPLICIT_THIS_PARAMETER
 #  define TEST_HAS_EXPLICIT_THIS_PARAMETER
 #endif
 
diff --git a/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/CMakeLists.txt b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/CMakeLists.txt
index 0e1d3506a9..efe63e0f62 100644
--- a/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/CMakeLists.txt
+++ b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/CMakeLists.txt
@@ -94,6 +94,7 @@ set(SOURCES
     abi_tag_on_virtual.cpp
     header_exportable_declarations.cpp
     hide_from_abi.cpp
+    internal_ftm_use.cpp
     proper_version_checks.cpp
     qualify_declval.cpp
     robust_against_adl.cpp
diff --git a/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/internal_ftm_use.cpp b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/internal_ftm_use.cpp
new file mode 100644
index 0000000000..b5e849e2a0
--- /dev/null
+++ b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/internal_ftm_use.cpp
@@ -0,0 +1,109 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// This clang-tidy check ensures that we don't use any _LIBCPP_HAS_FOO macro
+// inside `#ifdef`, `#ifndef` & friends, since the intent is to always use `#if` instead.
+
+#include "internal_ftm_use.hpp"
+
+#include <clang/Lex/Lexer.h>
+#include <clang/Lex/PPCallbacks.h>
+#include <clang/Lex/Preprocessor.h>
+
+#include <string>
+
+namespace libcpp {
+namespace {
+std::array valid_macros{
+    // Public API macros
+    "_LIBCPP_HAS_ASAN_CONTAINER_ANNOTATIONS_FOR_ALL_ALLOCATORS",
+
+    // Testing macros
+    "_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER",
+
+    // TODO: Why does this macro even exist?
+    "_LIBCPP_HAS_NO_TREE_BARRIER",
+
+    // Configuration macros
+    "_LIBCPP_HAS_NO_TIME_ZONE_DATABASE",
+    "_LIBCPP_HAS_NO_FILESYSTEM",
+    "_LIBCPP_HAS_NO_LOCALIZATION",
+    "_LIBCPP_HAS_NO_THREADS",
+    "_LIBCPP_HAS_NO_MONOTONIC_CLOCK",
+    "_LIBCPP_HAS_MUSL_LIBC",
+    "_LIBCPP_HAS_NO_WIDE_CHARACTERS",
+    "_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS",
+    "_LIBCPP_HAS_NO_RANDOM_DEVICE",
+    "_LIBCPP_HAS_NO_UNICODE",
+    "_LIBCPP_HAS_NO_TERMINAL",
+
+    // Atomic API macros
+    "_LIBCPP_HAS_EXTERNAL_ATOMIC_IMP",
+    "_LIBCPP_HAS_GCC_ATOMIC_IMP",
+    "_LIBCPP_HAS_C_ATOMIC_IMP",
+
+    // Thread API macros
+    "_LIBCPP_HAS_THREAD_API_PTHREAD",
+    "_LIBCPP_HAS_THREAD_API_WIN32",
+    "_LIBCPP_HAS_THREAD_API_EXTERNAL",
+    "_LIBCPP_HAS_THREAD_API_C11",
+
+    // Experimental features
+    "_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB",
+    "_LIBCPP_HAS_NO_EXPERIMENTAL_SYNCSTREAM",
+    "_LIBCPP_HAS_NO_EXPERIMENTAL_STOP_TOKEN",
+    "_LIBCPP_HAS_NO_INCOMPLETE_PSTL",
+};
+
+class internal_ftm_use_callbacks : public clang::PPCallbacks {
+public:
+  internal_ftm_use_callbacks(clang::tidy::ClangTidyCheck& check) : check_(check) {}
+
+  void Defined(const clang::Token& token,
+               const clang::MacroDefinition& macro_definition,
+               clang::SourceRange location) override {
+    check_macro(token.getIdentifierInfo()->getName(), location.getBegin());
+  }
+
+  void Ifdef(clang::SourceLocation location, const clang::Token& token, const clang::MacroDefinition&) override {
+    check_macro(token.getIdentifierInfo()->getName(), location);
+  }
+
+  void Elifdef(clang::SourceLocation location, const clang::Token& token, const clang::MacroDefinition&) override {
+    check_macro(token.getIdentifierInfo()->getName(), location);
+  }
+
+  void Ifndef(clang::SourceLocation location, const clang::Token& token, const clang::MacroDefinition&) override {
+    check_macro(token.getIdentifierInfo()->getName(), location);
+  }
+
+  void Elifndef(clang::SourceLocation location, const clang::Token& token, const clang::MacroDefinition&) override {
+    check_macro(token.getIdentifierInfo()->getName(), location);
+  }
+
+private:
+  void check_macro(std::string_view macro, clang::SourceLocation location) {
+    if (macro.starts_with("_LIBCPP_HAS_") && std::ranges::find(valid_macros, macro) == valid_macros.end()) {
+      check_.diag(location, std::string("\'") + std::string{macro} + "' is always defined to 1 or 0.");
+    }
+  }
+
+  clang::tidy::ClangTidyCheck& check_;
+};
+} // namespace
+
+internal_ftm_use::internal_ftm_use(llvm::StringRef name, clang::tidy::ClangTidyContext* context)
+    : clang::tidy::ClangTidyCheck(name, context) {}
+
+void internal_ftm_use::registerPPCallbacks(const clang::SourceManager& source_manager,
+                                           clang::Preprocessor* preprocessor,
+                                           clang::Preprocessor* module_expander) {
+  preprocessor->addPPCallbacks(std::make_unique<internal_ftm_use_callbacks>(*this));
+}
+
+} // namespace libcpp
diff --git a/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/internal_ftm_use.hpp b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/internal_ftm_use.hpp
new file mode 100644
index 0000000000..90c5448f6b
--- /dev/null
+++ b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/internal_ftm_use.hpp
@@ -0,0 +1,19 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang-tidy/ClangTidyCheck.h"
+
+namespace libcpp {
+class internal_ftm_use : public clang::tidy::ClangTidyCheck {
+public:
+  internal_ftm_use(llvm::StringRef, clang::tidy::ClangTidyContext*);
+  void registerPPCallbacks(const clang::SourceManager& source_manager,
+                           clang::Preprocessor* preprocessor,
+                           clang::Preprocessor* module_expander) override;
+};
+} // namespace libcpp
diff --git a/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/libcpp_module.cpp b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/libcpp_module.cpp
index 16acf32ae5..54beed5e30 100644
--- a/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/libcpp_module.cpp
+++ b/yass/third_party/libc++/trunk/test/tools/clang_tidy_checks/libcpp_module.cpp
@@ -12,6 +12,7 @@
 #include "abi_tag_on_virtual.hpp"
 #include "header_exportable_declarations.hpp"
 #include "hide_from_abi.hpp"
+#include "internal_ftm_use.hpp"
 #include "proper_version_checks.hpp"
 #include "qualify_declval.hpp"
 #include "robust_against_adl.hpp"
@@ -24,6 +25,7 @@ public:
     check_factories.registerCheck<libcpp::abi_tag_on_virtual>("libcpp-avoid-abi-tag-on-virtual");
     check_factories.registerCheck<libcpp::header_exportable_declarations>("libcpp-header-exportable-declarations");
     check_factories.registerCheck<libcpp::hide_from_abi>("libcpp-hide-from-abi");
+    check_factories.registerCheck<libcpp::internal_ftm_use>("libcpp-internal-ftms");
     check_factories.registerCheck<libcpp::proper_version_checks>("libcpp-cpp-version-check");
     check_factories.registerCheck<libcpp::robust_against_adl_check>("libcpp-robust-against-adl");
     check_factories.registerCheck<libcpp::uglify_attributes>("libcpp-uglify-attributes");
diff --git a/yass/third_party/libc++/trunk/utils/generate_feature_test_macro_components.py b/yass/third_party/libc++/trunk/utils/generate_feature_test_macro_components.py
index db14c1781d..7ab1af93d1 100755
--- a/yass/third_party/libc++/trunk/utils/generate_feature_test_macro_components.py
+++ b/yass/third_party/libc++/trunk/utils/generate_feature_test_macro_components.py
@@ -280,7 +280,7 @@ feature_test_macros = [
                 "string_view",
             ],
             "test_suite_guard": "defined(__cpp_char8_t)",
-            "libcxx_guard": "!defined(_LIBCPP_HAS_NO_CHAR8_T)",
+            "libcxx_guard": "_LIBCPP_HAS_CHAR8_T",
         },
         {
             "name": "__cpp_lib_chrono",
diff --git a/yass/third_party/libc++/trunk/utils/libcxx/header_information.py b/yass/third_party/libc++/trunk/utils/libcxx/header_information.py
index fd48b35a88..6bebf3302f 100644
--- a/yass/third_party/libc++/trunk/utils/libcxx/header_information.py
+++ b/yass/third_party/libc++/trunk/utils/libcxx/header_information.py
@@ -10,8 +10,8 @@ import os, pathlib
 
 header_restrictions = {
     # headers with #error directives
-    "atomic": "!defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)",
-    "stdatomic.h": "!defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)",
+    "atomic": "_LIBCPP_HAS_ATOMIC_HEADER",
+    "stdatomic.h": "_LIBCPP_HAS_ATOMIC_HEADER",
 
     # headers with #error directives
     "ios": "!defined(_LIBCPP_HAS_NO_LOCALIZATION)",
diff --git a/yass/third_party/libc++/winxp.patch b/yass/third_party/libc++/winxp.patch
index 7093fed873..60bd5ec99a 100644
--- a/yass/third_party/libc++/winxp.patch
+++ b/yass/third_party/libc++/winxp.patch
@@ -1,5 +1,5 @@
 diff --git a/include/__condition_variable/condition_variable.h b/include/__condition_variable/condition_variable.h
-index de35aaca1..864134812 100644
+index 61412541b..ddd7714bc 100644
 --- a/include/__condition_variable/condition_variable.h
 +++ b/include/__condition_variable/condition_variable.h
 @@ -43,7 +43,11 @@ class _LIBCPP_EXPORTED_FROM_ABI condition_variable {
@@ -12,13 +12,13 @@ index de35aaca1..864134812 100644
 +  condition_variable() _NOEXCEPT;
 +#  endif
  
- #  ifdef _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
+ #  if _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
    ~condition_variable() = default;
 diff --git a/include/__config b/include/__config
-index 0d7126461..8282a5d2f 100644
+index fcba56f7e..acf3996cc 100644
 --- a/include/__config
 +++ b/include/__config
-@@ -860,8 +860,7 @@ typedef __char32_t char32_t;
+@@ -891,8 +891,7 @@ typedef __char32_t char32_t;
  //               respective stakeholders.
  // clang-format off
  #  if (defined(_LIBCPP_HAS_THREAD_API_PTHREAD) && defined(__GLIBC__)) ||                                               \
@@ -26,19 +26,19 @@ index 0d7126461..8282a5d2f 100644
 -       defined(_LIBCPP_HAS_THREAD_API_WIN32)
 +      (defined(_LIBCPP_HAS_THREAD_API_C11) && defined(__Fuchsia__))
  // clang-format on
- #    define _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION
- #  endif
-@@ -874,7 +873,7 @@ typedef __char32_t char32_t;
+ #    define _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION 1
+ #  else
+@@ -907,7 +906,7 @@ typedef __char32_t char32_t;
  //
  // TODO(EricWF): This is potentially true for some pthread implementations
  // as well.
 -#  if (defined(_LIBCPP_HAS_THREAD_API_C11) && defined(__Fuchsia__)) || defined(_LIBCPP_HAS_THREAD_API_WIN32)
-+#  if (defined(_LIBCPP_HAS_THREAD_API_C11) && defined(__Fuchsia__))
- #    define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
- #  endif
- 
++#  if defined(_LIBCPP_HAS_THREAD_API_C11) && defined(__Fuchsia__)
+ #    define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION 1
+ #  else
+ #    define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION 0
 diff --git a/include/__mutex/mutex.h b/include/__mutex/mutex.h
-index 1ed015471..8c41fb7fa 100644
+index 9c0c9ad6b..5d027a135 100644
 --- a/include/__mutex/mutex.h
 +++ b/include/__mutex/mutex.h
 @@ -25,7 +25,11 @@ class _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mut
@@ -333,7 +333,7 @@ index db60571cf..9904a4760 100644
  
  void condition_variable::notify_one() noexcept { __libcpp_condvar_signal(&__cv_); }
 diff --git a/src/condition_variable_destructor.cpp b/src/condition_variable_destructor.cpp
-index 59811ed7f..15de32f2e 100644
+index f6ffe3368..70299b53e 100644
 --- a/src/condition_variable_destructor.cpp
 +++ b/src/condition_variable_destructor.cpp
 @@ -26,7 +26,11 @@ class _LIBCPP_EXPORTED_FROM_ABI condition_variable {
@@ -446,7 +446,7 @@ index 2f8504d60..545c0a06c 100644
  
  void mutex::lock() {
 diff --git a/src/mutex_destructor.cpp b/src/mutex_destructor.cpp
-index a6ceaaaf2..ca91d8980 100644
+index 9f991721f..eef321001 100644
 --- a/src/mutex_destructor.cpp
 +++ b/src/mutex_destructor.cpp
 @@ -30,9 +30,13 @@ class _LIBCPP_EXPORTED_FROM_ABI mutex {
diff --git a/yass/third_party/libc++abi/trunk/src/fallback_malloc.cpp b/yass/third_party/libc++abi/trunk/src/fallback_malloc.cpp
index 76bd2e9bcd..75788fe9be 100644
--- a/yass/third_party/libc++abi/trunk/src/fallback_malloc.cpp
+++ b/yass/third_party/libc++abi/trunk/src/fallback_malloc.cpp
@@ -259,7 +259,7 @@ void* __aligned_malloc_with_fallback(size_t size) {
 #if defined(_WIN32)
   if (void* dest = std::__libcpp_aligned_alloc(alignof(__aligned_type), size))
     return dest;
-#elif defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
+#elif !_LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
   if (void* dest = ::malloc(size))
     return dest;
 #else
@@ -286,7 +286,7 @@ void __aligned_free_with_fallback(void* ptr) {
   if (is_fallback_ptr(ptr))
     fallback_free(ptr);
   else {
-#if defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
+#if !_LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
     ::free(ptr);
 #else
     std::__libcpp_aligned_free(ptr);
diff --git a/yass/third_party/libc++abi/trunk/src/stdlib_new_delete.cpp b/yass/third_party/libc++abi/trunk/src/stdlib_new_delete.cpp
index bd576e6aee..f386b28f0c 100644
--- a/yass/third_party/libc++abi/trunk/src/stdlib_new_delete.cpp
+++ b/yass/third_party/libc++abi/trunk/src/stdlib_new_delete.cpp
@@ -24,12 +24,12 @@
 #  error The _LIBCPP_WEAK macro should be already defined by libc++
 #endif
 
-#if defined(_LIBCXXABI_NO_EXCEPTIONS) != defined(_LIBCPP_HAS_NO_EXCEPTIONS)
+#if defined(_LIBCXXABI_NO_EXCEPTIONS) != !_LIBCPP_HAS_EXCEPTIONS
 #  error libc++ and libc++abi seem to disagree on whether exceptions are enabled
 #endif
 
 inline void __throw_bad_alloc_shim() {
-#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
+#if _LIBCPP_HAS_EXCEPTIONS
   throw std::bad_alloc();
 #else
   __abort_message("bad_alloc was thrown in -fno-exceptions mode");
@@ -71,7 +71,7 @@ _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void* operator new(std
 }
 
 _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
-#ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#if !_LIBCPP_HAS_EXCEPTIONS
 #  if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t)>(&operator new)),
@@ -99,7 +99,7 @@ _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void* operator new[](s
 }
 
 _LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {
-#ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#if !_LIBCPP_HAS_EXCEPTIONS
 #  if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t)>(&operator new[])),
@@ -134,7 +134,7 @@ _LIBCPP_WEAK void operator delete[](void* ptr, const std::nothrow_t&) noexcept {
 
 _LIBCPP_WEAK void operator delete[](void* ptr, size_t) noexcept { ::operator delete[](ptr); }
 
-#if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
+#if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 
 static void* operator_new_aligned_impl(std::size_t size, std::align_val_t alignment) {
   if (size == 0)
@@ -165,7 +165,7 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC {
 }
 
 _LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
-#  ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if !_LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t, std::align_val_t)>(&operator new)),
@@ -194,7 +194,7 @@ operator new[](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC {
 }
 
 _LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
-#  ifdef _LIBCPP_HAS_NO_EXCEPTIONS
+#  if !_LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
       !std::__is_function_overridden(static_cast<void* (*)(std::size_t, std::align_val_t)>(&operator new[])),
@@ -240,5 +240,5 @@ _LIBCPP_WEAK void operator delete[](void* ptr, size_t, std::align_val_t alignmen
   ::operator delete[](ptr, alignment);
 }
 
-#endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
+#endif // _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 // ------------------ END COPY ------------------
diff --git a/yass/tools/build.go b/yass/tools/build.go
index 339e649f9e..a2044f9caa 100644
--- a/yass/tools/build.go
+++ b/yass/tools/build.go
@@ -88,16 +88,11 @@ var variantFlag string
 var mingwDir string
 var mingwAllowXpFlag bool
 
-var androidAppAbi string
-var androidAbiTarget string
 var androidApiLevel int
 
 var androidSdkDir string
 var androidNdkVer string
 
-var harmonyAppAbi string
-var harmonyAbiTarget string
-
 var harmonyNdkDir string
 
 func getAppName() string {
@@ -112,6 +107,11 @@ func getAppName() string {
 			return "lib" + APPNAME + ".so"
 		}
 		return APPNAME
+	} else if systemNameFlag == "harmony" {
+		if APPNAME == "yass" {
+			return "lib" + APPNAME + ".so"
+		}
+		return APPNAME
 	} else {
 		return APPNAME
 	}
@@ -206,7 +206,7 @@ func InitFlag() {
 	flag.StringVar(&androidSdkDir, "android-sdk-dir", getEnv("ANDROID_SDK_ROOT", ""), "Android SDK Home Path")
 	flag.StringVar(&androidNdkVer, "android-ndk-ver", getEnv("ANDROID_NDK_VER", "26.3.11579264"), "Android NDK Version")
 
-	flag.StringVar(&harmonyNdkDir, "harmony-ndk-dir", getEnv("HARMONY_NDK_ROOT", ""), "OpenHarmony NDK Home Path")
+	flag.StringVar(&harmonyNdkDir, "harmony-ndk-dir", getEnv("HARMONY_NDK_ROOT", ""), "OpenHarmony NDK (toolchain) Path")
 
 	flag.Parse()
 
@@ -1042,7 +1042,7 @@ func buildStageGenerateBuildScript() {
 			glog.Fatalf("Android Ndk Directory at %s demanded", NdkDir)
 		}
 		glog.Infof("Using android ndk dir %s", NdkDir)
-		androidAbiTarget, androidAppAbi = getAndroidTargetAndAppAbi(archFlag)
+		androidAbiTarget, androidAppAbi := getAndroidTargetAndAppAbi(archFlag)
 		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DCMAKE_TOOLCHAIN_FILE=%s/../cmake/platforms/Android.cmake", buildDir))
 		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DANDROID_ABI=%s", androidAppAbi))
 		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DANDROID_ABI_TARGET=%s", androidAbiTarget))
@@ -1060,13 +1060,12 @@ func buildStageGenerateBuildScript() {
 
 	if systemNameFlag == "harmony" {
 		cmakeArgs = append(cmakeArgs, "-DUSE_BUILTIN_CA_BUNDLE_CRT=off")
-		if harmonyNdkDir == "" {
-			glog.Fatalf("Harmony Ndk Directory demanded")
+		if _, err := os.Stat(harmonyNdkDir); errors.Is(err, os.ErrNotExist) {
+			glog.Fatalf("Harmony Ndk Directory at %s demanded", harmonyNdkDir)
 		}
-		harmonyAbiTarget, harmonyAppAbi = getHarmonyTargetAndAppAbi(archFlag)
+		glog.Infof("Using harmony ndk dir %s", harmonyNdkDir)
+		_, harmonyAppAbi := getHarmonyTargetAndAppAbi(archFlag)
 		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DCMAKE_TOOLCHAIN_FILE=%s/../cmake/platforms/Harmony.cmake", buildDir))
-		// hard-coded
-		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DOHOS_APILEVEL=%s", "9"))
 		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DOHOS_ARCH=%s", harmonyAppAbi))
 
 		cmakeArgs = append(cmakeArgs, fmt.Sprintf("-DOHOS_SDK_NATIVE=%s/native", harmonyNdkDir))
@@ -1951,6 +1950,24 @@ func archiveFiles(output string, prefix string, paths []string) {
 	}
 }
 
+func signOrCopyHapFile(inFile string, outFile string) error {
+	hapSignTool := fmt.Sprintf("%s/toolchains/lib/hap-sign-tool.jar", harmonyNdkDir)
+	keyAlias := getEnv("HARMONY_SIGNING_KEY_ALIAS", "")
+	keyPwd := getEnv("HARMONY_SIGNING_KEY_PASSWORD", "")
+	appCertFile := getEnv("HARMONY_SIGNING_CERTFILE", "")
+	profileFile := getEnv("HARMONY_SIGNING_PROFILE", "")
+	keystoreFile := getEnv("HARMONY_SIGNING_STORE_PATH", "")
+	keystorePwd := getEnv("HARMONY_SIGNING_STORE_PASSWORD", "")
+
+	if len(appCertFile) != 0 && len(profileFile) != 0 {
+		cmdRun([]string{
+			"java", "-jar", hapSignTool, "sign-app", "-keyAlias", keyAlias, "-signAlg", "SHA256withECDSA", "-mode", "localSign", "-appCertFile", appCertFile, "-profileFile", profileFile, "-inFile", inFile, "-keystoreFile", keystoreFile, "-outFile", outFile, "-keyPwd", keyPwd, "-keystorePwd", keystorePwd, "-signCode", "1"}, true)
+	} else {
+		return os.Rename(inFile, outFile)
+	}
+	return nil
+}
+
 func archiveMainFile(output string, prefix string, paths []string, dllPaths []string) {
 	if systemNameFlag == "darwin" {
 		var eulaRtf []byte
@@ -2066,6 +2083,35 @@ func archiveMainFile(output string, prefix string, paths []string, dllPaths []st
 		if err != nil {
 			glog.Fatalf("%v", err)
 		}
+	} else if systemNameFlag == "harmony" && variantFlag == "gui" {
+		harmonyDir := "../harmony"
+		err := os.Chdir(harmonyDir)
+		if err != nil {
+			glog.Fatalf("%v", err)
+		}
+		var build_type string
+		if cmakeBuildTypeFlag == "Release" || cmakeBuildTypeFlag == "MinSizeRel" {
+			build_type = "release"
+		} else {
+			build_type = "debug"
+		}
+		cmdRun([]string{"hvigorw", "clean", "--no-daemon"}, true)
+		cmdRun([]string{"rm", "-rf", "entry/libs"}, true)
+		_, abi := getHarmonyTargetAndAppAbi(archFlag)
+		cmdRun([]string{"mkdir", "-p", fmt.Sprintf("entry/libs/%s", abi)}, true)
+		cmdRun([]string{"cp", "-fv", fmt.Sprintf("../build-harmony-%s/libyass.so", archFlag), fmt.Sprintf("entry/libs/%s/", abi)}, true)
+
+		cmdRun([]string{"hvigorw", "assembleHap", "--mode", "module",
+			"-p", "product=default", "-p", fmt.Sprintf("buildMode=%s", build_type), "--no-daemon"}, true)
+		// optional signning step
+		err = signOrCopyHapFile("./entry/build/default/outputs/default/entry-default-unsigned.hap", output)
+		if err != nil {
+			glog.Fatalf("%v", err)
+		}
+		err = os.Chdir(buildDir)
+		if err != nil {
+			glog.Fatalf("%v", err)
+		}
 	} else {
 		paths = append(paths, dllPaths...)
 		archiveFiles(output, prefix, paths)
@@ -2247,6 +2293,9 @@ func postStateArchives() map[string][]string {
 	if systemNameFlag == "ios" {
 		archive = fmt.Sprintf(archiveFormat, APPNAME, "", ".ipa")
 	}
+	if systemNameFlag == "harmony" {
+		archive = fmt.Sprintf(archiveFormat, APPNAME, "", ".hap")
+	}
 	hasCrashpadExe := true
 	if _, err := os.Stat("crashpad_handler.exe"); errors.Is(err, os.ErrNotExist) {
 		hasCrashpadExe = false
@@ -2380,7 +2429,7 @@ func get7zPath() string {
 func inspectArchive(file string, files []string) {
 	if strings.HasSuffix(file, ".dmg") {
 		cmdRun([]string{"hdiutil", "imageinfo", file}, false)
-	} else if strings.HasSuffix(file, ".zip") || strings.HasSuffix(file, ".msi") || strings.HasSuffix(file, ".exe") || strings.HasSuffix(file, ".apk") || strings.HasSuffix(file, ".ipa") {
+	} else if strings.HasSuffix(file, ".zip") || strings.HasSuffix(file, ".msi") || strings.HasSuffix(file, ".exe") || strings.HasSuffix(file, ".apk") || strings.HasSuffix(file, ".ipa") || strings.HasSuffix(file, ".hap") {
 		p7z := get7zPath()
 		cmdRun([]string{p7z, "l", file}, false)
 		if strings.HasSuffix(file, ".apk") {