Remove old command

Inherit PATH from environment in Actions
Remove build cache of the msys2 installation in Travis CI.
2025-10-28 20:32:42 +00:00 · 2020-09-18 14:38:53 +08:00 · 2020-09-18 14:29:49 +08:00 · 2020-09-18 14:17:50 +08:00 · 2020-09-18 13:56:49 +08:00 · 2020-09-18 13:43:07 +08:00
410 changed files with 33486 additions and 80702 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,82 +0,0 @@
-name: Bug 反馈
-description: 功能运行不正常 / 失效
-title: "[BUG] <title>"
-body:
-  - type: markdown
-    attributes:
-      value: |
-         遇到问题请先尝试使用[Action](https://github.com/tindy2013/subconverter/actions)中的最新版本
-         如果是使用公共转换服务中遇到的问题，请先联系服务的提供者。
-  - type: checkboxes
-    id: version-check
-    attributes:
-      label: 确认版本最新
-      description: 对于您遇到的BUG，是否尝试在最新Action编译的版本中复现？
-      options:
-      - label: 我已经确认在最新Action编译的版本中复现
-        required: true
-  - type: checkboxes
-    id: issue-check
-    attributes:
-      label: 检索issue
-      description: 对于您遇到的BUG，是否已经确认之前没有其他issue涉及？
-      options:
-      - label: 我已经确认之前没有issue涉及此BUG
-        required: true
-  - type: input
-    id: subconverter-version
-    attributes:
-      label: subconverter版本
-      description: subconverter版本
-      placeholder: 请输入详细的版本号
-    validations:
-      required: true
-  - type: input
-    id: convert
-    attributes:
-      label: 转换过程
-      description: BUG发生在什么配置转换为什么配置的过程中？
-      placeholder: 请输入“xxx转换为xxx配置”
-    validations:
-      required: true
-  - type: textarea
-    id: config
-    attributes:
-      label: 转换设置
-      description: 转换时使用的subconverter配置文件或外部配置链接
-      placeholder: 请输入
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: 复现步骤
-      description: BUG的详细复现步骤
-      placeholder: 请输入
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: 期望结果
-      description: 您期望的结果是？
-      placeholder: 请输入
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: 实际结果
-      description: 实际得到的结果是？
-      placeholder: 请输入
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: 错误信息
-      description: subconverter转换时的日志/信息输出
-      render: shell
-      placeholder: 请输入
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 阅读文档
-    url: https://github.com/tindy2013/subconverter/blob/master/README-cn.md
-    about: 建议您发布issue前先仔细阅读项目文档
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,30 +0,0 @@
-name: 建议新功能
-description: 建议此项目增加的功能
-title: "[Feature] <title>"
-body:
-  - type: checkboxes
-    id: ensure
-    attributes:
-      label: verify
-      description: 在提交之前，请确认完成以下选项
-      options:
-      - label: 我已经仔细阅读[项目文档](https://github.com/tindy2013/subconverter/blob/master/README-cn.md)，确认现有功能无法解决我的需求
-        required: true
-      - label: 我已经检索过现有[issue](https://github.com/tindy2013/subconverter/issues)，确认与现有issue的内容并不重复
-        required: true
-      - label: 我已经尝试自行解决，确认自己没有能力解决
-        required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: 功能描述
-      description: 请详细、清晰地表达你要提出的论述，例如这个问题如何影响到你？你想实现什么功能？目前 subconverter 的行为是什么？
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: 可能的解决方案
-      description: 您期望的解决方案，可能的实现方法或者可供参考的示例
-    validations:
-      required: false
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,144 +1,45 @@
 name: GitHub CI
-on: 
-  push:
-    branches: [ master ]
-    tags:
-      - '**'
-  workflow_dispatch:
-  pull_request:
-
-concurrency: 
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
+on: [push]

 jobs:
  linux32_build:
    name: Linux x86 Build
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
+    - uses: actions/checkout@v2
    - name: Build
-      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:x86-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:x86-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
    - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v1
      with:
        name: subconverter_linux32
        path: subconverter/
-    - name: Package Release
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      run: tar czf subconverter_linux32.tar.gz subconverter
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      with:
-        files: subconverter_linux32.tar.gz
-        draft: true

  linux64_build:
    name: Linux x86_64 Build
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
+    - uses: actions/checkout@v2
    - name: Build
-      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:amd64-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:amd64-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
    - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v1
      with:
        name: subconverter_linux64
        path: subconverter/
-    - name: Package Release
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      run: tar czf subconverter_linux64.tar.gz subconverter
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      with:
-        files: subconverter_linux64.tar.gz
-        draft: true
-
-#  armv7_build:
-#    name: Linux armv7 Build
-#    runs-on: [self-hosted, linux, ARM]
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Add commit id into version
-#      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-#      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
-#    - name: Build
-#      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:armv7-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
-#    - name: Upload
-#      uses: actions/upload-artifact@v3
-#      with:
-#        name: subconverter_armv7
-#        path: subconverter/
-#    - name: Package Release
-#      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-#      run: tar czf subconverter_armv7.tar.gz subconverter
-#    - name: Draft Release
-#      uses: softprops/action-gh-release@v1
-#      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-#      with:
-#        files: subconverter_armv7.tar.gz
-#        draft: true
-#
-#  aarch64_build:
-#    name: Linux aarch64 Build
-#    runs-on: [self-hosted, linux, ARM64]
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Add commit id into version
-#      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-#      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
-#    - name: Build
-#      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:aarch64-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
-#    - name: Upload
-#      uses: actions/upload-artifact@v3
-#      with:
-#        name: subconverter_aarch64
-#        path: subconverter/
-#    - name: Package Release
-#      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-#      run: tar czf subconverter_aarch64.tar.gz subconverter
-#    - name: Draft Release
-#      uses: softprops/action-gh-release@v1
-#      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-#      with:
-#        files: subconverter_aarch64.tar.gz
-#        draft: true

  macos_build:
    name: macOS Build
    runs-on: macos-latest
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.11'
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i -e 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
+    - uses: actions/checkout@v2
    - name: Build
      run: bash scripts/build.macos.release.sh
    - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v1
      with:
        name: subconverter_darwin64
        path: subconverter/
-    - name: Package Release
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      run: tar czf subconverter_darwin64.tar.gz subconverter
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      with:
-        files: subconverter_darwin64.tar.gz
-        draft: true

  windows64_build:
    name: Windows x86_64 Build
@@ -147,38 +48,23 @@ jobs:
      run:
        shell: msys2 {0}
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
      with:
-        python-version: '3.11'
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '16'
+        node-version: '12'
    - uses: msys2/setup-msys2@v2
      with:
        update: true
-        install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-pcre2 patch
+        install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2
        msystem: MINGW64
        path-type: inherit
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
    - name: Build
      run: bash scripts/build.windows.release.sh
    - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v1
      with:
        name: subconverter_win64
        path: subconverter/
-    - name: Package Release
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      run: 7z a subconverter_win64.7z subconverter/
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      with:
-        files: subconverter_win64.7z
-        draft: true

  windows32_build:
    name: Windows x86 Build
@@ -187,35 +73,20 @@ jobs:
      run:
        shell: msys2 {0}
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
      with:
-        python-version: '3.11'
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '16'
+        node-version: '12'
    - uses: msys2/setup-msys2@v2
      with:
        update: true
-        install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-pcre2 patch
+        install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2
        msystem: MINGW32
        path-type: inherit
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
    - name: Build
      run: bash scripts/build.windows.release.sh
    - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v1
      with:
        name: subconverter_win32
        path: subconverter/
-    - name: Package Release
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      run: 7z a subconverter_win32.7z subconverter/
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
-      with:
-        files: subconverter_win32.7z
-        draft: true
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,336 +1,47 @@
 name: Publish Docker Image
-on: 
-  push:
-    branches: [ master ]
-    tags:
-      - '**'
-
-concurrency: 
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
+on: [push]

 jobs:
-  amd64_build:
-    name: Build AMD64 Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and export
-        id: build
-        if: github.ref == 'refs/heads/master'
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/amd64
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:latest
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-          outputs: type=image,push=true
-
-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Build release and export
-        id: build_rel
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/amd64
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
-          outputs: type=image,push=true
-
-      - name: Save digest
-        if: github.ref == 'refs/heads/master'
-        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-
-      - name: Save release digest
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: digest_amd64
-          path: /tmp/digest.txt
-
-  x86_build:
-    name: Build x86 Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and export
-        id: build
-        if: github.ref == 'refs/heads/master'
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/386
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:latest-x86
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-          outputs: type=image,push=true
-
-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Build release and export
-        id: build_rel
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/386
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}-x86
-          outputs: type=image,push=true
-
-      - name: Save digest
-        if: github.ref == 'refs/heads/master'
-        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-
-      - name: Save release digest
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: digest_386
-          path: /tmp/digest.txt
-
-#  armv7_build:
-#    name: Build ARMv7 Image
-#    runs-on: [self-hosted, linux, ARM]
-#    steps:
-#      - name: Checkout base
-#        uses: actions/checkout@v3
-#        with:
-#          fetch-depth: 0
-#
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v2
-#
-#      - name: Docker login
-#        uses: docker/login-action@v2
-#        with:
-#          username: ${{ secrets.DOCKER_USERNAME }}
-#          password: ${{ secrets.DOCKER_PASSWORD }}
-#
-#      - name: Get commit SHA
-#        id: vars
-#        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-#
-#      - name: Build and export
-#        id: build
-#        if: github.ref == 'refs/heads/master'
-#        uses: docker/build-push-action@v3
-#        with:
-#          platforms: linux/arm/v7
-#          context: scripts/
-#          tags: asdlokj1qpi23/subconverter:latest-armv7
-#          build-args: |
-#            SHA=${{ steps.vars.outputs.sha_short }}
-#            THREADS=4
-#          outputs: type=image,push=true
-#
-#      - name: Replace tag without `v`
-#        if: startsWith(github.ref, 'refs/tags/')
-#        uses: actions/github-script@v6
-#        id: version
-#        with:
-#          script: |
-#            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-#          result-encoding: string
-#
-#      - name: Build release and export
-#        id: build_rel
-#        if: startsWith(github.ref, 'refs/tags/')
-#        uses: docker/build-push-action@v3
-#        with:
-#          platforms: linux/arm/v7
-#          context: scripts/
-#          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}-armv7
-#          build-args: |
-#            THREADS=4
-#          outputs: type=image,push=true
-#
-#      - name: Save digest
-#        if: github.ref == 'refs/heads/master'
-#        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-#
-#      - name: Save release digest
-#        if: startsWith(github.ref, 'refs/tags/')
-#        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-#
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v3
-#        with:
-#          name: digest_armv7
-#          path: /tmp/digest.txt
-#
-#  arm64_build:
-#    name: Build ARM64 Image
-#    runs-on: [self-hosted, linux, ARM64]
-#    steps:
-#      - name: Checkout base
-#        uses: actions/checkout@v3
-#        with:
-#          fetch-depth: 0
-#
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v2
-#
-#      - name: Docker login
-#        uses: docker/login-action@v2
-#        with:
-#          username: ${{ secrets.DOCKER_USERNAME }}
-#          password: ${{ secrets.DOCKER_PASSWORD }}
-#
-#      - name: Get commit SHA
-#        id: vars
-#        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-#
-#      - name: Build and export
-#        id: build
-#        if: github.ref == 'refs/heads/master'
-#        uses: docker/build-push-action@v3
-#        with:
-#          platforms: linux/arm64
-#          context: scripts/
-#          tags: asdlokj1qpi23/subconverter:latest-arm64
-#          build-args: |
-#            SHA=${{ steps.vars.outputs.sha_short }}
-#            THREADS=4
-#          outputs: type=image,push=true
-#
-#      - name: Replace tag without `v`
-#        if: startsWith(github.ref, 'refs/tags/')
-#        uses: actions/github-script@v6
-#        id: version
-#        with:
-#          script: |
-#            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-#          result-encoding: string
-#
-#      - name: Build release and export
-#        id: build_rel
-#        if: startsWith(github.ref, 'refs/tags/')
-#        uses: docker/build-push-action@v3
-#        with:
-#          platforms: linux/arm64
-#          context: scripts/
-#          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}-arm64
-#          build-args: |
-#            THREADS=4
-#          outputs: type=image,push=true
-#
-#      - name: Save digest
-#        if: github.ref == 'refs/heads/master'
-#        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-#
-#      - name: Save release digest
-#        if: startsWith(github.ref, 'refs/tags/')
-#        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-#
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v3
-#        with:
-#          name: digest_arm64
-#          path: /tmp/digest.txt
-
  build:
    name: Build
-#    needs: [amd64_build, x86_build, armv7_build, arm64_build]
-    needs: [amd64_build, x86_build]
    runs-on: ubuntu-latest
    steps:
+
      - name: Checkout base
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          fetch-depth: 0

-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+      - name: Set up docker buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
        with:
-          config-inline: |
-            [worker.oci]
-              max-parallelism = 1
-
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          path: /tmp/images/
+          buildx-version: latest
+          qemu-version: latest

      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      
+      - name: Docker buildx image and push on master branch
+        if: github.ref == 'refs/heads/master'
+        run: |
+          docker buildx build --output "type=image,push=true" --platform=linux/amd64,linux/arm/v7,linux/arm64,linux/386 --tag tindy2013/subconverter:latest scripts/

      - name: Replace tag without `v`
        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
+        uses: actions/github-script@v1
        id: version
        with:
          script: |
            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
          result-encoding: string

-      - name: Merge and push manifest on master branch
-        if: github.ref == 'refs/heads/master'
-        run: python scripts/merge_manifest.py
-
-      - name: Merge and push manifest on release
+      - name: Docker buildx image and push on release
        if: startsWith(github.ref, 'refs/tags/')
-        run: python scripts/merge_manifest.py ${{steps.version.outputs.result}}
+        run: |
+          docker buildx build --output "type=image,push=true" --platform=linux/amd64,linux/arm/v7,linux/arm64,linux/386 --tag tindy2013/subconverter:${{steps.version.outputs.result}} scripts/
+          docker buildx build --output "type=image,push=true" --platform=linux/amd64,linux/arm/v7,linux/arm64,linux/386 --tag tindy2013/subconverter:latest scripts/
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
 subconverter.exe
 .vscode
-cmake-build-debug
-.idea
-base/cache
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,7 +93,7 @@ jobs:
         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
         export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
         export msys2+=" -msys2 -c "\"\$@"\" --"
-         $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2 patch
+         $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2
         taskkill //IM gpg-agent.exe //F
         export PATH=/C/tools/msys64/mingw64/bin:$PATH
         export MAKE=make
@@ -127,7 +127,7 @@ jobs:
         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
         export mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
         export msys2+=" -msys2 -c "\"\$@"\" --"
-         $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 patch
+         $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2
         taskkill //IM gpg-agent.exe //F
         export PATH=/C/tools/msys64/mingw64/bin:$PATH
         export MAKE=make
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,14 @@
-PROJECT(subconverter LANGUAGES CXX)
-SET(BUILD_TARGET_NAME ${PROJECT_NAME})
-CMAKE_MINIMUM_REQUIRED(VERSION 3.4)
+project(subconverter LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.4)
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include/")
-
 IF(NOT CMAKE_BUILD_TYPE)
    SET(CMAKE_BUILD_TYPE Release)
 ENDIF()
-SET(CMAKE_CXX_STANDARD 20)
+SET(CMAKE_CXX_STANDARD 17)

-IF(NOT MSVC)
+
+IF (NOT MSVC)
    ADD_COMPILE_OPTIONS(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result)
 ELSE()
    ADD_COMPILE_OPTIONS(/W4)
@@ -20,147 +19,85 @@ ENDIF()
 OPTION(USING_MALLOC_TRIM "Call malloc_trim after processing request to lower memory usage (Your system must support malloc_trim)." OFF)
 #now using internal MD5 calculation
 #OPTION(USING_MBEDTLS "Use mbedTLS instead of OpenSSL for MD5 calculation." OFF)
-OPTION(BUILD_STATIC_LIBRARY "Build a static library containing only the essential part." OFF)

 INCLUDE(CheckCXXSourceCompiles)
 CHECK_CXX_SOURCE_COMPILES(
 "
 #include<string>
-int main(){std::to_string(0);}
+void main(){std::to_string(0);}
 " HAVE_TO_STRING)

-IF(NOT BUILD_STATIC_LIBRARY)
+IF(HAVE_TO_STRING)
+    ADD_DEFINITIONS(-DHAVE_TO_STRING)
+ENDIF()

-ADD_EXECUTABLE(${BUILD_TARGET_NAME} 
-    src/generator/config/nodemanip.cpp
-    src/generator/config/ruleconvert.cpp
-    src/generator/config/subexport.cpp
-    src/generator/template/templates.cpp
-    src/handler/interfaces.cpp
-    src/handler/multithread.cpp
-    src/handler/upload.cpp
-    src/handler/webget.cpp
-    src/handler/settings.cpp
+IF(USING_MALLOC_TRIM)
+    ADD_DEFINITIONS(-DMALLOC_TRIM)
+ENDIF()
+
+ADD_EXECUTABLE(subconverter 
+    src/interfaces.cpp
+    src/logger.cpp
    src/main.cpp
-    src/parser/infoparser.cpp
-    src/parser/subparser.cpp
-    src/script/cron.cpp
-    src/script/script_quickjs.cpp
-#    src/server/webserver_libevent.cpp
-    src/server/webserver_httplib.cpp
-    src/utils/base64/base64.cpp
-    src/utils/codepage.cpp
-    src/utils/file.cpp
-    src/utils/logger.cpp
-    src/utils/md5/md5.cpp
-    src/utils/network.cpp
-    src/utils/regexp.cpp
-    src/utils/string.cpp
-    src/utils/system.cpp
-    src/utils/urlencode.cpp)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE src)
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR})
+    src/md5.cpp
+    src/misc.cpp
+    src/multithread.cpp
+    src/nodemanip.cpp
+    src/script.cpp
+    src/speedtestutil.cpp
+    src/subexport.cpp
+    src/templates.cpp
+    src/upload.cpp
+    src/webget.cpp
+    src/webserver_libevent.cpp)
+INCLUDE_DIRECTORIES(src)
+LINK_DIRECTORIES(${CMAKE_SOURCE_DIR})

 FIND_PACKAGE(PkgConfig REQUIRED)

 SET(THREADS_PREFER_PTHREAD_FLAG ON)
 FIND_PACKAGE(Threads REQUIRED)
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
+TARGET_LINK_LIBRARIES(subconverter ${CMAKE_THREAD_LIBS_INIT})

-#PKG_CHECK_MODULES(LIBEVENT libevent>=2.1.10 REQUIRED)
-#FIND_PATH(LIBEVENT_INCLUDE_DIR NAMES event.h PATHS ${LIBEVENT_INCLUDE_DIRS})
-#FIND_LIBRARY(LIBEVENT_LIBRARY NAMES event PATHS ${LIBEVENT_LIBRARY_DIRS})
-#TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${LIBEVENT_LIBRARY_DIRS})
-#TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${LIBEVENT_INCLUDE_DIR})
-#TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${LIBEVENT_LIBRARY})
+PKG_CHECK_MODULES(LIBEVENT libevent>=2.1.10 REQUIRED)
+FIND_PATH(LIBEVENT_INCLUDE_DIR NAMES event.h PATHS ${LIBEVENT_INCLUDE_DIRS})
+FIND_LIBRARY(LIBEVENT_LIBRARY NAMES event PATHS ${LIBEVENT_LIBRARY_DIRS})
+LINK_DIRECTORIES(${LIBEVENT_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(subconverter ${LIBEVENT_LIBRARY})

 FIND_PACKAGE(CURL 7.54.0 REQUIRED)
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${CURL_LIBRARY_DIRS})
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${CURL_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} CURL::libcurl)
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DCURL_STATICLIB)
+LINK_DIRECTORIES(${CURL_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(subconverter CURL::libcurl)
+ADD_DEFINITIONS(-DCURL_STATICLIB)

 FIND_PACKAGE(Rapidjson REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
-
-FIND_PACKAGE(toml11 REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${TOML11_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${RAPIDJSON_INCLUDE_DIRS})

 PKG_CHECK_MODULES(YAML_CPP yaml-cpp>=0.6.3 REQUIRED)
 FIND_LIBRARY(YAML_CPP_LIBRARY NAMES yaml-cpp yaml-cppd PATHS ${YAML_CPP_LIBRARY_DIRS})
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_LIBRARY_DIRS})
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${YAML_CPP_LIBRARY})
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DYAML_CPP_STATIC_DEFINE)
+LINK_DIRECTORIES(${YAML_CPP_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(subconverter ${YAML_CPP_LIBRARY})

-FIND_PACKAGE(PCRE2 REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${PCRE2_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${PCRE2_LIBRARY})
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DPCRE2_STATIC)
+#IF(USING_STD_REGEX STREQUAL "ON")
+#    ADD_DEFINITIONS(-DUSE_STD_REGEX)
+#ELSE()
+    FIND_PACKAGE(PCRE2 REQUIRED)
+    INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIRS})
+    TARGET_LINK_LIBRARIES(subconverter ${PCRE2_LIBRARY})
+    ADD_DEFINITIONS(-DPCRE2_STATIC)
+#ENDIF()

-FIND_PACKAGE(QuickJS REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${QUICKJS_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${QUICKJS_LIBRARIES})
-
-FIND_PACKAGE(LibCron REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${LIBCRON_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} ${LIBCRON_LIBRARIES})
+FIND_PACKAGE(Duktape REQUIRED)
+INCLUDE_DIRECTORIES(${DUKTAPE_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(subconverter ${DUKTAPE_LIBRARIES})

 IF(WIN32)
-    TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} wsock32 ws2_32)
+    TARGET_LINK_LIBRARIES(subconverter wsock32 ws2_32)
 ELSE()
    INCLUDE(GNUInstallDirs)
-    INSTALL(TARGETS ${BUILD_TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}/${BUILD_TARGET_NAME})
-    INSTALL(DIRECTORY base/ DESTINATION ${CMAKE_INSTALL_BINDIR}/${BUILD_TARGET_NAME} FILES_MATCHING PATTERN "*")
-ENDIF()
-
-ELSE() #BUILD_STATIC_LIBRARY
-
-ADD_LIBRARY(${BUILD_TARGET_NAME} STATIC
-    src/generator/config/ruleconvert.cpp
-    src/generator/config/subexport.cpp
-    src/generator/template/templates.cpp
-    src/lib/wrapper.cpp
-    src/parser/subparser.cpp
-    src/utils/base64/base64.cpp
-    src/utils/codepage.cpp
-    src/utils/logger.cpp
-    src/utils/md5/md5.cpp
-    src/utils/network.cpp
-    src/utils/regexp.cpp
-    src/utils/string.cpp
-    src/utils/urlencode.cpp)
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DNO_JS_RUNTIME -DNO_WEBGET)
-
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PUBLIC src)
-
-FIND_PACKAGE(Rapidjson REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
-
-FIND_PACKAGE(PkgConfig REQUIRED)
-
-PKG_CHECK_MODULES(YAML_CPP yaml-cpp>=0.6.3 REQUIRED)
-FIND_LIBRARY(YAML_CPP_LIBRARY NAMES yaml-cpp yaml-cppd PATHS ${YAML_CPP_LIBRARY_DIRS})
-TARGET_LINK_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_LIBRARY_DIRS})
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} PRIVATE ${YAML_CPP_LIBRARY})
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DYAML_CPP_STATIC_DEFINE)
-
-FIND_PACKAGE(PCRE2 REQUIRED)
-TARGET_INCLUDE_DIRECTORIES(${BUILD_TARGET_NAME} PRIVATE ${PCRE2_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} PRIVATE ${PCRE2_LIBRARY})
-TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DPCRE2_STATIC)
-
-IF(WIN32)
-    TARGET_LINK_LIBRARIES(${BUILD_TARGET_NAME} PRIVATE ws2_32)
-ENDIF()
-
-ENDIF() #BUILD_STATIC_LIBRARY
-
-IF(HAVE_TO_STRING)
-    TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DHAVE_TO_STRING)
-ENDIF()
-
-IF(USING_MALLOC_TRIM)
-    TARGET_COMPILE_DEFINITIONS(${BUILD_TARGET_NAME} PRIVATE -DMALLOC_TRIM)
+    INSTALL(TARGETS subconverter DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter)
+    INSTALL(DIRECTORY base/ DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter FILES_MATCHING PATTERN "*")
 ENDIF()
--- a/README-cn.md
+++ b/README-cn.md
--- a/README-docker.md
+++ b/README-docker.md
@@ -1,30 +1,20 @@
 # subconverter-docker

+This is a minimized image to run https://github.com/tindy2013/subconverter.
+
 For running this docker, simply use the following commands:
 ```bash
 # run the container detached, forward internal port 25500 to host port 25500
-docker run -d --restart=always -p 25500:25500 asdlokj1qpi23/subconverter:latest
+docker run -d --restart=always -p 25500:25500 tindy2013/subconverter:latest
 # then check its status
 curl http://localhost:25500/version
 # if you see `subconverter vx.x.x backend` then the container is up and running
 ```
-Or run in docker-compose:
-```yaml
---
-version: '3'
-services:
-  subconverter:
-    image: asdlokj1qpi23/subconverter:latest
-    container_name: subconverter
-    ports:
-      - "15051:25500"
-    restart: always
-```

 If you want to update `pref` configuration inside the docker, you can use the following command:
 ```bash
 # assume your configuration file name is `newpref.ini`
-curl -F "data=@newpref.ini" http://localhost:25500/updateconf?type=form\&token=password
+curl -F "@data=newpref.ini" http://localhost:25500/updateconf?type=form\&token=password
 # you may want to change this token in your configuration file
 ```

--- a/README.md
+++ b/README.md
@@ -2,66 +2,49 @@

 Utility to convert between various proxy subscription formats.

-[![Build Status](https://github.com/asdlokj1qpi23/subconverter/actions/workflows/build.yml/badge.svg)](https://github.com/asdlokj1qpi23/subconverter/actions)
-[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/asdlokj1qpi23/subconverter.svg)](https://github.com/asdlokj1qpi23/subconverter/tags)
-[![GitHub release](https://img.shields.io/github/release/asdlokj1qpi23/subconverter.svg)](https://github.com/asdlokj1qpi23/subconverter/releases)
-[![GitHub license](https://img.shields.io/github/license/asdlokj1qpi23/subconverter.svg)](https://github.com/tindy2013/subconverter/blob/master/LICENSE)
+[![Build Status](https://travis-ci.com/tindy2013/subconverter.svg?branch=master)](https://travis-ci.com/tindy2013/subconverter)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/tags)
+[![GitHub release](https://img.shields.io/github/release/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/releases)
+[![GitHub license](https://img.shields.io/github/license/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/blob/master/LICENSE)

-[Docker README](https://github.com/asdlokj1qpi23/subconverter/blob/master/README-docker.md)
+[Docker README](https://github.com/tindy2013/subconverter/blob/master/README-docker.md)

-[中文文档](https://github.com/asdlokj1qpi23/subconverter/blob/master/README-cn.md)
+[中文文档](https://github.com/tindy2013/subconverter/blob/master/README-cn.md)

 - [subconverter](#subconverter)
-  - [Docker](#docker)
  - [Supported Types](#supported-types)
  - [Quick Usage](#quick-usage)
    - [Access Interface](#access-interface)
    - [Description](#description)
+    - [Quick Conversion](#quick-conversion)
  - [Advanced Usage](#advanced-usage)
+    - [Read Before Continue](#read-before-continue)
+    - [Advanced Details](#advanced-details)
+    - [Profiles](#profiles)
+    - [Configuration File](#configuration-file)
+    - [External Configuration File](#external-configuration-file)
  - [Auto Upload](#auto-upload)
-  
-## Docker

-For running this docker, simply use the following commands:
-```bash
-# run the container detached, forward internal port 25500 to host port 25500
-docker run -d --restart=always -p 25500:25500 asdlokj1qpi23/subconverter:latest
-# then check its status
-curl http://localhost:25500/version
-# if you see `subconverter vx.x.x backend` then the container is up and running
-```
-Or run in docker-compose:
-```yaml
---
-version: '3'
-services:
-  subconverter:
-    image: asdlokj1qpi23/subconverter:latest
-    container_name: subconverter
-    ports:
-      - "15051:25500"
-    restart: always
-```
 ## Supported Types

-| Type                              | As Source | As Target    | Target Name    |
-|-----------------------------------|:---------:| :----------: |----------------|
-| Clash                             |     ✓     |      ✓       | clash          |
-| ClashR                            |     ✓     |      ✓       | clashr         |
-| Quantumult                        |     ✓     |      ✓       | quan           |
-| Quantumult X                      |     ✓     |      ✓       | quanx          |
-| Loon                              |     ✓     |      ✓       | loon           |
-| SS (SIP002)                       |     ✓     |      ✓       | ss             |
-| SS Android                        |     ✓     |      ✓       | sssub          |
-| SSD                               |     ✓     |      ✓       | ssd            |
-| SSR                               |     ✓     |      ✓       | ssr            |
-| Surfboard                         |     ✓     |      ✓       | surfboard      |
-| Surge 2                           |     ✓     |      ✓       | surge&ver=2    |
-| Surge 3                           |     ✓     |      ✓       | surge&ver=3    |
-| Surge 4                           |     ✓     |      ✓       | surge&ver=4    |
-| V2Ray                             |     ✓     |      ✓       | v2ray          |
-| Telegram-liked HTTP/Socks 5 links |     ✓     |      ×       | Only as source |
-| Singbox                           |     ×      |      ✓       | singbox        |
+| Type         | As Source  | As Target    | Target Name |
+| ------------ | :--------: | :----------: | ----------- |
+| Clash        |     ✓      |      ✓       | clash       |
+| ClashR       |     ✓      |      ✓       | clashr      |
+| Quantumult   |     ✓      |      ✓       | quan        |
+| Quantumult X |     ✓      |      ✓       | quanx       |
+| Loon         |     ✓      |      ✓       | loon        |
+| SS (SIP002)  |     ✓      |      ✓       | ss          |
+| SS Android   |     ✓      |      ✓       | sssub       |
+| SSD          |     ✓      |      ✓       | ssd         |
+| SSR          |     ✓      |      ✓       | ssr         |
+| Surfboard    |     ✓      |      ✓       | surfboard   |
+| Surge 2      |     ✓      |      ✓       | surge&ver=2 |
+| Surge 3      |     ✓      |      ✓       | surge&ver=3 |
+| Surge 4      |     ✓      |      ✓       | surge&ver=4 |
+| V2Ray        |     ✓      |      ✓       | v2ray       |
+| Telegram-liked HTTP/Socks 5 links |     ✓      |      ×       | Only as source |
+
 Notice:

 1. Shadowrocket users should use `ss`, `ssr` or `v2ray` as target.
@@ -87,13 +70,13 @@ http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&config=%CONFIG%

 ### Description

-| Argument | Required | Example | Description |
-| -------- | :------: | :------ | ----------- |
-| target   | Yes      | clash   | Target subscription type. Acquire from Target Name in [Supported Types](#supported-types). |
-| url      | Yes      | https%3A%2F%2Fwww.xxx.com | Subscription to convert. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. |
-| config   | No       | https%3A%2F%2Fwww.xxx.com | External configuration file path. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. More examples can be found in [this](https://github.com/lzdnico/subconverteriniexample) repository. |
+| Argument | Needed | Example | Explanation |
+| -------  | :----: | :------ | ----------- |
+| target   | Yes    | clash   | Target subscription type. Acquire from Target Name in [Supported Types](#Supported_Types). |
+| url      | Yes    | https%3A%2F%2Fwww.xxx.com | Subscription to convert. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. |
+| config   | No     | https%3A%2F%2Fwww.xxx.com | External configuration file path. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. More examples can be found in [this](https://github.com/lzdnico/subconverteriniexample) repository. Default is to load configurations from `pref.ini`. |

-If you need to merge two or more subscription, you should join them with '|' before the URLEncode process.
+If you need to merge two or more subscription, you should connect them with '|' before the URLEncode process.

 Example:

@@ -114,11 +97,142 @@ http://127.0.0.1:25500/sub?target=clash&url=https%3A%2F%2Fdler.cloud%2Fsubscribe
 Finally subscribe this link in Clash and you are done!
 ```

+### Quick Conversion
+
+When the Surge configuration file has already meet your requirements, but you also need a same Clash configuration with the same groups and rules, you can use the following method:
+
+```txt
+http://127.0.0.1:25500/surge2clash?link=url_to_Surge_subscription
+```
+
+Here `url_to_Surge_subscription` **does not need to be URLEncoded** and no other configuration is needed.
+
 ---

 ## Advanced Usage

-Please refer to [中文文档](https://github.com/asdlokj1qpi23/subconverter/blob/master/README-cn.md#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95).
+> If you are not satisfied with the default groups and rulesets, you can try out advanced usage.
+> Customize more settings in Access Interface and `pref.ini` to satisfy various needs.
+
+### Read Before Continue
+
+It is strongly recommended to read the following articles before continuing:
+
+1. Related to `pref.ini`: [INI file](https://en.wikipedia.org/wiki/INI_file)
+1. Related to `Clash` configurations: [YAML Syntax](https://en.wikipedia.org/wiki/YAML#Syntax)
+1. Often needed: [Learn Regular Expression](https://github.com/ziishaned/learn-regex/blob/master/README.md)
+1. When you want to write an ISSUE: [How To Ask Questions The Smart Way](http://www.catb.org/~esr/faqs/smart-questions.html)
+
+Subconverter only guaranteed to work with default configurations.
+
+### Advanced Details
+
+#### Access Interface
+
+```txt
+http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&emoji=%EMOJI%····
+```
+
+#### Description
+
+| Argument | Needed  | Example | Explanation |
+| -------- | :----:  | :--------------- | :------------------------ |
+| target   |  Yes    | quan    | Target subscription type. Acquire from Target Name in [Supported Types](#Supported_Types). |
+| url      |  No     | https%3A%2F%2Fwww.xxx.com | Subscription to convert. Supports URLs, data URIs, and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. **Not needed ONLY WHEN YOU HAVE SET `default_urls` IN `pref.ini`. |
+| config   |  No     | https%3A%2F%2Fwww.xxx.com | External configuration file path. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. More examples can be found in [this](https://github.com/lzdnico/subconverteriniexample) repository. Default is to load configurations from `pref.ini`. |
+| upload   |  No     | true / false  | Upload generated configuration to `Gist repository`. `gistconf.ini` must be filled before uploading. Default is `false`. |
+| upload_path |  No     | MySS.yaml  | File name when uploaded to `Gist`. Process with [URLEncode](https://www.urlencoder.org/) first.    |
+| emoji    |  No     | true / false  | Adding Emoji to node remarks. Default is `true`.  |
+| group    |  No     | MySS  | Set a custom group for generated configuration. Often needed in SSD/SSR subscription.  |
+| tfo      |  No     | true / false  | Enable TCP Fast Open for all nodes. Default is `false`.  |
+| udp      |  No     | true / false  | Enable UDP for all nodes. Default is `false`.  |
+| scv      |  No     | true / false  | Enable Skip Cert Verify for all nodes. Default is `false`.  |
+| list     |  No     | true / false  | Generate Surge Node List or Clash Proxy Provider. Default is `false`.  |
+| sort     |  No     | true / false  | Sort nodes in alphabetical order. Default is `false`.  |
+| include  |  No     | See `include_remarks`  | Exclude nodes which remarks match the following patterns. Supports regular expression. Process with [URLEncode](https://www.urlencoder.org/) first. **WILL OVERRIDE THE SAME SETTING IN `pref.ini`**  |
+| exclude  |  No     | See `exclude_remarks`  | Only include nodes which remarks match the following patterns. Supports regular expression. Process with [URLEncode](https://www.urlencoder.org/) first. **WILL OVERRIDE THE SAME SETTING IN `pref.ini`**  |
+| filename |  No     | MySS  | Set the file name while downloading. Can be used as a profile name in Clash for Windows.  |
+
+Example: 
+
+```txt
+You have the following subscription: `https://dler.cloud/subscribe/ABCDE?clash=vmess`, and you want to convert it to Surge 4 subscription, set UDP and TFO to enabled,
+add Emoji to node remarks and filter out unused nodes named "剩余流量：1024G" and "官网地址：dler.cloud".
+
+First find all needed arguments: 
+target=surge, ver=4,  tfo=true, udp=true, emoji=true, exclude=(流量|官网)
+url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+
+Then process any argument that requires URLEncode: 
+exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29
+url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+Then merge everything into a single URL: 
+http://127.0.0.1:25500/sub?surge&ver=4&tfo=true&udp=true&emoji=true&exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+Finally subscribe this link in Surge and you are done!
+```
+
+### Profiles
+
+> After preparing all the arguments for the subscription link, it may be too long and hard to remember. Now you can consider setting up a profile.
+
+For now **only local profiles are allowed.**
+
+#### Interface for Profiles
+
+```txt
+http://127.0.0.1:25500/getprofile?name=%NAME%&token=%TOKEN%
+```
+
+#### Description
+
+| Argument | Needed | Example  | Explanation   |
+| -------- | :----: | :--------------- | :------------------------ |
+| name |  Yes  | profiles/formyairport.ini  | The path to the profile. (relative to the `pref` configuration)   |
+| token |  Yes  | passwd | The access token for authorization. (Please check `api_access_token` in the `[common] section` in `pref` configuration.  |
+
+Notice that arguments in the profile **does not require URLEncode**.
+
+Create a new text file **only in the same directory or a sub-directory** of the `pref` configuration (a sub-directory named `profiles` is recommended) and name it, for example `formyairport.ini`, then fill the arguments to the file according to the [example profile](https://github.com/tindy2013/subconverter/blob/master/base/profiles/example_profile.ini), then you are good to go.
+
+<details>
+<summary>Example:</summary>
+  
+Using the same example in [Advanced Usage](#advanced-usage), the content of `formyairport.ini` should be:
+
+ ```txt
+[Profile]
+url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+target=surge
+surge_ver=4
+tfo=true
+udp=true
+emoji=true
+exclude=(流量|官网)
+ ```
+
+After saving it to the `profile` directory, you can access `http://127.0.0.1:25500/getprofile?name=profiles/formyairport.ini&token=passwd` to read this profile.
+</details>
+
+### Configuration File
+
+> Check comments inside [pref.ini](https://github.com/tindy2013/subconverter/blob/master/base/pref.ini) for more information.
+
+### External Configuration File
+
+> Most settings works the same as the ones with the same name inside `pref.ini`, you can check [the example configuration file](https://github.com/tindy2013/subconverter/blob/master/base/config/example_external_config.ini) and comments inside [pref.ini](https://github.com/tindy2013/subconverter/blob/master/base/pref.ini) for more information.
+
+Any setting defined in the external configuration file will **override** the ones from `pref.ini`.
+
+For example, if you have the following lines inside the external configuration file:
+
+```
+emoji=(流量|时间|应急),🏳️‍🌈
+emoji=阿根廷,🇦🇷
+```
+
+Then instead of the Emojis defined in `pref.ini`, the program will only use the newly defined ones.

 ## Auto Upload

@@ -133,6 +247,3 @@ Example:
 ;uncomment the following line and enter your token to enable upload function
 token = xxxxxxxxxxxxxxxxxxxxxxxx(Your Personal Access Token)
 ```
-## Thanks
-[tindy2013](https://github.com/tindy2013)
-[https://github.com/tindy2013/subconverter](https://github.com/tindy2013/subconverter)
--- a/base/base/all_base.tpl
+++ b/base/base/all_base.tpl
@@ -8,8 +8,8 @@ log-level: {{ default(global.clash.log_level, "info") }}
 external-controller: :9090
 {% if default(request.clash.dns, "") == "1" %}
 dns:
-  enable: true
-  listen: :1053
+  enabled: true
+  listen: 1053
 {% endif %}
 {% if local.clash.new_field_name == "true" %}
 proxies: ~
@@ -39,98 +39,35 @@ http-request https?:\/\/.*\.iqiyi\.com\/.*authcookie= script-path=https://raw.gi
 {% if request.target == "loon" %}

 [General]
-# IPV6 启动与否
-ipv6 = false
-# udp 类的 dns 服务器，用,隔开多个服务器，system 表示系统 dns
-dns-server = 119.29.29.29, 223.5.5.5
-# DNS over HTTPS服务器，用,隔开多个服务器
-doh-server = https://223.5.5.5/resolve, https://sm2.doh.pub/dns-query
-# 是否开启局域网代理访问
-allow-wifi-access = false
-# 开启局域网访问后的 http 代理端口
-wifi-access-http-port = 7222
-# 开启局域网访问后的 socks5 代理端口
-wifi-access-socks5-port = 7221
-# 测速所用的测试链接，如果策略组没有自定义测试链接就会使用这里配置的
-proxy-test-url = http://connectivitycheck.gstatic.com
-# 节点测速时的超时秒数
-test-timeout = 2
-# 指定流量使用哪个网络接口进行转发
-interface-mode = auto
-sni-sniffing = true
-# 禁用 stun 是否禁用 stun 协议的 udp 数据，禁用后可以有效解决 webrtc 的 ip 泄露
-disable-stun = true
-# 策略改变时候打断连接
-disconnect-on-policy-change = true
-# 一个节点连接失败几次后会进行节点切换，默认 3 次
-switch-node-after-failure-times = 3
-# 订阅资源解析器链接
-resource-parser = https://gitlab.com/lodepuly/vpn_tool/-/raw/main/Resource/Script/Sub-Store/sub-store-parser_for_loon.js
-# 自定义 geoip 数据库的 url
-geoip-url = https://gitlab.com/Masaiki/GeoIP2-CN/-/raw/release/Country.mmdb
-# 配置了该参数，那么所配置的这些IP段、域名将不会转发到Loon，而是由系统处理
-skip-proxy = 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, localhost, *.local, captive.apple.com, e.crashlynatics.com
-# 配置了该参数，那么所配置的这些IP段、域名就会不交给Loon来处理，系统直接处理
-bypass-tun = 10.0.0.0/8, 100.64.0.0/10, 127.0.0.0/8, 169.254.0.0/16, 172.16.0.0/12, 192.0.0.0/24, 192.0.2.0/24, 192.88.99.0/24, 192.168.0.0/16, 198.51.100.0/24, 203.0.113.0/24, 224.0.0.0/4, 239.255.255.250/32, 255.255.255.255/32
-# 当切换到某一特定的WiFi下时改变Loon的流量模式，如"loon-wifi5g":DIRECT，表示在loon-wifi5g这个wifi网络下使用直连模式，"cellular":PROXY，表示在蜂窝网络下使用代理模式，"default":RULE，默认使用分流模式
-ssid-trigger = "Ccccccc":DIRECT,"cellular":RULE,"default":RULE
+skip-proxy = 192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,e.crashlynatics.com
+bypass-tun = 10.0.0.0/8,100.64.0.0/10,127.0.0.0/8,169.254.0.0/16,172.16.0.0/12,192.0.0.0/24,192.0.2.0/24,192.88.99.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,224.0.0.0/4,255.255.255.255/32
+dns-server = system,119.29.29.29,223.5.5.5
+allow-udp-proxy = false
+host = 127.0.0.1

 [Proxy]

 [Remote Proxy]

-[Remote Filter]
-
 [Proxy Group]
-♻️ 自动选择=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Auto.png
-🔰 节点选择=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Proxy.png
-🌍 国外媒体=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/GlobalMedia.png
-🌏 国内媒体=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/DomesticMedia.png
-Ⓜ️ 微软服务=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Microsoft.png
-📲 电报信息=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Telegram.png
-🍎 苹果服务=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Apple.png
-🎯 全球直连=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Direct.png
-🛑 全球拦截=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Advertising.png
-🐟 漏网之鱼=select, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Final.png

 [Rule]

 [Remote Rule]

-[Rewrite]
+[URL Rewrite]
+enable = true
+^https?:\/\/(www.)?(g|google)\.cn https://www.google.com 302

-[Host]
-
-[Script]
-# 多看阅读  (By @chavyleung)
-# 我的 > 签到任务 等到提示获取 Cookie 成功即可
-http-request ^https:\/\/www\.duokan\.com\/checkin\/v0\/status script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/duokan/duokan.cookie.js, requires-body=true, tag=多看_cookie
-cron "16 9 * * *" script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/duokan/duokan.js, tag=多看阅读
-
-# 飞客茶馆  (By @chavyleung)
-# 打开 APP, 访问下个人中心
-http-request ^https:\/\/www\.flyertea\.com\/source\/plugin\/mobile\/mobile\.php\?module=getdata&.* script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/flyertea/flyertea.cookie.js, tag=飞客茶馆_cookie
-cron "17 9 * * * *" script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/flyertea/flyertea.js,tag=飞客茶馆
-
-# 10010  (By @chavyleung)
-# 打开 APP , 进入签到页面, 系统提示: 获取刷新链接: 成功
-# 然后手动签到 1 次, 系统提示: 获取Cookie: 成功 (每日签到)
-# 首页>天天抽奖, 系统提示 2 次: 获取Cookie: 成功 (登录抽奖) 和 获取Cookie: 成功 (抽奖次数)
-http-request ^https?:\/\/act.10010.com\/SigninApp\/signin\/querySigninActivity.htm script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/10010/10010.cookie.js, tag=中国联通_cookie1
-http-request ^https?:\/\/act.10010.com\/SigninApp(.*?)\/signin\/daySign script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/10010/10010.cookie.js, tag=中国联通_cookie2
-http-request ^https?:\/\/m.client.10010.com\/dailylottery\/static\/(textdl\/userLogin|active\/findActivityInfo) script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/10010/10010.cookie.js, tag=中国联通_cookie3
-cron "18 9 * * *" script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/10010/10010.js, tag=中国联通
-
-# 万达电影  (By @chavyleung)
-# 进入签到页面获取，网页端:https://act-m.wandacinemas.com/2005/17621a8caacc4d190dadd/
-http-request ^https:\/\/user-api-prd-mx\.wandafilm\.com script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/wanda/wanda.cookie.js, tag=万达电影_cookie
-cron "19 9 * * *" script-path=https://raw.githubusercontent.com/chavyleung/scripts/master/wanda/wanda.js, tag=万达电影
+[Remote Rewrite]
+https://raw.githubusercontent.com/Loon0x00/LoonExampleConfig/master/Rewrite/AutoRewrite_Example.list,auto

 [MITM]
-hostname = m.client.10010.com, act.10010.com, www.flyertea.com, www.duokan.com, tieba.baidu.com
-ca-p12 = MIIKGQIBAzCCCeMGCSqGSIb3DQEHAaCCCdQEggnQMIIJzDCCBBcGCSqGSIb3DQEHBqCCBAgwggQEAgEAMIID/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQImj1O53xwYioCAggAgIID0HZE8LBl4XFV6NulqdzN58vwAkhwiiES++WDPqsE+NHCIa8VCBlfd6/MV21vO2zw8X90mSaO2/PEW7hyH6890zrF11J3rxDzkVtUnV7e8rq5vOdivjWl4s5Nx5zgyJ0AOHJU7Xe2f8OMb4VzsAqeqF/D6FwNGZBJhBn0nPCRFIIgEpOFUrcwvErPbySY6w8mmHm0DVbKvBFGqOth3fco6gIBpZBILgaQ8t9eLep3IiBFcyH1ezILwgOJ0G0qOJwRxOIXRYT3SaTD65rL90w2nW3xcD8jU5raF3PBDEpWf2+xis69nRU8QiWLjJEJkedE+GpZ/CEKR2BL02E9uB+IFF1/Y4bXk17Ty7D8D0WbIgKeLvRcKxFZoQEZfr/vEpdzedt704NBjDRPe3TPDApQgBtvXFvKZ9RB7uo17AJkLZbTGicFVP+a33+e0B1594zNy30eZ3zwwgpsdZ7S23JX/90FQwsTJWxpO4f9qaDqUHVcsSVlG21U4ujIPWkpIi51XE9gM+JmL6nWaU8cRY2CI0ETLnsSWIOJfQG4s6sy0P5liJfqVUtIpZqrSxdzmGlLe2HsOQYo+M6SVpwx8Liopqu5vrvZhuUlUAwmjDodianY57AObCYP5/fM/3yKeZW7v9JH0pQY9eQ5qT6+oWIWoxnERYbXqpEGUDWN6vUG/JkJ6paHIyJ07mCLs4hXXWCin3dAXzmwyMNyGPH3SH03EKK2o/aMWTQNSfSyzFSDS+xXrj3wAZLdzTlyLA4l0iZhzvWLcgfzqHaj922hFhuO3zxQr2cVQihMwXd0gCPsNA4b0Uqaor2GF3qHxctscIGyKafNpmsVM7pSvYmqi0lMijjVfYsx3zV4FgYfQBOQAEaD6VXIHHeg/JBDbfatoQOp6j+GW/Mz5djaeHarA6QdZVeKiGLkKOXT3JYLtxL8QUx2SINlLgWpR3XvMY7f8cIyPMsTrJdLix5wXVRtUVx2A83GyAOt3QxP/rtM+b+86YtAhBdSTRhJfuDL4sjW4//wtnU0B0CzpOlB1CXRprcnUSUeGyOD4eiOaBYnPpY5wUYyQ+eJYQvYdXWDiFx2sBSxyZMAiXMLtBxBoGoyirzFZKK3cw6DdjXrOGepcqFlesEzraz8yfXerOcPwgI4JD13oDKSiw3iUhjTnfrXpoAX+3rEhNfJeqFf7nooGd30z//v4u09KM3l2gEA9WJt60leoDkp3PjL8LPsgBjO5f+odey9O/YqHmxt3dpRD02HvL5VhnJG/kBeZpGd81yX0ceM8x5f2HKzMy38osE6Q/Ru+L0wggWtBgkqhkiG9w0BBwGgggWeBIIFmjCCBZYwggWSBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQIJsPUIRvXx3ACAggABIIEyJxMbTjKmMs37xEKKy5d8HBJzPs30yLXeSbO0taa3o6XGEGt6rbBIF3MIGSKAOLuLOwhddVqkFxdUkYiAUTMptSrN8YyR9yhn06mkZPViPHrKNMXIKlAomg87rD54e8AnQPxKvOVPUYne7WBu4QWrUnbuBTOnoWLQAY6dRRE4EDAdQbMRx34sWpjVBvNrgO1h36T11wnCIGDC+FNchV/zs0Xfpt+JB2HGe1KXxH2lO9QKo0ONQlx/GtKBto1HRyN0pzEbdifUBqy1hgVjb5KnK7z3ah3lcZITYQqprn85Mrc8sMfDJRWZlXJM4t4Tz27XbHIlGxnvSmSHGFl74yKbIGCgz/mr9LCwQt8HAeG5QR4+KpImehYGEZeqysAh1ywPTmWnojmdHrrjuUowPZPdihzKgONsiDgCHTRYzmAlDcPGNlipjIOacSC/hgf6lIZL/QelH8eC3lefpAbyE1paruw2a39yLRX4rb4DWcWk0n3dsy23PElhLBTwGQQsaHTbz7EIabEOb8/tPsOM9P/LaHrD3A3nODPvmgMyAdGsXJ+sHPTjFXOGn2vuB5edJvVARZnQZIpPskcDvcL/Ho+SEITaSYREm2iNkRya0jTBoQ7mtrR+DmE7plvWdjcDceOafDTs81rtrsJ5zdcxOHOmw4QTUtOiebnulbu6kChC5pddgVY9ahTSjQsnxJ5xkAn2AJeS/2GdmIV0edXdK0ojHxYgLWfDjv6WNZ3mag9+ntZw+m7dIwqLTQHPC+Q+YWJMHU8l8Mfu4vSAfG0k15GMjy40Pavi+6UdadTgKajm3N8ieCTyDoSsdf8HGUZkCNB2nAU2UhTwrCB/2APoKy7Mwg+DHIb6G5o9OCeA9ZmSov2dDsWrxTD6rlkjveGGfhIqvlotcpqKBMf752pj/qtCMJq1+SqcIWZEW20jL7AF5ZkEBNcDWkAaBAl1rvTqH8d6vjYQtQm3v9RD3z0cF/xu+og84O3OrKXp8vb3uTn7lOX42RsObEWKW7rBfvkiseSZH8QMzPcmy1oBt6R0mZlmqD/gOGN0V/ipkEY1+YGFmIkgvECziZjHOIvdeTKG09duCsbmm9lHIFcnRSNjVJC/z+ITpjzhh1LNPiKRGSu+pzMkO+nv6mKSXZRrZBI1suhidVSeISK5OqbH+EGYe5nQbG+8LEnWNyKPsMTZlG3v3RRKIi1Qe0blmqqISzfID+KmHjK1/aJIZP7QKhlfyGDfqlbl/hT3Pbxl85AI1iU4DeMrTbKfZgAHNExukebLZbZjumZ1PRKGruc5gIGFF9pc0QBt1O1DSNBoWCNiqsZWm1MlJ1o6sDKRZArHU2dvonkOfkk6h4wfHV2Pn2hBZnIubYvuOZ1vCfM9ghPeVGzilxhh2arerkC9E60VUJx1iMpPTfjU1uw94gA30GSrx2dWRo6HcP3gW9s/va/2NxrsjswVO9qEmOLLZS9BF+e2PQecncoDUsbbunZ8+sdtm/OXQOazWGS5W/Pl315yzH0o0bYcolAUWDYt1hPCFvwOAfxWNZFoTFYEw4dJUAYMGvaRdg3ywQ/jK2k1MOMv+gbHc8p/jpbHNVQQtbBIuwAsvICQNX6PCSDbCMS/K/AiKivnffQ8kSDMFX9ijGBkDAjBgkqhkiG9w0BCRUxFgQUlgCJh1d8WORIThv+Ju2NkD9fS0gwaQYJKoZIhvcNAQkUMVweWgBRAHUAYQBuAHQAdQBtAHUAbAB0ACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAARgBBADEAQQA5ADgANAA5ACAAKAAxADEAIABPAGMAdAAgADIAMAAxADkAKTAtMCEwCQYFKw4DAhoFAAQU8gunnEf1jIaelyXFamHM4uv0avgECFTS7nopsZ+Z
-ca-passphrase = FA1A9849
-skip-server-cert-verify = false
+hostname = *.example.com,*.sample.com
+enable = true
+skip-server-cert-verify = true
+#ca-p12 =
+#ca-passphrase =

 {% endif %}
 {% if request.target == "quan" %}
@@ -266,119 +203,3 @@ enhanced-mode-by-rule = true
 }

 {% endif %}
-{% if request.target == "singbox" %}
-
-{
-    "log": {
-        "disabled": false,
-        "level": "info",
-        "timestamp": true
-    },
-    "dns": {
-        "servers": [
-            {
-                "tag": "dns_proxy",
-                "address": "tls://1.1.1.1",
-                "address_resolver": "dns_resolver"
-            },
-            {
-                "tag": "dns_direct",
-                "address": "h3://dns.alidns.com/dns-query",
-                "address_resolver": "dns_resolver",
-                "detour": "DIRECT"
-            },
-            {
-                "tag": "dns_fakeip",
-                "address": "fakeip"
-            },
-            {
-                "tag": "dns_resolver",
-                "address": "223.5.5.5",
-                "detour": "DIRECT"
-            },
-            {
-                "tag": "block",
-                "address": "rcode://success"
-            }
-        ],
-        "rules": [
-            {
-                "outbound": [
-                    "any"
-                ],
-                "server": "dns_resolver"
-            },
-            {
-                "geosite": [
-                    "category-ads-all"
-                ],
-                "server": "dns_block",
-                "disable_cache": true
-            },
-            {
-                "geosite": [
-                    "geolocation-!cn"
-                ],
-                "query_type": [
-                    "A",
-                    "AAAA"
-                ],
-                "server": "dns_fakeip"
-            },
-            {
-                "geosite": [
-                    "geolocation-!cn"
-                ],
-                "server": "dns_proxy"
-            }
-        ],
-        "final": "dns_direct",
-        "independent_cache": true,
-        "fakeip": {
-            "enabled": true,
-            {% if default(request.singbox.ipv6, "") == "1" %}
-            "inet6_range": "fc00::\/18",
-            {% endif %}
-            "inet4_range": "198.18.0.0\/15"
-        }
-    },
-    "ntp": {
-        "enabled": true,
-        "server": "time.apple.com",
-        "server_port": 123,
-        "interval": "30m",
-        "detour": "DIRECT"
-    },
-    "inbounds": [
-        {
-            "type": "mixed",
-            "tag": "mixed-in",
-            {% if bool(default(global.singbox.allow_lan, "")) %}
-            "listen": "0.0.0.0",
-            {% else %}
-            "listen": "127.0.0.1",
-            {% endif %}
-            "listen_port": {{ default(global.singbox.mixed_port, "2080") }}
-        },
-        {
-            "type": "tun",
-            "tag": "tun-in",
-            "inet4_address": "172.19.0.1/30",
-            {% if default(request.singbox.ipv6, "") == "1" %}
-            "inet6_address": "fdfe:dcba:9876::1/126",
-            {% endif %}
-            "auto_route": true,
-            "strict_route": true,
-            "stack": "mixed",
-            "sniff": true
-        }
-    ],
-    "outbounds": [],
-    "route": {
-        "rules": [],
-        "auto_detect_interface": true
-    },
-    "experimental": {}
-}
-
-{% endif %}
--- a/base/base/singbox.json
+++ b/base/base/singbox.json
@@ -1,104 +0,0 @@
-{
-    "log": {
-        "disabled": false,
-        "level": "info",
-        "timestamp": true
-    },
-    "dns": {
-        "servers": [
-            {
-                "tag": "dns_proxy",
-                "address": "tls://1.1.1.1",
-                "address_resolver": "dns_resolver"
-            },
-            {
-                "tag": "dns_direct",
-                "address": "h3://dns.alidns.com/dns-query",
-                "address_resolver": "dns_resolver",
-                "detour": "DIRECT"
-            },
-            {
-                "tag": "dns_fakeip",
-                "address": "fakeip"
-            },
-            {
-                "tag": "dns_resolver",
-                "address": "223.5.5.5",
-                "detour": "DIRECT"
-            },
-            {
-                "tag": "block",
-                "address": "rcode://success"
-            }
-        ],
-        "rules": [
-            {
-                "outbound": [
-                    "any"
-                ],
-                "server": "dns_resolver"
-            },
-            {
-                "geosite": [
-                    "category-ads-all"
-                ],
-                "server": "dns_block",
-                "disable_cache": true
-            },
-            {
-                "geosite": [
-                    "geolocation-!cn"
-                ],
-                "query_type": [
-                    "A",
-                    "AAAA"
-                ],
-                "server": "dns_fakeip"
-            },
-            {
-                "geosite": [
-                    "geolocation-!cn"
-                ],
-                "server": "dns_proxy"
-            }
-        ],
-        "final": "dns_direct",
-        "independent_cache": true,
-        "fakeip": {
-            "enabled": true,
-            "inet6_range": "fc00::\/18",
-            "inet4_range": "198.18.0.0\/15"
-        }
-    },
-    "ntp": {
-        "enabled": true,
-        "server": "time.apple.com",
-        "server_port": 123,
-        "interval": "30m",
-        "detour": "DIRECT"
-    },
-    "inbounds": [
-        {
-            "type": "mixed",
-            "tag": "mixed-in",
-            "listen": "0.0.0.0",
-            "listen_port": 2080
-        },
-        {
-            "type": "tun",
-            "tag": "tun-in",
-            "inet4_address": "172.19.0.1/30",
-            "inet6_address": "fdfe:dcba:9876::1/126",
-            "auto_route": true,
-            "strict_route": true,
-            "stack": "mixed",
-            "sniff": true
-        }
-    ],
-    "outbounds": [],
-    "route": {
-        "rules": [],
-        "auto_detect_interface": true
-    },
-    "experimental": {}
-}
--- a/base/config/ACL4SSR.ini
+++ b/base/config/ACL4SSR.ini
@@ -9,22 +9,22 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_AdblockPlus.ini
+++ b/base/config/ACL4SSR_AdblockPlus.ini
@@ -9,25 +9,25 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyList.list
-ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyListChina.list
-ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyPrivacy.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyList.list
+surge_ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyListChina.list
+surge_ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyPrivacy.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_BackCN.ini
+++ b/base/config/ACL4SSR_BackCN.ini
@@ -9,17 +9,17 @@
 ;增强中国IP段：支持
 ;增强国外GFW：支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ProxyGFWlist.list
-ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaIp.list
-ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🚀 中国代理,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ProxyGFWlist.list
+surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaIp.list
+surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🚀 中国代理,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 中国代理`select`[]DIRECT`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 中国代理
--- a/base/config/ACL4SSR_Mini.ini
+++ b/base/config/ACL4SSR_Mini.ini
@@ -9,20 +9,20 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_Mini_Fallback.ini
+++ b/base/config/ACL4SSR_Mini_Fallback.ini
@@ -9,20 +9,20 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
--- a/base/config/ACL4SSR_Mini_MultiMode.ini
+++ b/base/config/ACL4SSR_Mini_MultiMode.ini
@@ -9,20 +9,20 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
 custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`180
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
--- a/base/config/ACL4SSR_Mini_NoAuto.ini
+++ b/base/config/ACL4SSR_Mini_NoAuto.ini
@@ -9,17 +9,17 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
--- a/base/config/ACL4SSR_NoApple.ini
+++ b/base/config/ACL4SSR_NoApple.ini
@@ -9,22 +9,22 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_NoAuto.ini
+++ b/base/config/ACL4SSR_NoAuto.ini
@@ -9,19 +9,19 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_NoAuto_NoApple.ini
+++ b/base/config/ACL4SSR_NoAuto_NoApple.ini
@@ -9,19 +9,19 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_NoAuto_NoApple_NoMicrosoft.ini
+++ b/base/config/ACL4SSR_NoAuto_NoApple_NoMicrosoft.ini
@@ -9,18 +9,18 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_NoMicrosoft.ini
+++ b/base/config/ACL4SSR_NoMicrosoft.ini
@@ -9,21 +9,21 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_Online.ini
+++ b/base/config/ACL4SSR_Online.ini
@@ -9,24 +9,24 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_Online_AdblockPlus.ini
+++ b/base/config/ACL4SSR_Online_AdblockPlus.ini
@@ -9,27 +9,27 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyList.list
-ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
-ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyPrivacy.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyList.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyPrivacy.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📢 谷歌FCM`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_Online_Full.ini
+++ b/base/config/ACL4SSR_Online_Full.ini
@@ -10,50 +10,47 @@
 ;增强国外GFW：支持

 ;设置规则标志位
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
-ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
-ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
-;ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;设置规则标志位

 ;设置分组标志位
-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
 custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
@@ -61,18 +58,18 @@ custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻
 custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
 ;设置分组标志位

 enable_rule_generator=true
 overwrite_original_rules=true

-;clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml

 ;luck
--- a/base/config/ACL4SSR_Online_Full_AdblockPlus.ini
+++ b/base/config/ACL4SSR_Online_Full_AdblockPlus.ini
@@ -10,55 +10,50 @@
 ;增强国外GFW：支持

 ;设置规则标志位
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyList.list
-ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
-ruleset=🛡️ 隐私防护,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyPrivacy.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
-ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
-ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
-;ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyList.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
+surge_ruleset=🛡️ 隐私防护,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyPrivacy.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;设置规则标志位

 ;设置分组标志位
 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
 custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
@@ -68,18 +63,18 @@ custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🆎 AdBlock`select`[]REJECT`[]DIRECT
 custom_proxy_group=🛡️ 隐私防护`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
 ;设置分组标志位

 enable_rule_generator=true
 overwrite_original_rules=true

-;clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml

 ;luck
--- a/base/config/ACL4SSR_Online_Full_Google.ini
+++ b/base/config/ACL4SSR_Online_Full_Google.ini
@@ -1,86 +0,0 @@
-[custom]
-;不要随意改变关键字，否则会导致出错
-;acl4SSR规则
-
-;去广告：支持
-;自动测速：支持
-;微软分流：支持
-;苹果分流：支持
-;增强中国IP段：支持
-;增强国外GFW：支持
-
-;设置规则标志位
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=📢 谷歌🇨🇳Play下载,[]DOMAIN-SUFFIX,xn--ngstr-lra8j.com
-ruleset=📢 谷歌🇨🇳Play服务,[]DOMAIN-SUFFIX,services.googleapis.cn
-ruleset=📢 谷歌🇨🇳Play服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleCNProxyIP.list
-ruleset=📢 谷歌🇨🇳,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleCN.list
-ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
-ruleset=📢 谷歌,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Google.list
-ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
-ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
-;ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
-;设置规则标志位
-
-;设置分组标志位
-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=📢 谷歌🇨🇳Play下载`select`[]🚀 节点选择`[]DIRECT`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=📢 谷歌🇨🇳Play服务`select`[]🚀 节点选择`[]DIRECT`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=📢 谷歌🇨🇳`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=📢 谷歌`select`[]🚀 节点选择`[]DIRECT`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
-custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
-custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
-custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
-;设置分组标志位
-
-enable_rule_generator=true
-overwrite_original_rules=true
-
-;clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
-
-;luck
--- a/base/config/ACL4SSR_Online_Full_MultiMode.ini
+++ b/base/config/ACL4SSR_Online_Full_MultiMode.ini
@@ -1,80 +0,0 @@
-[custom]
-;不要随意改变关键字，否则会导致出错
-;acl4SSR规则
-
-;去广告：支持
-;自动测速：支持
-;微软分流：支持
-;苹果分流：支持
-;增强中国IP段：支持
-;增强国外GFW：支持
-
-;设置规则标志位
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
-ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
-ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
-;ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
-;设置规则标志位
-
-;设置分组标志位
-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
-custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
-custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
-custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
-custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
-;设置分组标志位
-
-enable_rule_generator=true
-overwrite_original_rules=true
-
-;clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
-
-;luck
--- a/base/config/ACL4SSR_Online_Full_Netflix.ini
+++ b/base/config/ACL4SSR_Online_Full_Netflix.ini
@@ -10,53 +10,48 @@
 ;增强国外GFW：支持

 ;设置规则标志位
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
-ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/AmazonIp.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
-ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
-;ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/AmazonIp.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;设置规则标志位

 ;设置分组标志位
 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
 custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
@@ -64,18 +59,18 @@ custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻
 custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
 ;设置分组标志位

 enable_rule_generator=true
 overwrite_original_rules=true

-;clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml

 ;luck
--- a/base/config/ACL4SSR_Online_Full_NoAuto.ini
+++ b/base/config/ACL4SSR_Online_Full_NoAuto.ini
@@ -10,34 +10,31 @@
 ;增强国外GFW：支持

 ;设置规则标志位
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
-ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
-ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
-ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
-ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
-ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
-;ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;设置规则标志位

 ;设置分组标志位
@@ -47,12 +44,10 @@ custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]🇸🇬 狮
 custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
 custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
 custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`(网易|音乐|解锁|Music|NetEase)
@@ -72,6 +67,6 @@ custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Me
 enable_rule_generator=true
 overwrite_original_rules=true

-;clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml

 ;luck
--- a/base/config/ACL4SSR_Online_Mini.ini
+++ b/base/config/ACL4SSR_Online_Mini.ini
@@ -9,21 +9,21 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_Online_Mini_AdblockPlus.ini
+++ b/base/config/ACL4SSR_Online_Mini_AdblockPlus.ini
@@ -9,22 +9,22 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_Online_Mini_Fallback.ini
+++ b/base/config/ACL4SSR_Online_Mini_Fallback.ini
@@ -9,21 +9,21 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
--- a/base/config/ACL4SSR_Online_Mini_MultiCountry.ini
+++ b/base/config/ACL4SSR_Online_Mini_MultiCountry.ini
@@ -1,36 +0,0 @@
-[custom]
-;不要随意改变关键字，否则会导致出错
-;acl4SSR规则-在线版
-
-;去广告：支持
-;自动测速：支持
-;微软分流：不支持
-;苹果分流：不支持
-;增强中国IP段：不支持
-;增强国外GFW：不支持
-
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
-
-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇺🇲 美国节点`[]🇯🇵 日本节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
-custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-
-enable_rule_generator=true
-overwrite_original_rules=true
--- a/base/config/ACL4SSR_Online_Mini_MultiMode.ini
+++ b/base/config/ACL4SSR_Online_Mini_MultiMode.ini
@@ -9,21 +9,21 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
 custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`180
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
--- a/base/config/ACL4SSR_Online_Mini_NoAuto.ini
+++ b/base/config/ACL4SSR_Online_Mini_NoAuto.ini
@@ -9,18 +9,18 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
--- a/base/config/ACL4SSR_Online_MultiCountry.ini
+++ b/base/config/ACL4SSR_Online_MultiCountry.ini
@@ -1,47 +0,0 @@
-[custom]
-;不要随意改变关键字，否则会导致出错
-;acl4SSR规则-在线更新版
-
-;去广告：支持
-;自动测速：支持
-;微软分流：支持
-;苹果分流：支持
-;增强中国IP段：不支持
-;增强国外GFW：不支持
-;多国家分组：支持港/日/美
-
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
-
-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇺🇲 美国节点`[]🇯🇵 日本节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🚀 手动切换`select`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
-custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
-custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=📢 谷歌FCM`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
-custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`600,,50
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300,,50
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
-
-
-enable_rule_generator=true
-overwrite_original_rules=true
--- a/base/config/ACL4SSR_Online_NoAuto.ini
+++ b/base/config/ACL4SSR_Online_NoAuto.ini
@@ -9,21 +9,21 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
-ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
-ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_Online_NoReject.ini
+++ b/base/config/ACL4SSR_Online_NoReject.ini
@@ -9,21 +9,21 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：不支持

-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
-ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
-ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_WithChinaIp.ini
+++ b/base/config/ACL4SSR_WithChinaIp.ini
@@ -10,22 +10,22 @@
 ;增强国外GFW：不支持

 ;设置规则标志位
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_WithChinaIp_WithGFW.ini
+++ b/base/config/ACL4SSR_WithChinaIp_WithGFW.ini
@@ -9,23 +9,23 @@
 ;增强中国IP段：支持
 ;增强国外GFW：支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyGFWlist.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyGFWlist.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/ACL4SSR_WithGFW.ini
+++ b/base/config/ACL4SSR_WithGFW.ini
@@ -9,22 +9,22 @@
 ;增强中国IP段：不支持
 ;增强国外GFW：支持

-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
-ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
-ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
-ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
-ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
-ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyGFWlist.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
-ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
-ruleset=🎯 全球直连,[]GEOIP,CN
-ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyGFWlist.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL

 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
--- a/base/config/example_external_config.ini
+++ b/base/config/example_external_config.ini
@@ -43,9 +43,6 @@ clash_rule_base=base/forcerule.yml
 ;mellow_rule_base=base/mellow.conf
 ;quan_rule_base=base/quan.conf
 ;quanx_rule_base=base/quanx.conf
-;loon_rule_base=base/loon.conf
-;sssub_rule_base=base/shadowsocks_base.json
-;singbox_rule_base=base/singbox.json

 ;Options for renaming nodes
 ;rename=Test-(.*?)-(.*?)-(.*?)\((.*?)\)@\1\4x测试线路_自\2到\3
--- a/base/config/example_external_config.toml
+++ b/base/config/example_external_config.toml
@@ -1,33 +0,0 @@
-version = 1
-[custom]
-enable_rule_generator = false
-overwrite_original_rules = false
-
-# Options for custom base configuration file
-clash_rule_base = "base/forcerule.yml"
-#surge_rule_base = "base/surge.conf"
-#surfboard_rule_base = "base/surfboard.conf"
-#mellow_rule_base = "base/mellow.conf"
-#quan_rule_base = "base/quan.conf"
-#quanx_rule_base = "base/quanx.conf"
-#loon_rule_base = "base/loon.conf"
-#sssub_rule_base = "base/shadowsocks_base.json"
-#singbox_rule_base = "base/singbox.json"
-
-# Options for adding emojis
-#add_emoji = true
-#remove_old_emoji = true
-
-# Options for filtering nodes
-#include_remarks = []
-#exclude_remarks = []
-
-[[custom_groups]]
-import = "snippets/groups_forcerule.toml"
-
-#[[rulesets]]
-#import = ""
-
-[[template_args]]
-key = "clash.dns.port"
-value = "5353"
--- a/base/config/example_external_config.yml
+++ b/base/config/example_external_config.yml
@@ -14,9 +14,6 @@ custom:
 #  mellow_rule_base: base/mellow.conf
 #  quan_rule_base: base/quan.conf
 #  quanx_rule_base: base/quanx.conf
-#  loon_rule_base: base/loon.conf
-#  sssub_rule_base: base/shadowsocks_base.json
-#  singbox_rule_base: base/singbox.json

 #  rename_node:
 #  - {import: snippet/rename.txt}
--- a/base/pref.example.yml
+++ b/base/pref.example.yml
@@ -5,7 +5,7 @@ common:
  enable_insert: true
  insert_url: []
  prepend_insert_url: true
-  exclude_remarks: ["(到期|剩余流量|时间|官网|产品|平台)"]
+  exclude_remarks: ["(到期|剩余流量|时间|官网|产品)"]
  include_remarks: []
  enable_filter: false
  filter_script: ""
@@ -19,12 +19,10 @@ common:
  quanx_rule_base: base/all_base.tpl
  loon_rule_base: base/all_base.tpl
  sssub_rule_base: base/all_base.tpl
-  singbox_rule_base: base/all_base.tpl
  proxy_config: SYSTEM
  proxy_ruleset: SYSTEM
  proxy_subscription: NONE
  append_proxy_type: false
-  reload_conf_on_request: false

 userinfo:
  stream_rule: 
@@ -50,7 +48,6 @@ node_pref:
  append_sub_userinfo: true
  clash_use_new_field_name: true
  clash_proxies_style: flow
-  singbox_add_clash_modes: true
  rename_node:
 #  - {match: "\\(?((x|X)?(\\d+)(\\.?\\d+)?)((\\s?倍率?)|(x|X))\\)?", replace: "$1x"}
 #  - {script: "function rename(node){}"}
@@ -102,14 +99,12 @@ proxy_groups:
  - {import: snippets/groups.txt}

 template:
-  template_path: ""
+  template_path: "templates"
  globals:
  - {key: clash.http_port, value: 7890}
  - {key: clash.socks_port, value: 7891}
  - {key: clash.allow_lan, value: true}
  - {key: clash.log_level, value: info}
-  - {key: singbox.allow_lan, value: true}
-  - {key: singbox.mixed_port, value: 2080}
  
 aliases:
  - {uri: /v, target: /version}
@@ -121,7 +116,6 @@ aliases:
  - {uri: /mellow, target: "/sub?target=mellow"}
  - {uri: /surfboard, target: "/sub?target=surfboard"}
  - {uri: /loon, target: "/sub?target=loon"}
-  - {uri: /singbox, target: "/sub?target=singbox"}
  - {uri: /ss, target: "/sub?target=ss"}
  - {uri: /ssd, target: "/sub?target=ssd"}
  - {uri: /sssub, target: "/sub?target=sssub"}
@@ -129,12 +123,6 @@ aliases:
  - {uri: /v2ray, target: "/sub?target=v2ray"}
  - {uri: /trojan, target: "/sub?target=trojan"}

-tasks:
-#  - name: tick
-#    cronexp: "0/10 * * * * ?"
-#    path: tick.js
-#    timeout: 3
-
 server:
  listen: 0.0.0.0
  port: 25500
@@ -152,6 +140,5 @@ advanced:
  cache_subscription: 60
  cache_config: 300
  cache_ruleset: 21600
-  script_clean_context: true
  async_fetch_ruleset: false
  skip_failed_links: false
--- a/base/pref.example.toml
+++ b/base/pref.example.toml
@@ -1,343 +0,0 @@
-version = 1
-[common]
-# API mode, set to true to prevent loading local subscriptions or serving local files directly
-api_mode = false
-
-# Access token used for performing critical action through Web interface
-api_access_token = "password"
-
-# Default URLs, used when no URL is provided in request, use "|" to separate multiple subscription links, supports local files/URL
-default_url = []
-
-# Insert subscription links to requests. Can be used to add node(s) to all exported subscriptions.
-enable_insert = true
-# URLs to insert before subscription links, can be used to add node(s) to all exported subscriptions, supports local files/URL
-insert_url = [""]
-# Prepend inserted URLs to subscription links. Nodes in insert_url will be added to groups first with non-group-specific match pattern.
-prepend_insert_url = true
-
-# Exclude nodes which remarks match the following patterns. Supports regular expression.
-exclude_remarks = ["(到期|剩余流量|时间|官网|产品)"]
-
-# Only include nodes which remarks match the following patterns. Supports regular expression.
-#include_remarks = ["V3.*港"]
-
-# Enable script support for filtering nodes
-enable_filter = false
-# Script used for filtering nodes. Supports inline script and script path. A "filter" function with 1 argument which is a node should be defined in the script.
-# Example: Inline script: set value to content of script.
-#          Script path: set value to "path:/path/to/script.js".
-#filter_script = '''
-#function filter(node) {
-#    const info = JSON.parse(node.ProxyInfo);
-#    if(info.EncryptMethod.includes('chacha20'))
-#	    return true;
-#    return false;
-#}
-#'''
-
-# Setting an external config file as default when none is specified, supports local files/URL
-# default_external_config = "config/example_external_config.toml"
-
-# The file scope limit of the 'rule_base' options in external configs.
-base_path = "base"
-
-# Clash config base used by the generator, supports local files/URL
-clash_rule_base = "base/all_base.tpl"
-
-# Surge config base used by the generator, supports local files/URL
-surge_rule_base = "base/all_base.tpl"
-
-# Surfboard config base used by the generator, supports local files/URL
-surfboard_rule_base = "base/all_base.tpl"
-
-# Mellow config base used by the generator, supports local files/URL
-mellow_rule_base = "base/all_base.tpl"
-
-# Quantumult config base used by the generator, supports local files/URL
-quan_rule_base = "base/all_base.tpl"
-
-# Quantumult X config base used by the generator, supports local files/URL
-quanx_rule_base = "base/all_base.tpl"
-
-# Loon config base used by the generator, supports local files/URL
-loon_rule_base = "base/all_base.tpl"
-
-# Shadowsocks Android config base used by the generator, supports local files/URL
-sssub_rule_base = "base/all_base.tpl"
-
-# sing-box config base used by the generator, supports local files/URL
-singbox_rule_base = "base/all_base.tpl"
-
-# Proxy used to download rulesets or subscriptions, set to NONE or empty to disable it, set to SYSTEM to use system proxy.
-# Accept cURL-supported proxies (http:// https:// socks4a:// socks5://)
-
-proxy_config = "SYSTEM"
-proxy_ruleset = "SYSTEM"
-proxy_subscription = "NONE"
-
-# Append a proxy type string ([SS] [SSR] [VMess]) to node remark.
-append_proxy_type = false
-
-# When requesting /sub, reload this config file first.
-reload_conf_on_request = false
-
-[[userinfo.stream_rule]]
-# Rules to extract stream data from node
-# Format: full_match_regex|new_format_regex
-# where new_format_regex should be like "total=$1&left=$2&used=$3"
-match = '^剩余流量：(.*?)\|总流量：(.*)$'
-replace = 'total=$2&left=$1'
-
-[[userinfo.stream_rule]]
-match = '^剩余流量：(.*?) (.*)$'
-replace = 'total=$1&left=$2'
-
-[[userinfo.stream_rule]]
-match = '^Bandwidth: (.*?)/(.*)$'
-replace = 'used=$1&total=$2'
-
-[[userinfo.stream_rule]]
-match = '^.*剩余(.*?)(?:\s*?)@(?:.*)$'
-replace = 'total=$1'
-
-[[userinfo.time_rule]]
-# Rules to extract expire time data from node
-# Format: full_match_regex|new_format_regex
-# where new_format_regex should follow this example: yyyy:mm:dd:hh:mm:ss
-match = '^过期时间：(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)$'
-replace = '$1:$2:$3:$4:$5:$6'
-
-[[userinfo.time_rule]]
-match = '^到期时间:(\d+)-(\d+)-(\d+)$'
-replace = '$1:$2:$3:0:0:0'
-
-[[userinfo.time_rule]]
-match = '^Smart Access expire: (\d+)/(\d+)/(\d+)$'
-replace = '$1:$2:$3:0:0:0'
-
-[node_pref]
-udp_flag = true
-tcp_fast_open_flag = false
-skip_cert_verify_flag = true
-tls13_flag = false
-
-sort_flag = false
-# Script used for sorting nodes. A "compare" function with 2 arguments which are the 2 nodes to be compared should be defined in the script. Supports inline script and script path.
-# Examples can be seen at the filter_script option in [common] section.
-#sort_script = '''
-#function compare(node_a, node_b) {
-#   return info_a.Remark > info_b.Remark;
-#}
-#'''
-
-filter_deprecated_nodes = false
-append_sub_userinfo = true
-clash_use_new_field_name = true
-
-# Generate style of the proxies section of Clash subscriptions.
-# Supported styles: block, flow, compact
-# Block: - name: name1    Flow: - {name: name1, key: value}    Compact: [{name: name1, key: value},{name: name2, key: value}]
-#         key: value           - {name: name2, key: value}
-#       - name: name2
-#         key: value
-clash_proxies_style = "flow"
-
-# add Clash mode to sing-box rules, and add a GLOBAL group to end of outbounds
-singbox_add_clash_modes = true
-
-[[node_pref.rename_node]]
-match = '\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?'
-replace = "$1x"
-
-[managed_config]
-# Append a '#!MANAGED-CONFIG' info to Surge configurations
-write_managed_config = true
-
-# Address prefix for MANAGED-CONFIG info, without the trailing "/".
-managed_config_prefix = "http://127.0.0.1:25500"
-
-# Managed config update interval in seconds, determine how long the config will be updated.
-config_update_interval = 86400
-
-# If config_update_strict is set to true, Surge will require a force update after the interval.
-config_update_strict = false
-
-# Device ID to be written to rewrite scripts for some version of Quantumult X 
-quanx_device_id = ""
-
-[surge_external_proxy]
-#surge_ssr_path = "/usr/bin/ssr-local"
-resolve_hostname = true
-
-[emojis]
-add_emoji = false
-remove_old_emoji = true
-
-[[emojis.emoji]]
-#match = '(流量|时间|应急)'
-#emoji = '🏳️‍🌈'
-import = "snippets/emoji.toml"
-
-# [[custom_groups]]
-# name = "Auto"
-# type = "url-test"
-# rule = [".*"]
-# url = "http://www.gstatic.com/generate_204"
-# interval = 300
-# tolerance = 150
-# lazy = true
-
-# [[custom_groups]]
-# name = "Proxy"
-# type = "select"
-# rule = [".*", "[]DIRECT"]
-# disable_udp = false
-
-# [[custom_groups]]
-# name = "LoadBalance"
-# type = "load-balance"
-# rule = [".*", "[]Proxy", "[]DIRECT"]
-# interval = 100
-# strategy = "consistent-hashing"
-# url = "http://www.gstatic.com/generate_204"
-
-[[custom_groups]]
-import = "snippets/groups.toml"
-
-[ruleset]
-# Enable generating rules with rulesets
-enabled = true
-
-# Overwrite the existing rules in rule_base
-overwrite_original_rules = false
-
-# Perform a ruleset update on request
-update_ruleset_on_request = false
-
-# [[rulesets]]
-# group = "Proxy"
-# ruleset = "https://raw.githubusercontent.com/DivineEngine/Profiles/master/Surge/Ruleset/Unbreak.list"
-# type = "surge-ruleset"
-# interval = 86400
-
-[[rulesets]]
-import = "snippets/rulesets.toml"
-
-[template]
-template_path = ""
-
-[[template.globals]]
-key = "clash.http_port"
-value = "7890"
-
-[[template.globals]]
-key = "clash.socks_port"
-value = "7891"
-
-[[template.globals]]
-key = "clash.allow_lan"
-value = "true"
-
-[[template.globals]]
-key = "clash.log_level"
-value = "info"
-
-[[template.globals]]
-key = "singbox.allow_lan"
-value = "true"
-
-[[template.globals]]
-key = "singbox.mixed_port"
-value = "2080"
-
-[[aliases]]
-uri = "/clash"
-target = "/sub?target=clash"
-
-[[aliases]]
-uri = "/clashr"
-target = "/sub?target=clashr"
-
-[[aliases]]
-uri = "/surge"
-target = "/sub?target=surge"
-
-[[aliases]]
-uri = "/quan"
-target = "/sub?target=quan"
-
-[[aliases]]
-uri = "/quanx"
-target = "/sub?target=quanx"
-
-[[aliases]]
-uri = "/mellow"
-target = "/sub?target=mellow"
-
-[[aliases]]
-uri = "/surfboard"
-target = "/sub?target=surfboard"
-
-[[aliases]]
-uri = "/loon"
-target = "/sub?target=loon"
-
-[[aliases]]
-uri = "/singbox"
-target = "/sub?target=singbox"
-
-[[aliases]]
-uri = "/ss"
-target = "/sub?target=ss"
-
-[[aliases]]
-uri = "/ssd"
-target = "/sub?target=ssd"
-
-[[aliases]]
-uri = "/sssub"
-target = "/sub?target=sssub"
-
-[[aliases]]
-uri = "/ssr"
-target = "/sub?target=ssr"
-
-[[aliases]]
-uri = "/v2ray"
-target = "/sub?target=v2ray"
-
-[[aliases]]
-uri = "/trojan"
-target = "/sub?target=trojan"
-
-[[aliases]]
-uri = "/test"
-target = "/render?path=templates/test.tpl"
-
-#[[tasks]]
-#name = "tick"
-#cronexp = "0/10 * * * * ?"
-#path = "tick.js"
-#timeout = 3
-
-[server]
-listen = "0.0.0.0"
-port = 25500
-serve_file_root = "web"
-
-[advanced]
-log_level = "debug"
-print_debug_info = true
-max_pending_connections = 10240
-max_concurrent_threads = 4
-max_allowed_rulesets = 64
-max_allowed_rules = 0
-max_allowed_download_size = 0
-enable_cache = true
-cache_subscription = 60
-cache_config = 300
-cache_ruleset = 21600
-script_clean_context = true
-async_fetch_ruleset = false
-skip_failed_links = true
--- a/base/pref.example.ini
+++ b/base/pref.example.ini
@@ -16,7 +16,7 @@ insert_url=
 prepend_insert_url=true

 ;Exclude nodes which remarks match the following patterns. Supports regular expression.
-exclude_remarks=(到期|剩余流量|时间|官网|产品|平台)
+exclude_remarks=(到期|剩余流量|时间|官网|产品)
 ;exclude_remarks=(other rule)

 ;Only include nodes which remarks match the following patterns. Supports regular expression.
@@ -26,7 +26,7 @@ exclude_remarks=(到期|剩余流量|时间|官网|产品|平台)
 enable_filter=false
 ;Script used for filtering nodes. Supports inline script and script path. A "filter" function with 1 argument which is a node should be defined in the script.
 ;Example: Inline script: Set value to content of script. Replace all line break with "\n".
-;         Script path: set value to "path:/path/to/script.js".
+;         Script path: Set value to "path:/path/to/script.js".
 ;filter_script=function filter(node) {\n    const info = JSON.parse(node.ProxyInfo);\n    if(info.EncryptMethod.includes('chacha20'))\n        return true;\n    return false;\n}

 ;Setting an external config file as default when none is specified, supports local files/URL
@@ -59,9 +59,6 @@ loon_rule_base=base/all_base.tpl
 ;Shadowsocks Android config base used by the generator, supports local files/URL
 sssub_rule_base=base/all_base.tpl

-;sing-box config base used by the generator, supports local files/URL
-singbox_rule_base=base/all_base.tpl
-
 ;Proxy used to download configs, rulesets or subscriptions, set to NONE or empty to disable it, set to SYSTEM to use system proxy.
 ;Accept cURL-supported proxies (http:// https:// socks4a:// socks5://)
 ;Additional support for CORS proxy ( https://github.com/Rob--W/cors-anywhere https://github.com/Zibri/cloudflare-cors-anywhere etc.), prefix the address with "cors:" to recognize the address as CORS proxy.
@@ -73,9 +70,6 @@ proxy_subscription=NONE
 ;Append a proxy type string ([SS] [SSR] [VMess]) to node remark.
 append_proxy_type=false

-;When requesting /sub, reload this config file first.
-reload_conf_on_request=false
-
 [userinfo]
 ;Rules to extract stream data from node
 ;Format: full_match_regex|new_format_regex
@@ -117,9 +111,6 @@ clash_use_new_field_name=true
 ;         key: value
 clash_proxies_style=flow

-;add Clash mode to sing-box rules, and add a GLOBAL group to end of outbounds
-singbox_add_clash_modes=true
-
 ;Rename remarks with the following patterns. Supports regular expression.
 ;Format: Search_Pattern@Replace_Pattern
 ;rename_node=IPLC@专线
@@ -181,10 +172,10 @@ update_ruleset_on_request=false
 ;where "type" supports the following value: surge, quanx, clash-domain, clash-ipcidr, clash-classic
 ;type defaults to surge if omitted

-;ruleset=DIRECT,https://raw.githubusercontent.com/DivineEngine/Profiles/master/Surge/Ruleset/Guard/Unbreak.list,86400
+;ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list,86400
 ;ruleset=🎯 全球直连,rules/LocalAreaNetwork.list
 ;ruleset=DIRECT,surge:rules/LocalAreaNetwork.list
-;ruleset=Advertising,quanx:https://raw.githubusercontent.com/DivineEngine/Profiles/master/Quantumult/Filter/Guard/Advertising.list,86400
+;ruleset=Advertising,quanx:https://raw.githubusercontent.com/ConnersHua/Profiles/master/Quantumult/X/Filter/Advertising.list,86400
 ;ruleset=Domestic Services,clash-domain:https://ruleset.dev/clash_domestic_services_domains,86400
 ;ruleset=Domestic Services,clash-ipcidr:https://ruleset.dev/clash_domestic_services_ips,86400
 ;ruleset=DIRECT,clash-classic:https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/China.yaml,86400
@@ -224,7 +215,7 @@ custom_proxy_group=!!import:snippets/groups.txt

 [template]
 ;The file scope limit of 'include' statement inside the templates.
-template_path=
+template_path=templates

 ;The following settings will be added to the "global" scope of the template variables
 ;Value of 'clash.http_port' can be accessed with 'global.clash.http_port' in the template.
@@ -232,8 +223,6 @@ clash.http_port=7890
 clash.socks_port=7891
 clash.allow_lan=true
 clash.log_level=info
-singbox.allow_lan=true
-singbox.mixed_port=2080

 [aliases]
 ;Aliases for accessing interfaces. Can be used to shorten the URI.
@@ -248,7 +237,6 @@ singbox.mixed_port=2080
 /mellow=/sub?target=mellow
 /surfboard=/sub?target=surfboard
 /loon=/sub?target=loon
-/singbox=/sub?target=singbox
 /ss=/sub?target=ss
 /ssd=/sub?target=ssd
 /sssub=/sub?target=sssub
@@ -256,11 +244,6 @@ singbox.mixed_port=2080
 /v2ray=/sub?target=v2ray
 /trojan=/sub?target=trojan

-[tasks]
-;Tasks to be run regularly during server execution.
-;Format: Name`Cron_Expression`JS_Path`Timeout_in_seconds
-;task=tick`0/10 * * * * ?`tick.js`3
-
 [server]
 ;Address to bind on for Web Server
 listen=0.0.0.0
@@ -283,6 +266,5 @@ enable_cache=false
 cache_subscription=60
 cache_config=300
 cache_ruleset=21600
-script_clean_context=true
 async_fetch_ruleset=false
 skip_failed_links=false
--- a/base/profiles/example_profile.ini
+++ b/base/profiles/example_profile.ini
@@ -5,7 +5,7 @@
 ;For more available options, please check the readme section

 target=clash
-url=trojan://65474277@sqcu.hostmsu.ru:55551?allowinsecure=0&peer=mza.hkfq.xyz&mux=1&ws=0&wspath=&wshost=&ss=0&ssmethod=aes-128-gcm&sspasswd=&group=#%E9%A6%99%E6%B8%AFCN2-MZA%E8%8A%82%E7%82%B9-%E5%AE%BF%E8%BF%81%E8%81%94%E9%80%9A%E4%B8%AD%E8%BD%AC
+url=ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@www.example.com:1080#Example
 ;config=config/example_external_config.ini
 ;ver=3
 ;udp=true
--- a/base/rules/ACL4SSR/Clash/Apple.list
+++ b/base/rules/ACL4SSR/Clash/Apple.list
@@ -6,14 +6,12 @@ DOMAIN-SUFFIX,akadns.net
 DOMAIN-SUFFIX,apple-cloudkit.com
 DOMAIN-SUFFIX,apple.co
 DOMAIN-SUFFIX,apple.com
-DOMAIN-SUFFIX,apple.com.cn
 DOMAIN-SUFFIX,apple.news
 DOMAIN-SUFFIX,appstore.com
 DOMAIN-SUFFIX,cdn-apple.com
 DOMAIN-SUFFIX,crashlytics.com
 DOMAIN-SUFFIX,icloud-content.com
 DOMAIN-SUFFIX,icloud.com
-DOMAIN-SUFFIX,icloud.com.cn
 DOMAIN-SUFFIX,itunes.com
 DOMAIN-SUFFIX,me.com
 DOMAIN-SUFFIX,mzstatic.com
--- a/base/rules/ACL4SSR/Clash/BanAD.list
+++ b/base/rules/ACL4SSR/Clash/BanAD.list
@@ -6,6 +6,7 @@ DOMAIN-KEYWORD,admaster
 DOMAIN-KEYWORD,adsage
 DOMAIN-KEYWORD,adsensor
 DOMAIN-KEYWORD,adservice
+DOMAIN-KEYWORD,adsh
 DOMAIN-KEYWORD,adsmogo
 DOMAIN-KEYWORD,adsrvmedia
 DOMAIN-KEYWORD,adsserving
@@ -18,6 +19,8 @@ DOMAIN-KEYWORD,domob
 DOMAIN-KEYWORD,duomeng
 DOMAIN-KEYWORD,dwtrack
 DOMAIN-KEYWORD,guanggao
+DOMAIN-KEYWORD,lianmeng
+DOMAIN-KEYWORD,monitor
 DOMAIN-KEYWORD,omgmta
 DOMAIN-KEYWORD,omniture
 DOMAIN-KEYWORD,openx
@@ -25,6 +28,7 @@ DOMAIN-KEYWORD,partnerad
 DOMAIN-KEYWORD,pingfore
 DOMAIN-KEYWORD,socdm
 DOMAIN-KEYWORD,supersonicads
+DOMAIN-KEYWORD,tracking
 DOMAIN-KEYWORD,usage
 DOMAIN-KEYWORD,wlmonitor
 DOMAIN-KEYWORD,zjtoolbar
@@ -320,6 +324,7 @@ DOMAIN-SUFFIX,onetad.com
 DOMAIN-SUFFIX,optaim.com
 DOMAIN-SUFFIX,optimix.asia
 DOMAIN-SUFFIX,optimix.cn
+DOMAIN-SUFFIX,optimizely.com
 DOMAIN-SUFFIX,optimizelyapis.com
 DOMAIN-SUFFIX,overture.com
 DOMAIN-SUFFIX,p0y.cn
--- a/base/rules/ACL4SSR/Clash/BanEasyList.list
+++ b/base/rules/ACL4SSR/Clash/BanEasyList.list
--- a/base/rules/ACL4SSR/Clash/BanEasyListChina.list
+++ b/base/rules/ACL4SSR/Clash/BanEasyListChina.list
--- a/base/rules/ACL4SSR/Clash/BanEasyPrivacy.list
+++ b/base/rules/ACL4SSR/Clash/BanEasyPrivacy.list
--- a/base/rules/ACL4SSR/Clash/BanProgramAD.list
+++ b/base/rules/ACL4SSR/Clash/BanProgramAD.list
@@ -29,6 +29,7 @@ DOMAIN-SUFFIX,nex.corp.163.com
 DOMAIN-SUFFIX,oimagea2.ydstatic.com
 DOMAIN-SUFFIX,pagechoice.net
 DOMAIN-SUFFIX,prom.gome.com.cn
+DOMAIN-SUFFIX,push.126.net
 DOMAIN-SUFFIX,qchannel0d.cn
 DOMAIN-SUFFIX,qt002x.corp.youdao.com
 DOMAIN-SUFFIX,rlogs.youdao.com
@@ -184,6 +185,7 @@ DOMAIN-SUFFIX,appc.baidu.cn
 DOMAIN-SUFFIX,appc.baidu.com
 DOMAIN-SUFFIX,as.baidu.cn
 DOMAIN-SUFFIX,as.baidu.com
+DOMAIN-SUFFIX,ashifen.com
 DOMAIN-SUFFIX,baichuan.baidu.com
 DOMAIN-SUFFIX,baidu9635.com
 DOMAIN-SUFFIX,baidustatic.com
@@ -285,6 +287,7 @@ DOMAIN-SUFFIX,mobads-logs.baidu.com
 DOMAIN-SUFFIX,mobads.baidu.cn
 DOMAIN-SUFFIX,mobads.baidu.com
 DOMAIN-SUFFIX,mpro.baidu.com
+DOMAIN-SUFFIX,msite.baidu.com
 DOMAIN-SUFFIX,mtj.baidu.cn
 DOMAIN-SUFFIX,mtj.baidu.com
 DOMAIN-SUFFIX,neirong.baidu.com
@@ -318,6 +321,7 @@ DOMAIN-SUFFIX,sclick.baidu.com
 DOMAIN-SUFFIX,sestat.baidu.com
 DOMAIN-SUFFIX,shadu.baidu.com
 DOMAIN-SUFFIX,share.baidu.com
+DOMAIN-SUFFIX,shifen.com
 DOMAIN-SUFFIX,snippet.pos.baidu.com
 DOMAIN-SUFFIX,sobar.baidu.com
 DOMAIN-SUFFIX,sobartop.baidu.com
@@ -473,7 +477,8 @@ DOMAIN-SUFFIX,stat.m.jd.com

 # Kugou
 DOMAIN-SUFFIX,ads.service.kugou.com
-DOMAIN-SUFFIX,adsfile.bssdlbig.kugou.com
+DOMAIN-SUFFIX,bssdl.kugou.com
+DOMAIN-SUFFIX,bssdlbig.kugou.com
 DOMAIN-SUFFIX,d.kugou.com
 DOMAIN-SUFFIX,downmobile.kugou.com
 DOMAIN-SUFFIX,gad.kugou.com
@@ -574,6 +579,7 @@ DOMAIN-SUFFIX,r.browser.miui.com
 DOMAIN-SUFFIX,security.browser.miui.com
 DOMAIN-SUFFIX,shenghuo.xiaomi.com
 DOMAIN-SUFFIX,stat.pandora.xiaomi.com
+DOMAIN-SUFFIX,tracking.miui.com
 DOMAIN-SUFFIX,union.mi.com
 DOMAIN-SUFFIX,wtradv.market.xiaomi.com
 DOMAIN-SUFFIX,xmpush.xiaomi.com
@@ -798,6 +804,7 @@ DOMAIN-SUFFIX,locdrop.query.yahoo.com
 DOMAIN-SUFFIX,onepush.query.yahoo.com
 DOMAIN-SUFFIX,p3p.yahoo.com
 DOMAIN-SUFFIX,partnerads.ysm.yahoo.com
+DOMAIN-SUFFIX,uservoice.com
 DOMAIN-SUFFIX,ws.progrss.yahoo.com
 DOMAIN-SUFFIX,yads.yahoo.co.jp
 DOMAIN-SUFFIX,ybp.yahoo.com
@@ -1064,8 +1071,6 @@ DOMAIN-SUFFIX,808.tianya.cn
 DOMAIN-SUFFIX,808.tianyaui.cn
 DOMAIN-SUFFIX,92x.tumblr.com
 DOMAIN-SUFFIX,a1.itc.cn
-DOMAIN-SUFFIX,ad-channel.wikawika.xyz
-DOMAIN-SUFFIX,ad-display.wikawika.xyz
 DOMAIN-SUFFIX,ad.12306.cn
 DOMAIN-SUFFIX,ad.3.cn
 DOMAIN-SUFFIX,ad.95306.cn
@@ -1114,7 +1119,9 @@ DOMAIN-SUFFIX,dol.tianyaui.cn
 DOMAIN-SUFFIX,dw.xcar.com.cn
 DOMAIN-SUFFIX,e.nexac.com
 DOMAIN-SUFFIX,eq.10jqka.com.cn
+DOMAIN-SUFFIX,erebor.douban.com
 DOMAIN-SUFFIX,exp.17wo.cn
+DOMAIN-SUFFIX,fund.10jqka.com.cn
 DOMAIN-SUFFIX,game.51yund.com
 DOMAIN-SUFFIX,ganjituiguang.ganji.com
 DOMAIN-SUFFIX,grand.ele.me
--- a/base/rules/ACL4SSR/Clash/ChinaDomain.list
+++ b/base/rules/ACL4SSR/Clash/ChinaDomain.list
@@ -1,19 +1,13 @@
 # 直连列表

 # MyList
-DOMAIN-SUFFIX,13th.tech
 DOMAIN-SUFFIX,423down.com
 DOMAIN-SUFFIX,bokecc.com
 DOMAIN-SUFFIX,chaipip.com
-DOMAIN-SUFFIX,chinaplay.store
 DOMAIN-SUFFIX,hrtsea.com
 DOMAIN-SUFFIX,kaikeba.com
 DOMAIN-SUFFIX,laomo.me
 DOMAIN-SUFFIX,mpyit.com
-DOMAIN-SUFFIX,msftconnecttest.com
-DOMAIN-SUFFIX,msftncsi.com
-DOMAIN-SUFFIX,qupu123.com
-DOMAIN-SUFFIX,pdfwifi.com

 # CN域名直连
 DOMAIN-SUFFIX,cn
@@ -67,7 +61,6 @@ DOMAIN-SUFFIX,alibaba.com
 DOMAIN-SUFFIX,alibabacloud.com
 DOMAIN-SUFFIX,alibabausercontent.com
 DOMAIN-SUFFIX,alicdn.com
-DOMAIN-SUFFIX,alicloudccp.com
 DOMAIN-SUFFIX,aliexpress.com
 DOMAIN-SUFFIX,aliimg.com
 DOMAIN-SUFFIX,alikunlun.com
@@ -77,7 +70,6 @@ DOMAIN-SUFFIX,alisoft.com
 DOMAIN-SUFFIX,aliyun.com
 DOMAIN-SUFFIX,aliyuncdn.com
 DOMAIN-SUFFIX,aliyuncs.com
-DOMAIN-SUFFIX,aliyundrive.com
 DOMAIN-SUFFIX,amap.com
 DOMAIN-SUFFIX,autonavi.com
 DOMAIN-SUFFIX,dingtalk.com
@@ -116,18 +108,13 @@ DOMAIN-SUFFIX,yunjiasu-cdn.net
 DOMAIN-SUFFIX,acg.tv
 DOMAIN-SUFFIX,acgvideo.com
 DOMAIN-SUFFIX,b23.tv
-DOMAIN-SUFFIX,bigfun.cn
-DOMAIN-SUFFIX,bigfunapp.cn
 DOMAIN-SUFFIX,biliapi.com
 DOMAIN-SUFFIX,biliapi.net
-DOMAIN-SUFFIX,bilibili.com
 DOMAIN-SUFFIX,biligame.com
 DOMAIN-SUFFIX,biligame.net
 DOMAIN-SUFFIX,bilivideo.com
-DOMAIN-SUFFIX,bilivideo.cn
 DOMAIN-SUFFIX,hdslb.com
 DOMAIN-SUFFIX,im9.com
-DOMAIN-SUFFIX,smtcdns.net

 # Blizzard
 DOMAIN-SUFFIX,battle.net
@@ -177,7 +164,6 @@ DOMAIN-SUFFIX,udache.com
 # Douyu 斗鱼
 DOMAIN-SUFFIX,douyu.com
 DOMAIN-SUFFIX,douyu.tv
-DOMAIN-SUFFIX,douyuscdn.com
 DOMAIN-SUFFIX,douyutv.com

 # Epic
@@ -308,6 +294,12 @@ DOMAIN-SUFFIX,playstationnetwork.com
 DOMAIN-SUFFIX,sony.com
 DOMAIN-SUFFIX,sonyentertainmentnetwork.com

+# Spark
+DOMAIN-SUFFIX,amplitude.com
+DOMAIN-SUFFIX,firebaseio.com
+DOMAIN-SUFFIX,hockeyapp.net
+DOMAIN-SUFFIX,smartmailcloud.com
+
 # SteamCN
 DOMAIN-SUFFIX,csgo.wmsj.cn
 DOMAIN-SUFFIX,dl.steam.ksyna.com
@@ -315,14 +307,13 @@ DOMAIN-SUFFIX,dota2.wmsj.cn
 DOMAIN-SUFFIX,st.dl.bscstorage.net
 DOMAIN-SUFFIX,st.dl.eccdnx.com
 DOMAIN-SUFFIX,st.dl.pinyuncloud.com
-DOMAIN-SUFFIX,steamcommunity-a.akamaihd.net
+DOMAIN-SUFFIX,steamcdn-a.akamaihd.net
 DOMAIN-SUFFIX,steamcontent.com
 DOMAIN-SUFFIX,steamgames.com
 DOMAIN-SUFFIX,steampowered.com.8686c.com
 DOMAIN-SUFFIX,steamstat.us
 DOMAIN-SUFFIX,steamstatic.com
 DOMAIN-SUFFIX,steamusercontent.com
-DOMAIN-SUFFIX,steamuserimages-a.akamaihd.net

 # Tencent
 DOMAIN-SUFFIX,foxmail.com
@@ -367,7 +358,7 @@ DOMAIN-SUFFIX,xunlei.com

 # YYeTs 人人影视
 DOMAIN-SUFFIX,got001.com
-DOMAIN-SUFFIX,p4pfile.com
+DOMAIN-SUFFIX,jstucdn.com
 DOMAIN-SUFFIX,rrys.tv
 DOMAIN-SUFFIX,rrys2020.com
 DOMAIN-SUFFIX,yyets.com
@@ -386,7 +377,6 @@ DOMAIN-SUFFIX,zmzfile.com
 DOMAIN-KEYWORD,announce
 DOMAIN-KEYWORD,torrent
 DOMAIN-KEYWORD,tracker
-DOMAIN-SUFFIX,animebytes.tv
 DOMAIN-SUFFIX,animetorrents.me
 DOMAIN-SUFFIX,awesome-hd.me
 DOMAIN-SUFFIX,beitai.pt
@@ -442,6 +432,7 @@ IP-CIDR6,2a0b:b583::/48,no-resolve
 DOMAIN-SUFFIX,baomitu.com
 DOMAIN-SUFFIX,bootcss.com
 DOMAIN-SUFFIX,jiasule.com
+DOMAIN-SUFFIX,jsdelivr.net
 DOMAIN-SUFFIX,staticfile.org
 DOMAIN-SUFFIX,upaiyun.com

@@ -526,6 +517,7 @@ DOMAIN-SUFFIX,geetest.com
 DOMAIN-SUFFIX,geilicdn.com
 DOMAIN-SUFFIX,ghpym.com
 DOMAIN-SUFFIX,godic.net
+DOMAIN-SUFFIX,gravatar.com
 DOMAIN-SUFFIX,guazi.com
 DOMAIN-SUFFIX,gwdang.com
 DOMAIN-SUFFIX,gzlzfm.com
@@ -561,10 +553,9 @@ DOMAIN-SUFFIX,kugou.com
 DOMAIN-SUFFIX,lancdns.com
 DOMAIN-SUFFIX,landiannews.com
 DOMAIN-SUFFIX,lanzou.com
-DOMAIN-SUFFIX,lanzoui.com
-DOMAIN-SUFFIX,lanzoux.com
 DOMAIN-SUFFIX,lemicp.com
 DOMAIN-SUFFIX,letitfly.me
+DOMAIN-SUFFIX,linkedin.com
 DOMAIN-SUFFIX,lizhi.fm
 DOMAIN-SUFFIX,lizhi.io
 DOMAIN-SUFFIX,lizhifm.com
@@ -595,6 +586,7 @@ DOMAIN-SUFFIX,onlinedown.net
 DOMAIN-SUFFIX,oracle.com
 DOMAIN-SUFFIX,oschina.net
 DOMAIN-SUFFIX,ourdvs.com
+DOMAIN-SUFFIX,overcast.fm
 DOMAIN-SUFFIX,paypal.com
 DOMAIN-SUFFIX,polyv.net
 DOMAIN-SUFFIX,qbox.me
@@ -628,10 +620,10 @@ DOMAIN-SUFFIX,sm.ms
 DOMAIN-SUFFIX,smzdm.com
 DOMAIN-SUFFIX,snwx.com
 DOMAIN-SUFFIX,soufunimg.com
+DOMAIN-SUFFIX,ssl-images-amazon.com
 DOMAIN-SUFFIX,sspai.com
 DOMAIN-SUFFIX,startssl.com
 DOMAIN-SUFFIX,suning.com
-DOMAIN-SUFFIX,synology.com
 DOMAIN-SUFFIX,taihe.com
 DOMAIN-SUFFIX,th-sjy.com
 DOMAIN-SUFFIX,tianqi.com
@@ -650,6 +642,7 @@ DOMAIN-SUFFIX,umengcloud.com
 DOMAIN-SUFFIX,upyun.com
 DOMAIN-SUFFIX,uxengine.net
 DOMAIN-SUFFIX,videocc.net
+DOMAIN-SUFFIX,vmware.com
 DOMAIN-SUFFIX,wandoujia.com
 DOMAIN-SUFFIX,weather.com
 DOMAIN-SUFFIX,weico.cc
--- a/base/rules/ACL4SSR/Clash/ChinaIp.list
+++ b/base/rules/ACL4SSR/Clash/ChinaIp.list
--- a/base/rules/ACL4SSR/Clash/ChinaMedia.list
+++ b/base/rules/ACL4SSR/Clash/ChinaMedia.list
@@ -1,12 +1,10 @@
 # 内容：中国媒体列表
-# 更新：2021-12-26 21:01:13
-# 数量：45条
+# 更新：2020-07-04 22:13:12
+# 数量：31条

 # Bilibili 哔哩哔哩
 USER-AGENT,Bilibili*
 USER-AGENT,bili*
-USER-AGENT,bili-inter*
-DOMAIN,apiintl.biliapi.net
 DOMAIN,upos-hz-mirrorakam.akamaized.net
 DOMAIN-SUFFIX,acg.tv
 DOMAIN-SUFFIX,acgvideo.com
@@ -19,30 +17,19 @@ DOMAIN-SUFFIX,bilibili.com
 DOMAIN-SUFFIX,bilibili.tv
 DOMAIN-SUFFIX,biligame.com
 DOMAIN-SUFFIX,biligame.net
-DOMAIN-SUFFIX,bilivideo.cn
 DOMAIN-SUFFIX,bilivideo.com
 DOMAIN-SUFFIX,hdslb.com
 DOMAIN-SUFFIX,im9.com
 DOMAIN-SUFFIX,smtcdns.net

 # Iqiyi 爱奇艺
-USER-AGENT,QYPlayer*
-USER-AGENT,iQIYI*
-DOMAIN,intel-cache.m.iqiyi.com
-DOMAIN,intel-cache.video.iqiyi.com
-DOMAIN,intl-rcd.iqiyi.com
-DOMAIN,intl-subscription.iqiyi.com
-DOMAIN-SUFFIX,inter.iqiyi.com
-DOMAIN-SUFFIX,inter.ptqy.gitv.tv
-DOMAIN-SUFFIX,intl.iqiyi.com
-DOMAIN-SUFFIX,iq.com
-IP-CIDR,23.40.241.251/32,no-resolve
-IP-CIDR,23.40.242.10/32,no-resolve
-IP-CIDR,103.44.56.0/22,no-resolve
-IP-CIDR,118.26.32.0/23,no-resolve
-IP-CIDR,118.26.120.0/24,no-resolve
-IP-CIDR,223.119.62.225/28,no-resolve
-URL-REGEX,^https?:\/\/int[\w-\.]+iqiyi\.com
+USER-AGENT,QIYI*
+USER-AGENT,iQiYi*
+DOMAIN-KEYWORD,qiyi
+DOMAIN-SUFFIX,qy.net
+IP-CIDR,101.224.0.0/13,no-resolve
+IP-CIDR,101.227.0.0/16,no-resolve
+IP-CIDR,119.176.0.0/12,no-resolve

 # Letv 乐视
 DOMAIN-SUFFIX,api.mob.app.letv.com
@@ -56,5 +43,4 @@ DOMAIN-SUFFIX,v.smtcdns.com
 DOMAIN-SUFFIX,vv.video.qq.com

 # Youku 优酷
-DOMAIN-SUFFIX,youku.com
 IP-CIDR,106.11.0.0/16,no-resolve
--- a/base/rules/ACL4SSR/Clash/Download.list
+++ b/base/rules/ACL4SSR/Clash/Download.list
@@ -1,13 +1,13 @@
 # Mac Download
-PROCESS-NAME,aria2c.exe
-PROCESS-NAME,fdm.exe
-PROCESS-NAME,Folx.exe
-PROCESS-NAME,NetTransport.exe
-PROCESS-NAME,Thunder.exe
-PROCESS-NAME,Transmission.exe
-PROCESS-NAME,uTorrent.exe
-PROCESS-NAME,WebTorrent.exe
-PROCESS-NAME,WebTorrent Helper.exe
+PROCESS-NAME,aria2c
+PROCESS-NAME,fdm
+PROCESS-NAME,Folx
+PROCESS-NAME,NetTransport
+PROCESS-NAME,Thunder
+PROCESS-NAME,Transmission
+PROCESS-NAME,uTorrent
+PROCESS-NAME,WebTorrent
+PROCESS-NAME,WebTorrent Helper
 # bt
 DOMAIN-SUFFIX,smtp
 DOMAIN-KEYWORD,aria2
@@ -17,10 +17,10 @@ URL-REGEX,(.+.|^)(360|so|qihoo|360safe|qhimg|360totalsecurity|yunpan).(cn|com)
 URL-REGEX,(.+.)?(torrent|announce.php?passkey=|tracker|BitTorrent|bt_key|ed2k|find_node|get_peers|info_hash|magnet:|peer_id=|xunlei)(..+)?
 # XunLei
 URL-REGEX,(.?)(xunlei|sandai|Thunder|XLLiveUD)(.)
-PROCESS-NAME,DownloadService.exe
+PROCESS-NAME,DownloadService
 # 360
 URL-REGEX,(.+\.|^)(360|so)\.(cn|com)
 # Tencent Weiyun
-PROCESS-NAME,Weiyun.exe
+PROCESS-NAME,Weiyun
 #Baidu disk
-PROCESS-NAME,baidunetdisk.exe
+PROCESS-NAME,baidunetdisk
--- a/base/rules/ACL4SSR/Clash/GoogleCN.list
+++ b/base/rules/ACL4SSR/Clash/GoogleCN.list
@@ -24,9 +24,23 @@ DOMAIN-SUFFIX,googletagmanager.com
 DOMAIN-SUFFIX,googletagservices.com
 DOMAIN-SUFFIX,gtm.oasisfeng.com
 DOMAIN-SUFFIX,imasdk.googleapis.com
+DOMAIN-SUFFIX,kh.google.com
+DOMAIN-SUFFIX,khm.google.com
+DOMAIN-SUFFIX,khm.googleapis.com
+DOMAIN-SUFFIX,khm0.google.com
+DOMAIN-SUFFIX,khm0.googleapis.com
+DOMAIN-SUFFIX,khm1.google.com
+DOMAIN-SUFFIX,khm1.googleapis.com
+DOMAIN-SUFFIX,khm2.google.com
+DOMAIN-SUFFIX,khm2.googleapis.com
+DOMAIN-SUFFIX,khm3.google.com
+DOMAIN-SUFFIX,khm3.googleapis.com
+DOMAIN-SUFFIX,khmdb.google.com
+DOMAIN-SUFFIX,khmdb.googleapis.com
 DOMAIN-SUFFIX,mtalk.google.com
 DOMAIN-SUFFIX,ocsp.pki.goog
 DOMAIN-SUFFIX,recaptcha.net
+DOMAIN-SUFFIX,redirector.gvt1.com
 DOMAIN-SUFFIX,safebrowsing-cache.google.com
 DOMAIN-SUFFIX,safebrowsing.googleapis.com
 DOMAIN-SUFFIX,settings.crashlytics.com
--- a/base/rules/ACL4SSR/Clash/LocalAreaNetwork.list
+++ b/base/rules/ACL4SSR/Clash/LocalAreaNetwork.list
@@ -2,7 +2,7 @@
 # 参考：https://en.wikipedia.org/wiki/Reserved_IP_addresses

 # ACL4SSR标志 如没有，代表不是用ACL4SSR规则
-DOMAIN-SUFFIX,acl4.ssr
+DOMAIN-SUFFIX,acl4ssr

 # 本地/局域网地址
 DOMAIN-SUFFIX,ip6-localhost
@@ -14,7 +14,6 @@ IP-CIDR,100.64.0.0/10,no-resolve
 IP-CIDR,127.0.0.0/8,no-resolve
 IP-CIDR,172.16.0.0/12,no-resolve
 IP-CIDR,192.168.0.0/16,no-resolve
-IP-CIDR,198.18.0.0/16,no-resolve
 IP-CIDR6,::1/128,no-resolve
 IP-CIDR6,fc00::/7,no-resolve
 IP-CIDR6,fe80::/10,no-resolve
--- a/base/rules/ACL4SSR/Clash/Microsoft.list
+++ b/base/rules/ACL4SSR/Clash/Microsoft.list
@@ -33,7 +33,6 @@ DOMAIN-SUFFIX,msftauth.net
 DOMAIN-SUFFIX,msftauthimages.net
 DOMAIN-SUFFIX,msftidentity.com
 DOMAIN-SUFFIX,msidentity.com
-DOMAIN-SUFFIX,msn.cn
 DOMAIN-SUFFIX,msn.com
 DOMAIN-SUFFIX,msocdn.com
 DOMAIN-SUFFIX,msocsp.com
--- a/base/rules/ACL4SSR/Clash/ProxyGFWlist.list
+++ b/base/rules/ACL4SSR/Clash/ProxyGFWlist.list
@@ -2,25 +2,21 @@

 # MyList && Other
 DOMAIN-SUFFIX,1password.com
-DOMAIN-SUFFIX,adguard.org
 DOMAIN-SUFFIX,bit.no.com
 DOMAIN-SUFFIX,btlibrary.me
 DOMAIN-SUFFIX,cccat.io
 DOMAIN-SUFFIX,cloudcone.com
 DOMAIN-SUFFIX,gameloft.com
-DOMAIN-SUFFIX,garena.com
-DOMAIN-SUFFIX,hoyolab.com
 DOMAIN-SUFFIX,inoreader.com
 DOMAIN-SUFFIX,ip138.com
-DOMAIN-SUFFIX,linkedin.com
-DOMAIN-SUFFIX,myteamspeak.com
-DOMAIN-SUFFIX,notion.so
 DOMAIN-SUFFIX,ping.pe
 DOMAIN-SUFFIX,reddit.com
 DOMAIN-SUFFIX,teddysun.com
 DOMAIN-SUFFIX,tumbex.com
 DOMAIN-SUFFIX,twdvd.com
 DOMAIN-SUFFIX,unsplash.com
+DOMAIN-SUFFIX,xn--i2ru8q2qg.com
+DOMAIN-SUFFIX,yunpanjingling.com

 # 国外域名
 DOMAIN-SUFFIX,eu
@@ -237,7 +233,6 @@ DOMAIN-SUFFIX,akademiye.org
 DOMAIN-SUFFIX,akamai.net
 DOMAIN-SUFFIX,akamaihd.net
 DOMAIN-SUFFIX,akamaistream.net
-DOMAIN-SUFFIX,akamaized.net
 DOMAIN-SUFFIX,akiba-online.com
 DOMAIN-SUFFIX,akiba-web.com
 DOMAIN-SUFFIX,akow.org
@@ -253,7 +248,6 @@ DOMAIN-SUFFIX,alhayat.com
 DOMAIN-SUFFIX,alicejapan.co.jp
 DOMAIN-SUFFIX,aliengu.com
 DOMAIN-SUFFIX,alkasir.com
-DOMAIN-SUFFIX,all4mom.org
 DOMAIN-SUFFIX,allcoin.com
 DOMAIN-SUFFIX,allconnected.co
 DOMAIN-SUFFIX,alldrawnsex.com
@@ -331,7 +325,6 @@ DOMAIN-SUFFIX,antiwave.net
 DOMAIN-SUFFIX,anws.gov.tw
 DOMAIN-SUFFIX,anyporn.com
 DOMAIN-SUFFIX,anysex.com
-DOMAIN-SUFFIX,ao3.org
 DOMAIN-SUFFIX,aobo.com.au
 DOMAIN-SUFFIX,aofriend.com
 DOMAIN-SUFFIX,aofriend.com.au
@@ -349,7 +342,7 @@ DOMAIN-SUFFIX,api.ai
 DOMAIN-SUFFIX,apiary.io
 DOMAIN-SUFFIX,apigee.com
 DOMAIN-SUFFIX,apk-dl.com
-DOMAIN-SUFFIX,apkcombo.com
+DOMAIN-SUFFIX,apkdler.com
 DOMAIN-SUFFIX,apkmirror.com
 DOMAIN-SUFFIX,apkmonk.com
 DOMAIN-SUFFIX,apkplz.com
@@ -368,10 +361,7 @@ DOMAIN-SUFFIX,archive.fo
 DOMAIN-SUFFIX,archive.is
 DOMAIN-SUFFIX,archive.li
 DOMAIN-SUFFIX,archive.org
-DOMAIN-SUFFIX,archive.ph
 DOMAIN-SUFFIX,archive.today
-DOMAIN-SUFFIX,archiveofourown.com
-DOMAIN-SUFFIX,archiveofourown.org
 DOMAIN-SUFFIX,archives.gov
 DOMAIN-SUFFIX,archives.gov.tw
 DOMAIN-SUFFIX,arctosia.com
@@ -702,7 +692,6 @@ DOMAIN-SUFFIX,cacnw.com
 DOMAIN-SUFFIX,cactusvpn.com
 DOMAIN-SUFFIX,cafepress.com
 DOMAIN-SUFFIX,cahr.org.tw
-DOMAIN-SUFFIX,caijinglengyan.com
 DOMAIN-SUFFIX,calameo.com
 DOMAIN-SUFFIX,calebelston.com
 DOMAIN-SUFFIX,calgarychinese.ca
@@ -715,7 +704,6 @@ DOMAIN-SUFFIX,cam4.com
 DOMAIN-SUFFIX,cam4.jp
 DOMAIN-SUFFIX,cam4.sg
 DOMAIN-SUFFIX,camfrog.com
-DOMAIN-SUFFIX,campaignforuyghurs.org
 DOMAIN-SUFFIX,cams.com
 DOMAIN-SUFFIX,cams.org.sg
 DOMAIN-SUFFIX,canadameet.com
@@ -750,8 +738,7 @@ DOMAIN-SUFFIX,cattt.com
 DOMAIN-SUFFIX,cbc.ca
 DOMAIN-SUFFIX,cbsnews.com
 DOMAIN-SUFFIX,cbtc.org.hk
-DOMAIN-SUFFIX,cccat.cc
-DOMAIN-SUFFIX,cccat.co
+DOMAIN-SUFFIX,cccat.io
 DOMAIN-SUFFIX,ccdtr.org
 DOMAIN-SUFFIX,cchere.com
 DOMAIN-SUFFIX,ccim.org
@@ -1168,8 +1155,6 @@ DOMAIN-SUFFIX,dipity.com
 DOMAIN-SUFFIX,directcreative.com
 DOMAIN-SUFFIX,discoins.com
 DOMAIN-SUFFIX,disconnect.me
-DOMAIN-SUFFIX,discord.com
-DOMAIN-SUFFIX,discord.gg
 DOMAIN-SUFFIX,discordapp.com
 DOMAIN-SUFFIX,discordapp.net
 DOMAIN-SUFFIX,discuss.com.hk
@@ -1256,7 +1241,6 @@ DOMAIN-SUFFIX,dtiblog.com
 DOMAIN-SUFFIX,dtic.mil
 DOMAIN-SUFFIX,dtwang.org
 DOMAIN-SUFFIX,duanzhihu.com
-DOMAIN-SUFFIX,dubox.com
 DOMAIN-SUFFIX,duck.com
 DOMAIN-SUFFIX,duckdns.org
 DOMAIN-SUFFIX,duckduckgo.com
@@ -1662,7 +1646,6 @@ DOMAIN-SUFFIX,freefuckvids.com
 DOMAIN-SUFFIX,freegao.com
 DOMAIN-SUFFIX,freehongkong.org
 DOMAIN-SUFFIX,freeilhamtohti.org
-DOMAIN-SUFFIX,freekazakhs.org
 DOMAIN-SUFFIX,freekwonpyong.org
 DOMAIN-SUFFIX,freelotto.com
 DOMAIN-SUFFIX,freeman2.com
@@ -1748,7 +1731,6 @@ DOMAIN-SUFFIX,g6hentai.com
 DOMAIN-SUFFIX,gabocorp.com
 DOMAIN-SUFFIX,gaeproxy.com
 DOMAIN-SUFFIX,gaforum.org
-DOMAIN-SUFFIX,gagaoolala.com
 DOMAIN-SUFFIX,galaxymacau.com
 DOMAIN-SUFFIX,galenwu.com
 DOMAIN-SUFFIX,galstars.net
@@ -1838,7 +1820,6 @@ DOMAIN-SUFFIX,git.io
 DOMAIN-SUFFIX,gitbooks.io
 DOMAIN-SUFFIX,github.com
 DOMAIN-SUFFIX,github.io
-DOMAIN-SUFFIX,githubassets.com
 DOMAIN-SUFFIX,githubusercontent.com
 DOMAIN-SUFFIX,gizlen.net
 DOMAIN-SUFFIX,gjczz.com
@@ -1864,7 +1845,6 @@ DOMAIN-SUFFIX,gmiddle.net
 DOMAIN-SUFFIX,gmll.org
 DOMAIN-SUFFIX,gmodules.com
 DOMAIN-SUFFIX,gnci.org.hk
-DOMAIN-SUFFIX,gnews.org
 DOMAIN-SUFFIX,go-pki.com
 DOMAIN-SUFFIX,go141.com
 DOMAIN-SUFFIX,goagent.biz
@@ -2175,7 +2155,6 @@ DOMAIN-SUFFIX,gs-discuss.com
 DOMAIN-SUFFIX,gstatic.com
 DOMAIN-SUFFIX,gtricks.com
 DOMAIN-SUFFIX,gts-vpn.com
-DOMAIN-SUFFIX,gtv.org
 DOMAIN-SUFFIX,gu-chu-sum.org
 DOMAIN-SUFFIX,guaguass.com
 DOMAIN-SUFFIX,guaguass.org
@@ -2255,7 +2234,6 @@ DOMAIN-SUFFIX,hellouk.org
 DOMAIN-SUFFIX,helpeachpeople.com
 DOMAIN-SUFFIX,helplinfen.com
 DOMAIN-SUFFIX,helpster.de
-DOMAIN-SUFFIX,helpuyghursnow.org
 DOMAIN-SUFFIX,helpzhuling.org
 DOMAIN-SUFFIX,hentai.to
 DOMAIN-SUFFIX,hentaitube.tv
@@ -2318,7 +2296,6 @@ DOMAIN-SUFFIX,hkci.org.hk
 DOMAIN-SUFFIX,hkcmi.edu
 DOMAIN-SUFFIX,hkcnews.com
 DOMAIN-SUFFIX,hkcoc.com
-DOMAIN-SUFFIX,hkctu.org.hk
 DOMAIN-SUFFIX,hkdailynews.com.hk
 DOMAIN-SUFFIX,hkday.net
 DOMAIN-SUFFIX,hkdf.org
@@ -2425,7 +2402,6 @@ DOMAIN-SUFFIX,huffingtonpost.com
 DOMAIN-SUFFIX,hugoroy.eu
 DOMAIN-SUFFIX,huhaitai.com
 DOMAIN-SUFFIX,huhamhire.com
-DOMAIN-SUFFIX,huhangfei.com
 DOMAIN-SUFFIX,huiyi.in
 DOMAIN-SUFFIX,hulkshare.com
 DOMAIN-SUFFIX,hulu.com
@@ -2509,7 +2485,6 @@ DOMAIN-SUFFIX,ihao.org
 DOMAIN-SUFFIX,iicns.com
 DOMAIN-SUFFIX,ikstar.com
 DOMAIN-SUFFIX,ikwb.com
-DOMAIN-SUFFIX,ilhamtohtiinstitute.org
 DOMAIN-SUFFIX,illusionfactory.com
 DOMAIN-SUFFIX,ilove80.be
 DOMAIN-SUFFIX,ilovelongtoes.com
@@ -2733,7 +2708,6 @@ DOMAIN-SUFFIX,jwmusic.org
 DOMAIN-SUFFIX,jyxf.net
 DOMAIN-SUFFIX,k-doujin.net
 DOMAIN-SUFFIX,ka-wai.com
-DOMAIN-SUFFIX,kadokawa.co.jp
 DOMAIN-SUFFIX,kagyu.org
 DOMAIN-SUFFIX,kagyu.org.za
 DOMAIN-SUFFIX,kagyumonlam.org
@@ -2974,7 +2948,6 @@ DOMAIN-SUFFIX,lvv2.com
 DOMAIN-SUFFIX,lyfhk.net
 DOMAIN-SUFFIX,lzmtnews.org
 DOMAIN-SUFFIX,m-sport.co.uk
-DOMAIN-SUFFIX,m-team.cc
 DOMAIN-SUFFIX,m.me
 DOMAIN-SUFFIX,macgamestore.com
 DOMAIN-SUFFIX,macrovpn.com
@@ -3101,7 +3074,6 @@ DOMAIN-SUFFIX,mimiai.net
 DOMAIN-SUFFIX,mimivip.com
 DOMAIN-SUFFIX,mimivv.com
 DOMAIN-SUFFIX,mindrolling.org
-DOMAIN-SUFFIX,mingdemedia.org
 DOMAIN-SUFFIX,minghui-a.org
 DOMAIN-SUFFIX,minghui-b.org
 DOMAIN-SUFFIX,minghui-school.org
@@ -3204,7 +3176,6 @@ DOMAIN-SUFFIX,msn.com.tw
 DOMAIN-SUFFIX,mswe1.org
 DOMAIN-SUFFIX,mthruf.com
 DOMAIN-SUFFIX,mtw.tl
-DOMAIN-SUFFIX,mubi.com
 DOMAIN-SUFFIX,muchosucko.com
 DOMAIN-SUFFIX,mullvad.net
 DOMAIN-SUFFIX,multiply.com
@@ -3297,7 +3268,6 @@ DOMAIN-SUFFIX,nat.gov.tw
 DOMAIN-SUFFIX,nat.moe
 DOMAIN-SUFFIX,natado.com
 DOMAIN-SUFFIX,national-lottery.co.uk
-DOMAIN-SUFFIX,nationalawakening.org
 DOMAIN-SUFFIX,nationalgeographic.com
 DOMAIN-SUFFIX,nationsonline.org
 DOMAIN-SUFFIX,nationwide.com
@@ -3385,7 +3355,6 @@ DOMAIN-SUFFIX,ninjacloak.com
 DOMAIN-SUFFIX,ninjaproxy.ninja
 DOMAIN-SUFFIX,nintendium.com
 DOMAIN-SUFFIX,ninth.biz
-DOMAIN-SUFFIX,nitter.net
 DOMAIN-SUFFIX,niu.moe
 DOMAIN-SUFFIX,niusnews.com
 DOMAIN-SUFFIX,njactb.org
@@ -3535,7 +3504,6 @@ DOMAIN-SUFFIX,opendn.xyz
 DOMAIN-SUFFIX,openervpn.in
 DOMAIN-SUFFIX,openid.net
 DOMAIN-SUFFIX,openleaks.org
-DOMAIN-SUFFIX,opensource.google
 DOMAIN-SUFFIX,openvpn.net
 DOMAIN-SUFFIX,openvpn.org
 DOMAIN-SUFFIX,openwebster.com
@@ -3604,8 +3572,6 @@ DOMAIN-SUFFIX,paperb.us
 DOMAIN-SUFFIX,paradisehill.cc
 DOMAIN-SUFFIX,paradisepoker.com
 DOMAIN-SUFFIX,parkansky.com
-DOMAIN-SUFFIX,parler.com
-DOMAIN-SUFFIX,parsevideo.com
 DOMAIN-SUFFIX,partycasino.com
 DOMAIN-SUFFIX,partypoker.com
 DOMAIN-SUFFIX,passion.com
@@ -3804,7 +3770,6 @@ DOMAIN-SUFFIX,proyectoclubes.com
 DOMAIN-SUFFIX,prozz.net
 DOMAIN-SUFFIX,psblog.name
 DOMAIN-SUFFIX,pscp.tv
-DOMAIN-SUFFIX,pshvpn.com
 DOMAIN-SUFFIX,psiphon.ca
 DOMAIN-SUFFIX,psiphon3.com
 DOMAIN-SUFFIX,psiphontoday.com
@@ -3873,7 +3838,6 @@ DOMAIN-SUFFIX,r18.com
 DOMAIN-SUFFIX,ra.gg
 DOMAIN-SUFFIX,radicalparty.org
 DOMAIN-SUFFIX,radiko.jp
-DOMAIN-SUFFIX,radio.garden
 DOMAIN-SUFFIX,radioaustralia.net.au
 DOMAIN-SUFFIX,radiohilight.net
 DOMAIN-SUFFIX,radiotime.com
@@ -3916,7 +3880,6 @@ DOMAIN-SUFFIX,realcourage.org
 DOMAIN-SUFFIX,realitykings.com
 DOMAIN-SUFFIX,realraptalk.com
 DOMAIN-SUFFIX,realsexpass.com
-DOMAIN-SUFFIX,reason.com
 DOMAIN-SUFFIX,rebatesrule.net
 DOMAIN-SUFFIX,recaptcha.net
 DOMAIN-SUFFIX,recordhistory.org
@@ -3945,7 +3908,6 @@ DOMAIN-SUFFIX,renminbao.com
 DOMAIN-SUFFIX,renyurenquan.org
 DOMAIN-SUFFIX,rerouted.org
 DOMAIN-SUFFIX,resilio.com
-DOMAIN-SUFFIX,resistchina.org
 DOMAIN-SUFFIX,retweeteffect.com
 DOMAIN-SUFFIX,retweetist.com
 DOMAIN-SUFFIX,retweetrank.com
@@ -4145,7 +4107,6 @@ DOMAIN-SUFFIX,shkspr.mobi
 DOMAIN-SUFFIX,shodanhq.com
 DOMAIN-SUFFIX,shooshtime.com
 DOMAIN-SUFFIX,shop2000.com.tw
-DOMAIN-SUFFIX,shopee.tw
 DOMAIN-SUFFIX,shopping.com
 DOMAIN-SUFFIX,showhaotu.com
 DOMAIN-SUFFIX,showtime.jp
@@ -4322,7 +4283,6 @@ DOMAIN-SUFFIX,sstmlt.net
 DOMAIN-SUFFIX,stackoverflow.com
 DOMAIN-SUFFIX,stage64.hk
 DOMAIN-SUFFIX,standupfortibet.org
-DOMAIN-SUFFIX,standwithhk.org
 DOMAIN-SUFFIX,stanford.edu
 DOMAIN-SUFFIX,starfishfx.com
 DOMAIN-SUFFIX,starp2p.com
@@ -4335,6 +4295,7 @@ DOMAIN-SUFFIX,staticflickr.com
 DOMAIN-SUFFIX,statueofdemocracy.org
 DOMAIN-SUFFIX,stc.com.sa
 DOMAIN-SUFFIX,steamcommunity.com
+DOMAIN-SUFFIX,steampowered.com
 DOMAIN-SUFFIX,steel-storm.com
 DOMAIN-SUFFIX,steemit.com
 DOMAIN-SUFFIX,steganos.com
@@ -4504,7 +4465,6 @@ DOMAIN-SUFFIX,teddysun.com
 DOMAIN-SUFFIX,teeniefuck.net
 DOMAIN-SUFFIX,teensinasia.com
 DOMAIN-SUFFIX,telecomspace.com
-DOMAIN-SUFFIX,telegra.ph
 DOMAIN-SUFFIX,telegram.dog
 DOMAIN-SUFFIX,telegram.me
 DOMAIN-SUFFIX,telegram.org
@@ -4516,6 +4476,7 @@ DOMAIN-SUFFIX,tenacy.com
 DOMAIN-SUFFIX,tensorflow.org
 DOMAIN-SUFFIX,tenzinpalmo.com
 DOMAIN-SUFFIX,tew.org
+DOMAIN-SUFFIX,textnow.com
 DOMAIN-SUFFIX,textnow.me
 DOMAIN-SUFFIX,tfhub.dev
 DOMAIN-SUFFIX,thaicn.com
@@ -4581,6 +4542,7 @@ DOMAIN-SUFFIX,tianzhu.org
 DOMAIN-SUFFIX,tibet-envoy.eu
 DOMAIN-SUFFIX,tibet-foundation.org
 DOMAIN-SUFFIX,tibet-house-trust.co.uk
+DOMAIN-SUFFIX,tibet-info.net
 DOMAIN-SUFFIX,tibet-initiative.de
 DOMAIN-SUFFIX,tibet-munich.de
 DOMAIN-SUFFIX,tibet.a.se
@@ -4785,7 +4747,6 @@ DOMAIN-SUFFIX,turansam.org
 DOMAIN-SUFFIX,turbobit.net
 DOMAIN-SUFFIX,turbohide.com
 DOMAIN-SUFFIX,turbotwitter.com
-DOMAIN-SUFFIX,turkistantimes.com
 DOMAIN-SUFFIX,turntable.fm
 DOMAIN-SUFFIX,tushycash.com
 DOMAIN-SUFFIX,tutanota.com
@@ -5254,7 +5215,6 @@ DOMAIN-SUFFIX,wingamestore.com
 DOMAIN-SUFFIX,wingy.site
 DOMAIN-SUFFIX,winning11.com
 DOMAIN-SUFFIX,winwhispers.info
-DOMAIN-SUFFIX,wionews.com
 DOMAIN-SUFFIX,wire.com
 DOMAIN-SUFFIX,wiredbytes.com
 DOMAIN-SUFFIX,wiredpen.com
@@ -5372,6 +5332,7 @@ DOMAIN-SUFFIX,xml-training-guide.com
 DOMAIN-SUFFIX,xmovies.com
 DOMAIN-SUFFIX,xn--4gq171p.com
 DOMAIN-SUFFIX,xn--czq75pvv1aj5c.org
+DOMAIN-SUFFIX,xn--i2ru8q2qg.com
 DOMAIN-SUFFIX,xn--ngstr-lra8j.com
 DOMAIN-SUFFIX,xn--oiq.cc
 DOMAIN-SUFFIX,xn--p8j9a0d9c9a.xn--q9jyb4c
@@ -5670,26 +5631,6 @@ DOMAIN-SUFFIX,ytimg.com
 IP-CIDR,74.125.0.0/16,no-resolve
 IP-CIDR,173.194.0.0/16,no-resolve

-# GoogleCNProxyIP 谷歌中国服务 services.googleapis.cn
-IP-CIDR,120.232.181.162/32,no-resolve
-IP-CIDR,120.241.147.226/32,no-resolve
-IP-CIDR,120.253.253.226/32,no-resolve
-IP-CIDR,120.253.255.162/32,no-resolve
-IP-CIDR,120.253.255.34/32,no-resolve
-IP-CIDR,120.253.255.98/32,no-resolve
-IP-CIDR,180.163.150.162/32,no-resolve
-IP-CIDR,180.163.150.34/32,no-resolve
-IP-CIDR,180.163.151.162/32,no-resolve
-IP-CIDR,180.163.151.34/32,no-resolve
-IP-CIDR,203.208.39.0/24,no-resolve
-IP-CIDR,203.208.40.0/24,no-resolve
-IP-CIDR,203.208.41.0/24,no-resolve
-IP-CIDR,203.208.43.0/24,no-resolve
-IP-CIDR,203.208.50.0/24,no-resolve
-IP-CIDR,220.181.174.162/32,no-resolve
-IP-CIDR,220.181.174.226/32,no-resolve
-IP-CIDR,220.181.174.34/32,no-resolve
-
 # Instagram
 DOMAIN-SUFFIX,cdninstagram.com
 DOMAIN-SUFFIX,instagram.com
@@ -5768,21 +5709,13 @@ DOMAIN-SUFFIX,ypncdn.com
 DOMAIN-SUFFIX,pixiv.net
 DOMAIN-SUFFIX,pximg.net

-# Spark
-DOMAIN-SUFFIX,amplitude.com
-DOMAIN-SUFFIX,firebaseio.com
-DOMAIN-SUFFIX,hockeyapp.net
-DOMAIN-SUFFIX,readdle.com
-DOMAIN-SUFFIX,smartmailcloud.com
-
 # Steam
 DOMAIN-SUFFIX,fanatical.com
 DOMAIN-SUFFIX,humblebundle.com
+DOMAIN-SUFFIX,steam-chat.com
 DOMAIN-SUFFIX,steamcommunity.com
-
-# TapTap
-DOMAIN-SUFFIX,tap.io
-DOMAIN-SUFFIX,taptap.tw
+DOMAIN-SUFFIX,steampowered.com
+DOMAIN-SUFFIX,steamstatic.com

 # Twitch
 DOMAIN-SUFFIX,twitch.tv
@@ -5810,10 +5743,6 @@ IP-CIDR6,2001:67c:4e8::/48,no-resolve
 IP-CIDR6,2001:b28:f23d::/48,no-resolve
 IP-CIDR6,2001:b28:f23f::/48,no-resolve

-# TeraBox
-DOMAIN-SUFFIX,terabox.com
-DOMAIN-SUFFIX,teraboxcdn.com
-
 # Whatsapp
 IP-CIDR,18.194.0.0/15,no-resolve
 IP-CIDR,34.224.0.0/12,no-resolve
@@ -5831,20 +5760,6 @@ IP-CIDR,158.85.224.160/27,no-resolve
 IP-CIDR,75.126.150.0/16,no-resolve
 IP-CIDR,69.171.235.0/16,no-resolve

-# Wikipedia 维基相关域名
-DOMAIN-SUFFIX,mediawiki.org
-DOMAIN-SUFFIX,wikibooks.org
-DOMAIN-SUFFIX,wikidata.org
-DOMAIN-SUFFIX,wikileaks.org
-DOMAIN-SUFFIX,wikimedia.org
-DOMAIN-SUFFIX,wikinews.org
-DOMAIN-SUFFIX,wikipedia.org
-DOMAIN-SUFFIX,wikiquote.org
-DOMAIN-SUFFIX,wikisource.org
-DOMAIN-SUFFIX,wikiversity.org
-DOMAIN-SUFFIX,wikivoyage.org
-DOMAIN-SUFFIX,wiktionary.org
-
 #飞流直播
 DOMAIN-SUFFIX,neulion.com
 DOMAIN-SUFFIX,icntv.xyz
--- a/base/rules/ACL4SSR/Clash/ProxyLite.list
+++ b/base/rules/ACL4SSR/Clash/ProxyLite.list
@@ -2,26 +2,21 @@

 # MyList && Other
 DOMAIN-SUFFIX,1password.com
-DOMAIN-SUFFIX,adguard.org
 DOMAIN-SUFFIX,bit.no.com
 DOMAIN-SUFFIX,btlibrary.me
 DOMAIN-SUFFIX,cccat.io
 DOMAIN-SUFFIX,cloudcone.com
-DOMAIN-SUFFIX,dubox.com
 DOMAIN-SUFFIX,gameloft.com
-DOMAIN-SUFFIX,garena.com
-DOMAIN-SUFFIX,hoyolab.com
 DOMAIN-SUFFIX,inoreader.com
 DOMAIN-SUFFIX,ip138.com
-DOMAIN-SUFFIX,linkedin.com
-DOMAIN-SUFFIX,myteamspeak.com
-DOMAIN-SUFFIX,notion.so
 DOMAIN-SUFFIX,ping.pe
 DOMAIN-SUFFIX,reddit.com
 DOMAIN-SUFFIX,teddysun.com
 DOMAIN-SUFFIX,tumbex.com
 DOMAIN-SUFFIX,twdvd.com
 DOMAIN-SUFFIX,unsplash.com
+DOMAIN-SUFFIX,xn--i2ru8q2qg.com
+DOMAIN-SUFFIX,yunpanjingling.com

 # 国外域名
 DOMAIN-SUFFIX,eu
@@ -131,7 +126,6 @@ DOMAIN-SUFFIX,netdna-cdn.com
 DOMAIN-SUFFIX,nintendo.net
 DOMAIN-SUFFIX,nsstatic.net
 DOMAIN-SUFFIX,nytstyle.com
-DOMAIN-SUFFIX,overcast.fm
 DOMAIN-SUFFIX,openvpn.net
 DOMAIN-SUFFIX,periscope.tv
 DOMAIN-SUFFIX,pinimg.com
@@ -166,6 +160,8 @@ DOMAIN-SUFFIX,v2ex.com
 DOMAIN-SUFFIX,vimeo.com
 DOMAIN-SUFFIX,vine.co
 DOMAIN-SUFFIX,vox-cdn.com
+DOMAIN-SUFFIX,wikileaks.org
+DOMAIN-SUFFIX,wikipedia.org

 # Amazon
 DOMAIN-SUFFIX,amazon.co.jp
@@ -273,30 +269,11 @@ DOMAIN-SUFFIX,ytimg.com
 IP-CIDR,74.125.0.0/16,no-resolve
 IP-CIDR,173.194.0.0/16,no-resolve

-# GoogleCNProxyIP 谷歌中国服务 services.googleapis.cn
-IP-CIDR,120.232.181.162/32,no-resolve
-IP-CIDR,120.241.147.226/32,no-resolve
-IP-CIDR,120.253.253.226/32,no-resolve
-IP-CIDR,120.253.255.162/32,no-resolve
-IP-CIDR,120.253.255.34/32,no-resolve
-IP-CIDR,120.253.255.98/32,no-resolve
-IP-CIDR,180.163.150.162/32,no-resolve
-IP-CIDR,180.163.150.34/32,no-resolve
-IP-CIDR,180.163.151.162/32,no-resolve
-IP-CIDR,180.163.151.34/32,no-resolve
-IP-CIDR,203.208.39.0/24,no-resolve
-IP-CIDR,203.208.40.0/24,no-resolve
-IP-CIDR,203.208.41.0/24,no-resolve
-IP-CIDR,203.208.43.0/24,no-resolve
-IP-CIDR,203.208.50.0/24,no-resolve
-IP-CIDR,220.181.174.162/32,no-resolve
-IP-CIDR,220.181.174.226/32,no-resolve
-IP-CIDR,220.181.174.34/32,no-resolve
-
 # Instagram
 DOMAIN-SUFFIX,cdninstagram.com
 DOMAIN-SUFFIX,instagram.com
 DOMAIN-SUFFIX,instagr.am
+DOMAIN-SUFFIX,akamaihd.net

 # Kakao Talk
 DOMAIN-SUFFIX,kakao.com
@@ -370,21 +347,13 @@ DOMAIN-SUFFIX,ypncdn.com
 DOMAIN-SUFFIX,pixiv.net
 DOMAIN-SUFFIX,pximg.net

-# Spark
-DOMAIN-SUFFIX,amplitude.com
-DOMAIN-SUFFIX,firebaseio.com
-DOMAIN-SUFFIX,hockeyapp.net
-DOMAIN-SUFFIX,readdle.com
-DOMAIN-SUFFIX,smartmailcloud.com
-
 # Steam
 DOMAIN-SUFFIX,fanatical.com
 DOMAIN-SUFFIX,humblebundle.com
+DOMAIN-SUFFIX,steam-chat.com
 DOMAIN-SUFFIX,steamcommunity.com
-
-# TapTap
-DOMAIN-SUFFIX,tap.io
-DOMAIN-SUFFIX,taptap.tw
+DOMAIN-SUFFIX,steampowered.com
+DOMAIN-SUFFIX,steamstatic.com

 # Twitch
 DOMAIN-SUFFIX,twitch.tv
@@ -412,10 +381,6 @@ IP-CIDR6,2001:67c:4e8::/48,no-resolve
 IP-CIDR6,2001:b28:f23d::/48,no-resolve
 IP-CIDR6,2001:b28:f23f::/48,no-resolve

-# TeraBox
-DOMAIN-SUFFIX,terabox.com
-DOMAIN-SUFFIX,teraboxcdn.com
-
 # Whatsapp
 IP-CIDR,18.194.0.0/15,no-resolve
 IP-CIDR,34.224.0.0/12,no-resolve
@@ -433,24 +398,10 @@ IP-CIDR,158.85.224.160/27,no-resolve
 IP-CIDR,75.126.150.0/16,no-resolve
 IP-CIDR,69.171.235.0/16,no-resolve

-# Wikipedia 维基相关域名
-DOMAIN-SUFFIX,mediawiki.org
-DOMAIN-SUFFIX,wikibooks.org
-DOMAIN-SUFFIX,wikidata.org
-DOMAIN-SUFFIX,wikileaks.org
-DOMAIN-SUFFIX,wikimedia.org
-DOMAIN-SUFFIX,wikinews.org
-DOMAIN-SUFFIX,wikipedia.org
-DOMAIN-SUFFIX,wikiquote.org
-DOMAIN-SUFFIX,wikisource.org
-DOMAIN-SUFFIX,wikiversity.org
-DOMAIN-SUFFIX,wikivoyage.org
-DOMAIN-SUFFIX,wiktionary.org
-
 #飞流直播
 DOMAIN-SUFFIX,neulion.com
 DOMAIN-SUFFIX,icntv.xyz
 DOMAIN-SUFFIX,flzbcdn.xyz

 #华文电视
-DOMAIN-SUFFIX,ocnttv.com
+DOMAIN-SUFFIX,ocnttv.com
--- a/base/rules/ACL4SSR/Clash/ProxyMedia.list
+++ b/base/rules/ACL4SSR/Clash/ProxyMedia.list
@@ -1,6 +1,6 @@
 # 内容：国外媒体列表
-# 更新：2021-12-26 22:03:43
-# 数量：314条
+# 更新：2020-08-12 23:58:29
+# 数量：283条

 # ABC
 DOMAIN-SUFFIX,edgedatg.com
@@ -20,23 +20,14 @@ DOMAIN-SUFFIX,c4assets.com
 DOMAIN-SUFFIX,channel4.com

 # Amazon
-DOMAIN-KEYWORD,avoddashs
-DOMAIN,atv-ps.amazon.com
-DOMAIN,avodmp4s3ww-a.akamaihd.net
-DOMAIN,d1v5ir2lpwr8os.cloudfront.net
-DOMAIN,d1xfray82862hr.cloudfront.net
-DOMAIN,d22qjgkvxw22r6.cloudfront.net
-DOMAIN,d25xi40x97liuc.cloudfront.net
-DOMAIN,d27xxe7juh1us6.cloudfront.net
-DOMAIN,d3196yreox78o9.cloudfront.net
-DOMAIN,dmqdd6hw24ucf.cloudfront.net
-DOMAIN,ktpx.amazon.com
+USER-AGENT,InstantVideo.US*
+USER-AGENT,Prime%20Video*
 DOMAIN-SUFFIX,aiv-cdn.net
-DOMAIN-SUFFIX,aiv-delivery.net
+DOMAIN-SUFFIX,amazonaws.co.uk
+DOMAIN-SUFFIX,amazonaws.com
 DOMAIN-SUFFIX,amazonvideo.com
-DOMAIN-SUFFIX,media-amazon.com
-DOMAIN-SUFFIX,pv-cdn.net
-URL-REGEX,^https?:\/\/www\.amazon\.com\/(Amazon-Video|gp\/video)\/
+DOMAIN-SUFFIX,llnwd.net
+DOMAIN-SUFFIX,primevideo.com

 # AppleNews
 USER-AGENT,AppleNews*
@@ -59,11 +50,9 @@ DOMAIN,vod-thumb-uk-live.akamaized.net
 DOMAIN-SUFFIX,bbc.co
 DOMAIN-SUFFIX,bbc.co.uk
 DOMAIN-SUFFIX,bbc.com
-DOMAIN-SUFFIX,bbc.net.uk
 DOMAIN-SUFFIX,bbcfmt.hs.llnwd.net
 DOMAIN-SUFFIX,bbci.co
 DOMAIN-SUFFIX,bbci.co.uk
-DOMAIN-SUFFIX,bidi.net.uk

 # Bahamut
 USER-AGENT,Anime*
@@ -71,20 +60,18 @@ DOMAIN,gamer-cds.cdn.hinet.net
 DOMAIN,gamer2-cds.cdn.hinet.net
 DOMAIN-SUFFIX,bahamut.com.tw
 DOMAIN-SUFFIX,gamer.com.tw
+DOMAIN-SUFFIX,hinet.net

 # DAZN
 USER-AGENT,DAZN*
 DOMAIN-KEYWORD,voddazn
 DOMAIN,d151l6v8er5bdm.cloudfront.net
 DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net
-DOMAIN-SUFFIX,d1sgwhnao7452x.cloudfront.net
 DOMAIN-SUFFIX,dazn-api.com
 DOMAIN-SUFFIX,dazn.com
 DOMAIN-SUFFIX,dazndn.com
-DOMAIN-SUFFIX,dcblivedazn.akamaized.net
 DOMAIN-SUFFIX,indazn.com
-DOMAIN-SUFFIX,indaznlab.com
-DOMAIN-SUFFIX,sentry.io
+DOMAIN-SUFFIX,intercom.io

 # Deezer
 USER-AGENT,Deezer*
@@ -94,26 +81,17 @@ DOMAIN-SUFFIX,dzcdn.net
 # DisneyPlus
 USER-AGENT,Disney*
 USER-AGENT,Disney+*
+DOMAIN,cdn.cdn.unid.go.com
 DOMAIN,cdn.registerdisney.go.com
-DOMAIN-SUFFIX,adobedtm.com
-DOMAIN-SUFFIX,bam.nr-data.net
+DOMAIN,global.edge.bamgrid.com
 DOMAIN-SUFFIX,bamgrid.com
 DOMAIN-SUFFIX,braze.com
-DOMAIN-SUFFIX,cdn.optimizely.com
-DOMAIN-SUFFIX,cdn.registerdisney.go.com
-DOMAIN-SUFFIX,cws.conviva.com
-DOMAIN-SUFFIX,d9.flashtalking.com
+DOMAIN-SUFFIX,conviva.com
 DOMAIN-SUFFIX,disney-plus.net
-DOMAIN-SUFFIX,disney-portal.my.onetrust.com
 DOMAIN-SUFFIX,disney.demdex.net
-DOMAIN-SUFFIX,disney.my.sentry.io
-DOMAIN-SUFFIX,disneyplus.bn5x.net
 DOMAIN-SUFFIX,disneyplus.com
-DOMAIN-SUFFIX,disneyplus.com.ssl.sc.omtrdc.net
-DOMAIN-SUFFIX,disneystreaming.com
 DOMAIN-SUFFIX,dssott.com
 DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com
-DOMAIN-SUFFIX,js-agent.newrelic.com

 # EncoreTVB
 USER-AGENT,encoreTVB*
@@ -127,21 +105,35 @@ DOMAIN-SUFFIX,encoretvb.com
 USER-AGENT,FOX%20NOW*
 DOMAIN-SUFFIX,fox.com
 DOMAIN-SUFFIX,foxdcg.com
+DOMAIN-SUFFIX,theplatform.com
 DOMAIN-SUFFIX,uplynk.com

+# FoxPlus
+USER-AGENT,FOXPlus*
+DOMAIN,cdn-fox-networks-group-green.akamaized.net
+DOMAIN,d3cv4a9a9wh0bt.cloudfront.net
+DOMAIN,foxsports01-i.akamaihd.net
+DOMAIN,foxsports02-i.akamaihd.net
+DOMAIN,foxsports03-i.akamaihd.net
+DOMAIN,staticasiafox.akamaized.net
+DOMAIN-SUFFIX,akamaized.net
+DOMAIN-SUFFIX,foxplus.com
+DOMAIN-SUFFIX,theplatform.com
+
 # HBO
 USER-AGENT,HBO%20NOW*
 USER-AGENT,HBOMAX*
+DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com
 DOMAIN-SUFFIX,hbo.com
+DOMAIN-SUFFIX,hboasia.com
 DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbogoasia.com
+DOMAIN-SUFFIX,hbogoasia.hk
 DOMAIN-SUFFIX,hbomax.com
-DOMAIN-SUFFIX,hbomaxcdn.com
 DOMAIN-SUFFIX,hbonow.com

 # HBO_GO_HKG
-USER-AGENT,HBO%20GO%20PROD*
-DOMAIN-KEYWORD,.hbogoasia.
-DOMAIN-KEYWORD,hbogoasia
+USER-AGENT,HBO%20GO%20PROD%20HKG*
 DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
 DOMAIN,bcbolthboa-a.akamaihd.net
 DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
@@ -151,13 +143,8 @@ DOMAIN,hboasia2-i.akamaihd.net
 DOMAIN,hboasia3-i.akamaihd.net
 DOMAIN,hboasia4-i.akamaihd.net
 DOMAIN,hboasia5-i.akamaihd.net
-DOMAIN,hboasialive.akamaized.net
-DOMAIN,hbogoprod-vod.akamaized.net
-DOMAIN,hbolb.onwardsmg.com
-DOMAIN,hbounify-prod.evergent.com
 DOMAIN,players.brightcove.net
 DOMAIN,s3-ap-southeast-1.amazonaws.com
-DOMAIN-SUFFIX,hboasia.com
 DOMAIN-SUFFIX,hbogoasia.com
 DOMAIN-SUFFIX,hbogoasia.hk

@@ -167,21 +154,13 @@ DOMAIN-SUFFIX,5itv.tv
 DOMAIN-SUFFIX,ocnttv.com

 # Hulu
-DOMAIN-SUFFIX,cws-hulu.conviva.com
 DOMAIN-SUFFIX,hulu.com
-DOMAIN-SUFFIX,hulu.hb.omtrdc.net
-DOMAIN-SUFFIX,hulu.sc.omtrdc.net
-DOMAIN-SUFFIX,huluad.com
 DOMAIN-SUFFIX,huluim.com
 DOMAIN-SUFFIX,hulustream.com

 # HuluJapan
 DOMAIN-SUFFIX,happyon.jp
-DOMAIN-SUFFIX,hjholdings.jp
 DOMAIN-SUFFIX,hulu.jp
-DOMAIN-SUFFIX,prod.hjholdings.tv
-DOMAIN-SUFFIX,streaks.jp
-DOMAIN-SUFFIX,yb.uncn.jp

 # ITV
 USER-AGENT,ITV_Player*
@@ -229,7 +208,6 @@ USER-AGENT,LINE*
 DOMAIN,d3c7rimkq79yfu.cloudfront.net
 DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net
 DOMAIN-SUFFIX,linetv.tw
-DOMAIN-SUFFIX,profile.line-scdn.net

 # My5
 USER-AGENT,My5*
@@ -239,17 +217,11 @@ DOMAIN-SUFFIX,my5.tv

 # MyTVSuper
 USER-AGENT,mytv*
-DOMAIN-KEYWORD,nowtv100
-DOMAIN-KEYWORD,rthklive
-DOMAIN,mytvsuperlimited.hb.omtrdc.net
-DOMAIN,mytvsuperlimited.sc.omtrdc.net
 DOMAIN-SUFFIX,mytvsuper.com
 DOMAIN-SUFFIX,tvb.com

 # Netflix
 USER-AGENT,Argo*
-DOMAIN-KEYWORD,dualstack.apiproxy-
-DOMAIN-KEYWORD,dualstack.ichnaea-web-
 DOMAIN,netflix.com.edgesuite.net
 DOMAIN-SUFFIX,fast.com
 DOMAIN-SUFFIX,netflix.com
@@ -295,6 +267,7 @@ USER-AGENT,Niconico*
 DOMAIN-SUFFIX,dmc.nico
 DOMAIN-SUFFIX,nicovideo.jp
 DOMAIN-SUFFIX,nimg.jp
+DOMAIN-SUFFIX,socdm.com

 # PBS
 USER-AGENT,PBS*
@@ -327,7 +300,6 @@ DOMAIN-SUFFIX,pscdn.co
 DOMAIN-SUFFIX,scdn.co
 DOMAIN-SUFFIX,spoti.fi
 DOMAIN-SUFFIX,spotify.com
-DOMAIN-SUFFIX,spotifycdn.com
 DOMAIN-SUFFIX,spotifycdn.net

 # TIDAL
@@ -349,7 +321,6 @@ DOMAIN-SUFFIX,ibytedtos.com
 DOMAIN-SUFFIX,ipstatp.com
 DOMAIN-SUFFIX,muscdn.com
 DOMAIN-SUFFIX,musical.ly
-DOMAIN-SUFFIX,tik-tokapi.com
 DOMAIN-SUFFIX,tiktok.com
 DOMAIN-SUFFIX,tiktokcdn.com
 DOMAIN-SUFFIX,tiktokv.com
@@ -387,6 +358,7 @@ USER-AGENT,com.google.ios.youtube*
 DOMAIN-KEYWORD,youtube
 DOMAIN,youtubei.googleapis.com
 DOMAIN,yt3.ggpht.com
+DOMAIN-SUFFIX,app-measurement.com
 DOMAIN-SUFFIX,googlevideo.com
 DOMAIN-SUFFIX,gvt2.com
 DOMAIN-SUFFIX,youtu.be
@@ -397,5 +369,4 @@ DOMAIN-SUFFIX,ytimg.com
 USER-AGENT,*YouTubeMusic*
 USER-AGENT,*com.google.ios.youtubemusic*
 USER-AGENT,YouTubeMusic*
-USER-AGENT,com.google.ios.youtubemusic*
-DOMAIN,music.youtube.com
+USER-AGENT,com.google.ios.youtubemusic*
--- a/base/rules/ACL4SSR/Clash/Ruleset/AccelerateDirectSites.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AccelerateDirectSites.list
@@ -1,5 +1,5 @@
 # 内容：AccelerateDirectSites
-# 数量：242条
+# 数量：244条
 DOMAIN-SUFFIX,10010.com
 DOMAIN-SUFFIX,115.com
 DOMAIN-SUFFIX,12306.com
@@ -80,6 +80,7 @@ DOMAIN-SUFFIX,geetest.com
 DOMAIN-SUFFIX,geilicdn.com
 DOMAIN-SUFFIX,ghpym.com
 DOMAIN-SUFFIX,godic.net
+DOMAIN-SUFFIX,gravatar.com
 DOMAIN-SUFFIX,guazi.com
 DOMAIN-SUFFIX,gwdang.com
 DOMAIN-SUFFIX,gzlzfm.com
@@ -115,10 +116,9 @@ DOMAIN-SUFFIX,kugou.com
 DOMAIN-SUFFIX,lancdns.com
 DOMAIN-SUFFIX,landiannews.com
 DOMAIN-SUFFIX,lanzou.com
-DOMAIN-SUFFIX,lanzoui.com
-DOMAIN-SUFFIX,lanzoux.com
 DOMAIN-SUFFIX,lemicp.com
 DOMAIN-SUFFIX,letitfly.me
+DOMAIN-SUFFIX,linkedin.com
 DOMAIN-SUFFIX,lizhi.fm
 DOMAIN-SUFFIX,lizhi.io
 DOMAIN-SUFFIX,lizhifm.com
@@ -149,6 +149,7 @@ DOMAIN-SUFFIX,onlinedown.net
 DOMAIN-SUFFIX,oracle.com
 DOMAIN-SUFFIX,oschina.net
 DOMAIN-SUFFIX,ourdvs.com
+DOMAIN-SUFFIX,overcast.fm
 DOMAIN-SUFFIX,paypal.com
 DOMAIN-SUFFIX,polyv.net
 DOMAIN-SUFFIX,qbox.me
@@ -182,10 +183,10 @@ DOMAIN-SUFFIX,sm.ms
 DOMAIN-SUFFIX,smzdm.com
 DOMAIN-SUFFIX,snwx.com
 DOMAIN-SUFFIX,soufunimg.com
+DOMAIN-SUFFIX,ssl-images-amazon.com
 DOMAIN-SUFFIX,sspai.com
 DOMAIN-SUFFIX,startssl.com
 DOMAIN-SUFFIX,suning.com
-DOMAIN-SUFFIX,synology.com
 DOMAIN-SUFFIX,taihe.com
 DOMAIN-SUFFIX,th-sjy.com
 DOMAIN-SUFFIX,tianqi.com
@@ -204,6 +205,7 @@ DOMAIN-SUFFIX,umengcloud.com
 DOMAIN-SUFFIX,upyun.com
 DOMAIN-SUFFIX,uxengine.net
 DOMAIN-SUFFIX,videocc.net
+DOMAIN-SUFFIX,vmware.com
 DOMAIN-SUFFIX,wandoujia.com
 DOMAIN-SUFFIX,weather.com
 DOMAIN-SUFFIX,weico.cc
--- a/base/rules/ACL4SSR/Clash/Ruleset/Alibaba.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Alibaba.list
@@ -1,12 +1,11 @@
 # 内容：Alibaba
-# 数量：36条
+# 数量：34条
 DOMAIN-SUFFIX,1688.com
 DOMAIN-SUFFIX,aliapp.org
 DOMAIN-SUFFIX,alibaba.com
 DOMAIN-SUFFIX,alibabacloud.com
 DOMAIN-SUFFIX,alibabausercontent.com
 DOMAIN-SUFFIX,alicdn.com
-DOMAIN-SUFFIX,alicloudccp.com
 DOMAIN-SUFFIX,aliexpress.com
 DOMAIN-SUFFIX,aliimg.com
 DOMAIN-SUFFIX,alikunlun.com
@@ -16,7 +15,6 @@ DOMAIN-SUFFIX,alisoft.com
 DOMAIN-SUFFIX,aliyun.com
 DOMAIN-SUFFIX,aliyuncdn.com
 DOMAIN-SUFFIX,aliyuncs.com
-DOMAIN-SUFFIX,aliyundrive.com
 DOMAIN-SUFFIX,amap.com
 DOMAIN-SUFFIX,autonavi.com
 DOMAIN-SUFFIX,dingtalk.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Amazon.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Amazon.list
@@ -1,24 +1,15 @@
 # 内容：Amazon
-# 数量：35条
-DOMAIN-KEYWORD,avoddashs
-DOMAIN,atv-ps.amazon.com
-DOMAIN,avodmp4s3ww-a.akamaihd.net
-DOMAIN,d1v5ir2lpwr8os.cloudfront.net
-DOMAIN,d1xfray82862hr.cloudfront.net
-DOMAIN,d22qjgkvxw22r6.cloudfront.net
-DOMAIN,d25xi40x97liuc.cloudfront.net
-DOMAIN,d27xxe7juh1us6.cloudfront.net
-DOMAIN,d3196yreox78o9.cloudfront.net
-DOMAIN,dmqdd6hw24ucf.cloudfront.net
-DOMAIN,ktpx.amazon.com
+# 数量：25条
+USER-AGENT,InstantVideo.US*
+USER-AGENT,Prime%20Video*
 DOMAIN-SUFFIX,aiv-cdn.net
-DOMAIN-SUFFIX,aiv-delivery.net
 DOMAIN-SUFFIX,amazon.co.jp
 DOMAIN-SUFFIX,amazon.com
+DOMAIN-SUFFIX,amazonaws.co.uk
 DOMAIN-SUFFIX,amazonaws.com
 DOMAIN-SUFFIX,amazonvideo.com
-DOMAIN-SUFFIX,media-amazon.com
-DOMAIN-SUFFIX,pv-cdn.net
+DOMAIN-SUFFIX,llnwd.net
+DOMAIN-SUFFIX,primevideo.com
 IP-CIDR,13.32.0.0/15,no-resolve
 IP-CIDR,13.35.0.0/17,no-resolve
 IP-CIDR,18.184.0.0/15,no-resolve
@@ -33,5 +24,4 @@ IP-CIDR,52.200.0.0/13,no-resolve
 IP-CIDR,54.93.0.0/16,no-resolve
 IP-CIDR,54.156.0.0/14,no-resolve
 IP-CIDR,54.226.0.0/15,no-resolve
-IP-CIDR,54.230.156.0/22,no-resolve
-URL-REGEX,^https?:\/\/www\.amazon\.com\/(Amazon-Video|gp\/video)\/
+IP-CIDR,54.230.156.0/22,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/AmazonIp.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AmazonIp.list
--- a/base/rules/ACL4SSR/Clash/Ruleset/Apple.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Apple.list
@@ -1,19 +1,17 @@
 # 内容：Apple
-# 数量：27条
+# 数量：25条
 DOMAIN,apple.comscoreresearch.com
 DOMAIN-SUFFIX,aaplimg.com
 DOMAIN-SUFFIX,akadns.net
 DOMAIN-SUFFIX,apple-cloudkit.com
 DOMAIN-SUFFIX,apple.co
 DOMAIN-SUFFIX,apple.com
-DOMAIN-SUFFIX,apple.com.cn
 DOMAIN-SUFFIX,apple.news
 DOMAIN-SUFFIX,appstore.com
 DOMAIN-SUFFIX,cdn-apple.com
 DOMAIN-SUFFIX,crashlytics.com
 DOMAIN-SUFFIX,icloud-content.com
 DOMAIN-SUFFIX,icloud.com
-DOMAIN-SUFFIX,icloud.com.cn
 DOMAIN-SUFFIX,itunes.com
 DOMAIN-SUFFIX,me.com
 DOMAIN-SUFFIX,mzstatic.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/BBCiPlayer.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/BBCiPlayer.list
@@ -1,5 +1,5 @@
 # 内容：BBCiPlayer
-# 数量：15条
+# 数量：13条
 USER-AGENT,BBCiPlayer*
 DOMAIN-KEYWORD,bbcfmt
 DOMAIN-KEYWORD,uk-live
@@ -10,8 +10,6 @@ DOMAIN,vod-thumb-uk-live.akamaized.net
 DOMAIN-SUFFIX,bbc.co
 DOMAIN-SUFFIX,bbc.co.uk
 DOMAIN-SUFFIX,bbc.com
-DOMAIN-SUFFIX,bbc.net.uk
 DOMAIN-SUFFIX,bbcfmt.hs.llnwd.net
 DOMAIN-SUFFIX,bbci.co
-DOMAIN-SUFFIX,bbci.co.uk
-DOMAIN-SUFFIX,bidi.net.uk
+DOMAIN-SUFFIX,bbci.co.uk
--- a/base/rules/ACL4SSR/Clash/Ruleset/Bahamut.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Bahamut.list
@@ -1,7 +1,8 @@
 # 内容：Bahamut
-# 数量：5条
+# 数量：6条
 USER-AGENT,Anime*
 DOMAIN,gamer-cds.cdn.hinet.net
 DOMAIN,gamer2-cds.cdn.hinet.net
 DOMAIN-SUFFIX,bahamut.com.tw
-DOMAIN-SUFFIX,gamer.com.tw
+DOMAIN-SUFFIX,gamer.com.tw
+DOMAIN-SUFFIX,hinet.net
--- a/base/rules/ACL4SSR/Clash/Ruleset/Bilibili.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Bilibili.list
@@ -1,9 +1,7 @@
 # 内容：Bilibili 哔哩哔哩
-# 数量：21条
+# 数量：18条
 USER-AGENT,Bilibili*
 USER-AGENT,bili*
-USER-AGENT,bili-inter*
-DOMAIN,apiintl.biliapi.net
 DOMAIN,upos-hz-mirrorakam.akamaized.net
 DOMAIN-SUFFIX,acg.tv
 DOMAIN-SUFFIX,acgvideo.com
@@ -16,7 +14,6 @@ DOMAIN-SUFFIX,bilibili.com
 DOMAIN-SUFFIX,bilibili.tv
 DOMAIN-SUFFIX,biligame.com
 DOMAIN-SUFFIX,biligame.net
-DOMAIN-SUFFIX,bilivideo.cn
 DOMAIN-SUFFIX,bilivideo.com
 DOMAIN-SUFFIX,hdslb.com
 DOMAIN-SUFFIX,im9.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/BilibiliHMT.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/BilibiliHMT.list
@@ -1,13 +1,8 @@
 # 内容：BilibiliHMT 哔哩哔哩 港澳台番剧
-# 数量：18条
-DOMAIN,p-bstarstatic.akamaized.net
-DOMAIN,p.bstarstatic.com
-DOMAIN,upos-bstar-mirrorakam.akamaized.net
-DOMAIN,upos-bstar1-mirrorakam.akamaized.net
+# 数量：13条
 DOMAIN,upos-hz-mirrorakam.akamaized.net
 DOMAIN-SUFFIX,acgvideo.com
 DOMAIN-SUFFIX,bilibili.com
-DOMAIN-SUFFIX,bilibili.tv
 IP-CIDR,45.43.32.234/32
 IP-CIDR,119.29.29.29/32
 IP-CIDR,128.1.62.200/32
--- a/base/rules/ACL4SSR/Clash/Ruleset/DAZN.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/DAZN.list
@@ -1,14 +1,11 @@
 # 内容：DAZN
-# 数量：12条
+# 数量：9条
 USER-AGENT,DAZN*
 DOMAIN-KEYWORD,voddazn
 DOMAIN,d151l6v8er5bdm.cloudfront.net
 DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net
-DOMAIN-SUFFIX,d1sgwhnao7452x.cloudfront.net
 DOMAIN-SUFFIX,dazn-api.com
 DOMAIN-SUFFIX,dazn.com
 DOMAIN-SUFFIX,dazndn.com
-DOMAIN-SUFFIX,dcblivedazn.akamaized.net
 DOMAIN-SUFFIX,indazn.com
-DOMAIN-SUFFIX,indaznlab.com
-DOMAIN-SUFFIX,sentry.io
+DOMAIN-SUFFIX,intercom.io
--- a/base/rules/ACL4SSR/Clash/Ruleset/DisneyPlus.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/DisneyPlus.list
@@ -1,24 +1,15 @@
 # 内容：DisneyPlus
-# 数量：22条
+# 数量：13条
 USER-AGENT,Disney*
 USER-AGENT,Disney+*
+DOMAIN,cdn.cdn.unid.go.com
 DOMAIN,cdn.registerdisney.go.com
-DOMAIN-SUFFIX,adobedtm.com
-DOMAIN-SUFFIX,bam.nr-data.net
+DOMAIN,global.edge.bamgrid.com
 DOMAIN-SUFFIX,bamgrid.com
 DOMAIN-SUFFIX,braze.com
-DOMAIN-SUFFIX,cdn.optimizely.com
-DOMAIN-SUFFIX,cdn.registerdisney.go.com
-DOMAIN-SUFFIX,cws.conviva.com
-DOMAIN-SUFFIX,d9.flashtalking.com
+DOMAIN-SUFFIX,conviva.com
 DOMAIN-SUFFIX,disney-plus.net
-DOMAIN-SUFFIX,disney-portal.my.onetrust.com
 DOMAIN-SUFFIX,disney.demdex.net
-DOMAIN-SUFFIX,disney.my.sentry.io
-DOMAIN-SUFFIX,disneyplus.bn5x.net
 DOMAIN-SUFFIX,disneyplus.com
-DOMAIN-SUFFIX,disneyplus.com.ssl.sc.omtrdc.net
-DOMAIN-SUFFIX,disneystreaming.com
 DOMAIN-SUFFIX,dssott.com
-DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com
-DOMAIN-SUFFIX,js-agent.newrelic.com
+DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Douyu.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Douyu.list
@@ -1,6 +1,5 @@
 # 内容：Douyu 斗鱼
-# 数量：4条
+# 数量：3条
 DOMAIN-SUFFIX,douyu.com
 DOMAIN-SUFFIX,douyu.tv
-DOMAIN-SUFFIX,douyuscdn.com
 DOMAIN-SUFFIX,douyutv.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Download.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Download.list
@@ -2,18 +2,18 @@
 # 数量：20条
 DOMAIN-KEYWORD,aria2
 DOMAIN-SUFFIX,smtp
-PROCESS-NAME,DownloadService.exe
-PROCESS-NAME,Folx.exe
-PROCESS-NAME,NetTransport.exe
-PROCESS-NAME,Thunder.exe
-PROCESS-NAME,Transmission.exe
-PROCESS-NAME,WebTorrent Helper.exe
-PROCESS-NAME,WebTorrent.exe
-PROCESS-NAME,Weiyun.exe
-PROCESS-NAME,aria2c.exe
-PROCESS-NAME,baidunetdisk.exe
-PROCESS-NAME,fdm.exe
-PROCESS-NAME,uTorrent.exe
+PROCESS-NAME,DownloadService
+PROCESS-NAME,Folx
+PROCESS-NAME,NetTransport
+PROCESS-NAME,Thunder
+PROCESS-NAME,Transmission
+PROCESS-NAME,WebTorrent
+PROCESS-NAME,WebTorrent Helper
+PROCESS-NAME,Weiyun
+PROCESS-NAME,aria2c
+PROCESS-NAME,baidunetdisk
+PROCESS-NAME,fdm
+PROCESS-NAME,uTorrent
 URL-REGEX,(.+.)?(torrent|announce.php?passkey=|tracker|BitTorrent|bt_key|ed2k|find_node|get_peers|info_hash|magnet:|peer_id=|xunlei)(..+)?
 URL-REGEX,(.+.|^)(360|so|qihoo|360safe|qhimg|360totalsecurity|yunpan).(cn|com)
 URL-REGEX,(.+\.|^)(360|so)\.(cn|com)
--- a/base/rules/ACL4SSR/Clash/Ruleset/Dubox.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Dubox.list
@@ -1,4 +0,0 @@
-# 内容：Dubox
-# 数量：2条
-DOMAIN-SUFFIX,dubox.com
-DOMAIN-SUFFIX,duboxcdn.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/EHGallery.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/EHGallery.list
@@ -1,8 +0,0 @@
-# 内容：E-Hentai Galleries
-# 数量：6条
-DOMAIN-SUFFIX,e-hentai.org
-DOMAIN-SUFFIX,ehwiki.org
-DOMAIN-SUFFIX,ehgt.org
-DOMAIN-SUFFIX,exhentai.org
-DOMAIN-SUFFIX,hentaiverse.org
-DOMAIN-SUFFIX,hath.network
--- a/base/rules/ACL4SSR/Clash/Ruleset/FoxNow.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/FoxNow.list
@@ -1,6 +1,7 @@
 # 内容：FoxNow
-# 数量：4条
+# 数量：5条
 USER-AGENT,FOX%20NOW*
 DOMAIN-SUFFIX,fox.com
 DOMAIN-SUFFIX,foxdcg.com
+DOMAIN-SUFFIX,theplatform.com
 DOMAIN-SUFFIX,uplynk.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/FoxPlus.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/FoxPlus.list
@@ -0,0 +1,12 @@
+# 内容：FoxPlus
+# 数量：10条
+USER-AGENT,FOXPlus*
+DOMAIN,cdn-fox-networks-group-green.akamaized.net
+DOMAIN,d3cv4a9a9wh0bt.cloudfront.net
+DOMAIN,foxsports01-i.akamaihd.net
+DOMAIN,foxsports02-i.akamaihd.net
+DOMAIN,foxsports03-i.akamaihd.net
+DOMAIN,staticasiafox.akamaized.net
+DOMAIN-SUFFIX,akamaized.net
+DOMAIN-SUFFIX,foxplus.com
+DOMAIN-SUFFIX,theplatform.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/GoogleCN.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/GoogleCN.list
@@ -1,5 +1,5 @@
 # 内容：GoogleCN
-# 数量：38条
+# 数量：52条
 DOMAIN-SUFFIX,265.com
 DOMAIN-SUFFIX,2mdn.net
 DOMAIN-SUFFIX,alt1-mtalk.google.com
@@ -24,9 +24,23 @@ DOMAIN-SUFFIX,googletagmanager.com
 DOMAIN-SUFFIX,googletagservices.com
 DOMAIN-SUFFIX,gtm.oasisfeng.com
 DOMAIN-SUFFIX,imasdk.googleapis.com
+DOMAIN-SUFFIX,kh.google.com
+DOMAIN-SUFFIX,khm.google.com
+DOMAIN-SUFFIX,khm.googleapis.com
+DOMAIN-SUFFIX,khm0.google.com
+DOMAIN-SUFFIX,khm0.googleapis.com
+DOMAIN-SUFFIX,khm1.google.com
+DOMAIN-SUFFIX,khm1.googleapis.com
+DOMAIN-SUFFIX,khm2.google.com
+DOMAIN-SUFFIX,khm2.googleapis.com
+DOMAIN-SUFFIX,khm3.google.com
+DOMAIN-SUFFIX,khm3.googleapis.com
+DOMAIN-SUFFIX,khmdb.google.com
+DOMAIN-SUFFIX,khmdb.googleapis.com
 DOMAIN-SUFFIX,mtalk.google.com
 DOMAIN-SUFFIX,ocsp.pki.goog
 DOMAIN-SUFFIX,recaptcha.net
+DOMAIN-SUFFIX,redirector.gvt1.com
 DOMAIN-SUFFIX,safebrowsing-cache.google.com
 DOMAIN-SUFFIX,safebrowsing.googleapis.com
 DOMAIN-SUFFIX,settings.crashlytics.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/GoogleCNProxyIP.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/GoogleCNProxyIP.list
@@ -1,20 +0,0 @@
-# 内容：GoogleCNProxyIP 谷歌中国服务 services.googleapis.cn
-# 数量：18条
-IP-CIDR,120.232.181.162/32,no-resolve
-IP-CIDR,120.241.147.226/32,no-resolve
-IP-CIDR,120.253.253.226/32,no-resolve
-IP-CIDR,120.253.255.162/32,no-resolve
-IP-CIDR,120.253.255.34/32,no-resolve
-IP-CIDR,120.253.255.98/32,no-resolve
-IP-CIDR,180.163.150.162/32,no-resolve
-IP-CIDR,180.163.150.34/32,no-resolve
-IP-CIDR,180.163.151.162/32,no-resolve
-IP-CIDR,180.163.151.34/32,no-resolve
-IP-CIDR,203.208.39.0/24,no-resolve
-IP-CIDR,203.208.40.0/24,no-resolve
-IP-CIDR,203.208.41.0/24,no-resolve
-IP-CIDR,203.208.43.0/24,no-resolve
-IP-CIDR,203.208.50.0/24,no-resolve
-IP-CIDR,220.181.174.162/32,no-resolve
-IP-CIDR,220.181.174.226/32,no-resolve
-IP-CIDR,220.181.174.34/32,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/GoogleEarth.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/GoogleEarth.list
@@ -1,18 +0,0 @@
-# 内容：GoogleEarth 谷歌地球
-# 数量：16条
-DOMAIN-SUFFIX,earth-pa.clients6.google.com
-DOMAIN-SUFFIX,earth.google.com
-DOMAIN-SUFFIX,kh.google.com
-DOMAIN-SUFFIX,khm.google.com
-DOMAIN-SUFFIX,khm.googleapis.com
-DOMAIN-SUFFIX,khm0.google.com
-DOMAIN-SUFFIX,khm0.googleapis.com
-DOMAIN-SUFFIX,khm1.google.com
-DOMAIN-SUFFIX,khm1.googleapis.com
-DOMAIN-SUFFIX,khm2.google.com
-DOMAIN-SUFFIX,khm2.googleapis.com
-DOMAIN-SUFFIX,khm3.google.com
-DOMAIN-SUFFIX,khm3.googleapis.com
-DOMAIN-SUFFIX,khmdb.google.com
-DOMAIN-SUFFIX,khmdb.googleapis.com
-DOMAIN-SUFFIX,mw1.google.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/HBO.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/HBO.list
@@ -1,9 +1,12 @@
 # 内容：HBO
-# 数量：7条
+# 数量：10条
 USER-AGENT,HBO%20NOW*
 USER-AGENT,HBOMAX*
+DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com
 DOMAIN-SUFFIX,hbo.com
+DOMAIN-SUFFIX,hboasia.com
 DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbogoasia.com
+DOMAIN-SUFFIX,hbogoasia.hk
 DOMAIN-SUFFIX,hbomax.com
-DOMAIN-SUFFIX,hbomaxcdn.com
 DOMAIN-SUFFIX,hbonow.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/HBO_GO_HKG.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/HBO_GO_HKG.list
@@ -1,8 +1,6 @@
 # 内容：HBO_GO_HKG
-# 数量：21条
-USER-AGENT,HBO%20GO%20PROD*
-DOMAIN-KEYWORD,.hbogoasia.
-DOMAIN-KEYWORD,hbogoasia
+# 数量：14条
+USER-AGENT,HBO%20GO%20PROD%20HKG*
 DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
 DOMAIN,bcbolthboa-a.akamaihd.net
 DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
@@ -12,12 +10,7 @@ DOMAIN,hboasia2-i.akamaihd.net
 DOMAIN,hboasia3-i.akamaihd.net
 DOMAIN,hboasia4-i.akamaihd.net
 DOMAIN,hboasia5-i.akamaihd.net
-DOMAIN,hboasialive.akamaized.net
-DOMAIN,hbogoprod-vod.akamaized.net
-DOMAIN,hbolb.onwardsmg.com
-DOMAIN,hbounify-prod.evergent.com
 DOMAIN,players.brightcove.net
 DOMAIN,s3-ap-southeast-1.amazonaws.com
-DOMAIN-SUFFIX,hboasia.com
 DOMAIN-SUFFIX,hbogoasia.com
 DOMAIN-SUFFIX,hbogoasia.hk
--- a/base/rules/ACL4SSR/Clash/Ruleset/Hulu.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Hulu.list
@@ -1,9 +1,5 @@
 # 内容：Hulu
-# 数量：7条
-DOMAIN-SUFFIX,cws-hulu.conviva.com
+# 数量：3条
 DOMAIN-SUFFIX,hulu.com
-DOMAIN-SUFFIX,hulu.hb.omtrdc.net
-DOMAIN-SUFFIX,hulu.sc.omtrdc.net
-DOMAIN-SUFFIX,huluad.com
 DOMAIN-SUFFIX,huluim.com
 DOMAIN-SUFFIX,hulustream.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/HuluJapan.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/HuluJapan.list
@@ -1,8 +1,4 @@
 # 内容：HuluJapan
-# 数量：6条
+# 数量：2条
 DOMAIN-SUFFIX,happyon.jp
-DOMAIN-SUFFIX,hjholdings.jp
-DOMAIN-SUFFIX,hulu.jp
-DOMAIN-SUFFIX,prod.hjholdings.tv
-DOMAIN-SUFFIX,streaks.jp
-DOMAIN-SUFFIX,yb.uncn.jp
+DOMAIN-SUFFIX,hulu.jp
--- a/base/rules/ACL4SSR/Clash/Ruleset/Instagram.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Instagram.list
@@ -1,6 +1,7 @@
 # 内容：Instagram
-# 数量：4条
+# 数量：5条
 DOMAIN-KEYWORD,instagram
+DOMAIN-SUFFIX,akamaihd.net
 DOMAIN-SUFFIX,cdninstagram.com
 DOMAIN-SUFFIX,instagr.am
 DOMAIN-SUFFIX,instagram.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Iqiyi.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Iqiyi.list
@@ -1,27 +1,16 @@
 # 内容：Iqiyi 爱奇艺
-# 数量：25条
-USER-AGENT,QYPlayer*
-USER-AGENT,iQIYI*
-DOMAIN,intel-cache.m.iqiyi.com
-DOMAIN,intel-cache.video.iqiyi.com
-DOMAIN,intl-rcd.iqiyi.com
-DOMAIN,intl-subscription.iqiyi.com
+# 数量：14条
+USER-AGENT,QIYI*
+USER-AGENT,iQiYi*
+DOMAIN-KEYWORD,qiyi
 DOMAIN-SUFFIX,71.am
 DOMAIN-SUFFIX,71edge.com
-DOMAIN-SUFFIX,inter.iqiyi.com
-DOMAIN-SUFFIX,inter.ptqy.gitv.tv
-DOMAIN-SUFFIX,intl.iqiyi.com
-DOMAIN-SUFFIX,iq.com
 DOMAIN-SUFFIX,iqiyi.com
 DOMAIN-SUFFIX,iqiyipic.com
 DOMAIN-SUFFIX,ppsimg.com
 DOMAIN-SUFFIX,qiyi.com
 DOMAIN-SUFFIX,qiyipic.com
 DOMAIN-SUFFIX,qy.net
-IP-CIDR,23.40.241.251/32,no-resolve
-IP-CIDR,23.40.242.10/32,no-resolve
-IP-CIDR,103.44.56.0/22,no-resolve
-IP-CIDR,118.26.32.0/23,no-resolve
-IP-CIDR,118.26.120.0/24,no-resolve
-IP-CIDR,223.119.62.225/28,no-resolve
-URL-REGEX,^https?:\/\/int[\w-\.]+iqiyi\.com
+IP-CIDR,101.224.0.0/13,no-resolve
+IP-CIDR,101.227.0.0/16,no-resolve
+IP-CIDR,119.176.0.0/12,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/IqiyiHMT.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/IqiyiHMT.list
@@ -1,4 +1,3 @@
 # 内容：IqiyiHMT 爱奇艺 港澳台和国外站点
-# 数量：2条
-DOMAIN,cache.video.iqiyi.com
-DOMAIN-SUFFIX,iq.com
+# 数量：1条
+DOMAIN,cache.video.iqiyi.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/LineTV.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/LineTV.list
@@ -1,8 +1,7 @@
 # 内容：LineTV
-# 数量：6条
+# 数量：5条
 USER-AGENT,LINE%20TV*
 USER-AGENT,LINE*
 DOMAIN,d3c7rimkq79yfu.cloudfront.net
 DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net
-DOMAIN-SUFFIX,linetv.tw
-DOMAIN-SUFFIX,profile.line-scdn.net
+DOMAIN-SUFFIX,linetv.tw
--- a/base/rules/ACL4SSR/Clash/Ruleset/Microsoft.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Microsoft.list
@@ -1,5 +1,5 @@
 # 内容：Microsoft
-# 数量：76条
+# 数量：75条
 DOMAIN-KEYWORD,1drv
 DOMAIN-KEYWORD,microsoft
 DOMAIN-SUFFIX,aadrm.com
@@ -32,7 +32,6 @@ DOMAIN-SUFFIX,msftauth.net
 DOMAIN-SUFFIX,msftauthimages.net
 DOMAIN-SUFFIX,msftidentity.com
 DOMAIN-SUFFIX,msidentity.com
-DOMAIN-SUFFIX,msn.cn
 DOMAIN-SUFFIX,msn.com
 DOMAIN-SUFFIX,msocdn.com
 DOMAIN-SUFFIX,msocsp.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/MyTVSuper.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/MyTVSuper.list
@@ -1,9 +1,5 @@
 # 内容：MyTVSuper
-# 数量：7条
+# 数量：3条
 USER-AGENT,mytv*
-DOMAIN-KEYWORD,nowtv100
-DOMAIN-KEYWORD,rthklive
-DOMAIN,mytvsuperlimited.hb.omtrdc.net
-DOMAIN,mytvsuperlimited.sc.omtrdc.net
 DOMAIN-SUFFIX,mytvsuper.com
 DOMAIN-SUFFIX,tvb.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/NetEaseMusic.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/NetEaseMusic.list
@@ -1,13 +1,11 @@
 # 内容：NetEaseMusic 网易云音乐
-# 数量：34条
+# 数量：25条
 DOMAIN-SUFFIX,163yun.com
 DOMAIN-SUFFIX,api.iplay.163.com
 DOMAIN-SUFFIX,hz.netease.com
 DOMAIN-SUFFIX,mam.netease.com
 DOMAIN-SUFFIX,music.163.com
-DOMAIN-SUFFIX,music.163.com.163jiasu.com
 IP-CIDR,39.105.63.80/32,no-resolve
-IP-CIDR,39.105.175.128/32,no-resolve
 IP-CIDR,45.254.48.1/32,no-resolve
 IP-CIDR,47.100.127.239/32,no-resolve
 IP-CIDR,59.111.21.14/31,no-resolve
@@ -20,17 +18,10 @@ IP-CIDR,59.111.181.60/32,no-resolve
 IP-CIDR,59.111.238.29/32,no-resolve
 IP-CIDR,101.71.154.241/32,no-resolve
 IP-CIDR,103.126.92.132/31,no-resolve
-IP-CIDR,103.126.92.132/32,no-resolve
-IP-CIDR,103.126.92.133/32,no-resolve
 IP-CIDR,112.13.119.17/32,no-resolve
-IP-CIDR,112.13.119.18/32,no-resolve
 IP-CIDR,112.13.122.1/32,no-resolve
-IP-CIDR,112.13.122.4/32,no-resolve
 IP-CIDR,115.236.118.33/32,no-resolve
 IP-CIDR,115.236.121.1/32,no-resolve
 IP-CIDR,118.24.63.156/32,no-resolve
-IP-CIDR,182.92.170.253/32,no-resolve
 IP-CIDR,193.112.159.225/32,no-resolve
-IP-CIDR,223.252.199.66/31,no-resolve
-IP-CIDR,223.252.199.66/32,no-resolve
-IP-CIDR,223.252.199.67/32,no-resolve
+IP-CIDR,223.252.199.66/31,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/Netflix.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Netflix.list
@@ -1,8 +1,6 @@
 # 内容：Netflix
-# 数量：42条
+# 数量：40条
 USER-AGENT,Argo*
-DOMAIN-KEYWORD,dualstack.apiproxy-
-DOMAIN-KEYWORD,dualstack.ichnaea-web-
 DOMAIN,netflix.com.edgesuite.net
 DOMAIN-SUFFIX,fast.com
 DOMAIN-SUFFIX,netflix.com
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tindy X	e4944f27a9	Remove old command	2020-09-18 14:38:53 +08:00
Tindy X	5c8ae14abc	Inherit PATH from environment in Actions Remove build cache of the msys2 installation in Travis CI.	2020-09-18 14:29:49 +08:00
Tindy X	c0c99dce67	Remove Python 2 dependency	2020-09-18 14:17:50 +08:00
Tindy X	e668cde4e0	Use Node JS for building duktape library	2020-09-18 13:56:49 +08:00
Tindy X	713850a887	Merge branch 'master' into actions-msys-test	2020-09-18 13:43:07 +08:00
Tindy X	c3f58de3be	Clean up scripts Add Windows x86 build to Travis CI.	2020-09-02 20:21:04 +08:00
Tindy X	6acd7b438d	Use MINGW_PREFIX instead of /usr	2020-09-01 22:28:24 +08:00
Tindy X	24267087cb	Fix subsystem on Actions Fix install prefix on Travis CI.	2020-09-01 22:12:57 +08:00
Tindy X	274af5cf8b	Fix mingw32-make not found	2020-09-01 21:57:54 +08:00
Tindy X	a3688a26f0	Add Windows build to Travis CI Add Windows x86 build to GitHub Actions	2020-09-01 21:44:51 +08:00
Tindy X	57a419543b	Fix rapidjson build	2020-08-29 17:25:41 +08:00
Tindy X	93eae5ddbc	Add missing dependency	2020-08-29 16:57:19 +08:00
Tindy X	0dacda027c	Add Windows x64 CI	2020-08-29 16:45:05 +08:00