diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml
index 526ce45..bc9b0b0 100644
--- a/.github/workflows/build-module.yml
+++ b/.github/workflows/build-module.yml
@@ -9,6 +9,20 @@ on:
       tag_name:
         required: true
         type: string
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'OpenWRT version (e.g., 24.10.3)'
+        required: true
+        type: string
+      targets:
+        description: 'Targets (comma-separated, e.g., "stm32,ramips")'
+        required: true
+        type: string
+      subtargets:
+        description: 'Subtargets (comma-separated, e.g., "stm32mp1,mt7621")'
+        required: true
+        type: string
 
 jobs:
   generate-config:
@@ -27,8 +41,12 @@ jobs:
       - name: Get OpenWRT version from tag
         id: get_version
         run: |
-          if [ "${{ github.event_name }}" == "workflow_call" ]; then
-            echo "VERSION=${{ inputs.tag_name }}" >> $GITHUB_ENV
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
+            echo "TARGETS=${{ inputs.targets }}" >> $GITHUB_ENV
+            echo "SUBTARGETS=${{ inputs.subtargets }}" >> $GITHUB_ENV
+          elif [ "${{ github.event_name }}" == "workflow_call" ]; then
+            VERSION="${{ inputs.tag_name }}"
             echo "VERSION=${VERSION#v}" >> $GITHUB_ENV
           else
             echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
@@ -39,7 +57,7 @@ jobs:
 
       - name: Generate Job Config
         id: generate-config
-        run: node index.js ${{ env.VERSION }}
+        run: node index.js ${{ env.VERSION }} "${{ env.TARGETS }}" "${{ env.SUBTARGETS }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -53,94 +71,127 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: openwrt/openwrt
-          ref: v${{ matrix.build_env.tag }}
-          fetch-depth: 0
+      - name: Checkout AWG source code
+        uses: actions/checkout@v4
 
-      - name: Cache Tools and Kernel
-        id: cache-tools-kernel
+      - name: Install Python dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pyelftools
+
+      - name: Cache OpenWrt SDK
+        id: cache-sdk
         uses: actions/cache@v4
         env:
-          cache-name: "cache-tools-kernel-${{ matrix.build_env.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}"
+          cache-name: "cache-sdk-${{ matrix.build_env.tag }}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}"
         with:
-          path: "**"
-          key: ${{ runner.os }}-build-vm4-${{ env.cache-name }}
+          path: openwrt-sdk-*/
+          key: ${{ runner.os }}-sdk-${{ env.cache-name }}
 
-      - name: Building kernel and tools
-        #if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }}
+      - name: Download and extract OpenWrt SDK
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
         run: |
           echo "pkgarch: ${{ matrix.build_env.pkgarch}}, target:${{ matrix.build_env.target}}, subtarget: ${{ matrix.build_env.subtarget}}"
 
-          # Setup & install feeds
-          wget https://downloads.openwrt.org/releases/${{ matrix.build_env.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
-          echo "src-git awgopenwrt https://github.com/Slava-Shchipunov/awg-openwrt.git" >> ./feeds.conf
-          ./scripts/feeds update && ./scripts/feeds install -a
+          # Get the actual SDK filename from the directory listing
+          SDK_FILE=$(curl -s "https://downloads.openwrt.org/releases/${{ matrix.build_env.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/" | grep -o "openwrt-sdk-${{ matrix.build_env.tag }}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}_gcc-[^\"]*_musl[^\"]*\.Linux-x86_64\.tar\.[xz|zst]*" | head -n1)
+          
+          if [ -z "$SDK_FILE" ]; then
+            echo "SDK file not found for ${{ matrix.build_env.tag }} ${{ matrix.build_env.target}} ${{ matrix.build_env.subtarget}}"
+            exit 1
+          fi
+          
+          SDK_DOWNLOAD_URL="https://downloads.openwrt.org/releases/${{ matrix.build_env.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/${SDK_FILE}"
+          echo "Downloading SDK: $SDK_DOWNLOAD_URL"
+          
+          wget "$SDK_DOWNLOAD_URL"
+          
+          # Extract based on file extension
+          if [[ "$SDK_FILE" == *.tar.zst ]]; then
+            tar --zstd -xf "$SDK_FILE"
+          elif [[ "$SDK_FILE" == *.tar.xz ]]; then
+            tar -xf "$SDK_FILE"
+          else
+            echo "Unknown archive format: $SDK_FILE"
+            exit 1
+          fi
+          
+          rm "$SDK_FILE"
 
-          # Setup config with AWG and dependencies
-          wget https://downloads.openwrt.org/releases/${{ matrix.build_env.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
-          echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
+      - name: Setup SDK and feeds
+        run: |
+          # Find SDK directory
+          SDK_DIR=$(find . -maxdepth 1 -name "openwrt-sdk-*" -type d | head -n1)
+          
+          if [ -z "$SDK_DIR" ]; then
+            echo "SDK directory not found"
+            exit 1
+          fi
+          
+          # Get absolute paths
+          WORKSPACE_DIR=$(pwd)
+          
+          cd "$SDK_DIR"
+          
+          # Update feeds to include LuCI
+          ./scripts/feeds update -a
+          ./scripts/feeds install -a
+          
+          # Copy current repository packages directly to package directory
+          cp -r "$WORKSPACE_DIR/kmod-amneziawg" package/
+          cp -r "$WORKSPACE_DIR/amneziawg-tools" package/
+          cp -r "$WORKSPACE_DIR/luci-proto-amneziawg" package/
+          
+          # Configure packages to build
+          echo "CONFIG_PACKAGE_kmod-amneziawg=m" > .config
           echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config
-          echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
-          echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
-          echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
-          echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
-
+          echo "CONFIG_PACKAGE_luci-proto-amneziawg=y" >> .config
+          echo "CONFIG_PACKAGE_luci-i18n-amneziawg-ru=y" >> .config
+          
           make defconfig
 
-          echo "    > make tools/install"
-          make tools/install -i -j `nproc`
-
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
-
-          echo "    > make toolchain/install"
-          make toolchain/install  -i -j `nproc`
-
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
-
-          # compile kernel module
-          echo "    > make target/linux/compile"
-          make target/linux/compile  -i -j `nproc` V=s
-
-          VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
-          VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
-
-          if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
-            echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
-            exit 1
-          fi
-
-      - name: Build AmneziaWG
+      - name: Build AmneziaWG packages
         run: |
-          VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
-          echo "Vermagic: $VERMAGIC"
+          # Find SDK directory
+          SDK_DIR=$(find . -maxdepth 1 -name "openwrt-sdk-*" -type d | head -n1)
+          cd "$SDK_DIR"
 
-          VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
+          echo "Building AmneziaWG packages..."
 
-          if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
-            echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
-            exit 1
-          fi
-
-          # Ignore kmod build for some targets, replace with the awg-go
-          make package/kmod-amneziawg/{clean,download,prepare} V=s || true
+          # Build kmod-amneziawg (kernel module)
+          echo "Building kmod-amneziawg..."
+          make package/kmod-amneziawg/{download,prepare} V=s || true
           make package/kmod-amneziawg/compile V=s || true
 
-          make package/luci-app-amneziawg/{clean,download,prepare}
-          make package/luci-app-amneziawg/compile V=s
+          # Build luci-proto-amneziawg (web interface)
+          echo "Building luci-proto-amneziawg..."
+          make package/luci-proto-amneziawg/{download,prepare} V=s
+          make package/luci-proto-amneziawg/compile V=s
 
-          make V=s package/amneziawg-tools/{clean,download,prepare}
-          make V=s package/amneziawg-tools/compile
+          # Build amneziawg-tools (userspace tools)
+          echo "Building amneziawg-tools..."
+          make package/amneziawg-tools/{download,prepare} V=s
+          make package/amneziawg-tools/compile V=s
+          
+          echo "Build completed. Checking for built packages..."
+          find bin/ -name "*.ipk" | grep -E "(amneziawg|luci-proto-amneziawg|luci-i18n-amneziawg)" | head -10
 
       - name: Prepare artifacts
         run: |
-          tag_name=${{  github.ref_name }}
+          # Find SDK directory
+          SDK_DIR=$(find . -maxdepth 1 -name "openwrt-sdk-*" -type d | head -n1)
+          
           mkdir -p awgrelease
           postfix="v${{ matrix.build_env.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
-          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
-          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
-          cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
+          
+          # Copy built packages
+          find "$SDK_DIR/bin/packages" -name "amneziawg-tools_*.ipk" -exec cp {} awgrelease/amneziawg-tools_${postfix}.ipk \; || echo "amneziawg-tools package not found"
+          find "$SDK_DIR/bin/packages" -name "luci-proto-amneziawg_*.ipk" -exec cp {} awgrelease/luci-proto-amneziawg_${postfix}.ipk \; || echo "luci-proto-amneziawg package not found"
+          find "$SDK_DIR/bin/packages" -name "luci-i18n-amneziawg-ru_*.ipk" -exec cp {} awgrelease/luci-i18n-amneziawg-ru_${postfix}.ipk \; || echo "luci-i18n-amneziawg-ru package not found"
+          find "$SDK_DIR/bin/targets" -name "kmod-amneziawg_*.ipk" -exec cp {} awgrelease/kmod-amneziawg_${postfix}.ipk \; || echo "kmod-amneziawg package not found"
+          
+          echo "Built packages:"
+          ls -la awgrelease/
 
       - name: Release
         uses: softprops/action-gh-release@v1
diff --git a/.github/workflows/build-to-all-latest-snapshots.yml b/.github/workflows/build-to-all-latest-snapshots.yml
deleted file mode 100644
index 09de30b..0000000
--- a/.github/workflows/build-to-all-latest-snapshots.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-name: Build AmneziaWG for snapshot OpenWRT
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
-
-on:
-  push:
-    tags:
-      - "SNAPSHOT"
-  # schedule:
-    # - cron: '0 */4 * * *'
-  workflow_dispatch:
-
-jobs:
-  generate-config:
-    runs-on: ubuntu-latest
-    outputs:
-      job-config: ${{ steps.generate-config.outputs.job-config }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.16.0'
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Generate Job Config
-        id: generate-config
-        run: node index.js SNAPSHOT
-
-  build:
-    name: "${{ matrix.build_env.tag }} - ${{ matrix.build_env.pkgarch}} :: ${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}} build"
-    runs-on: ubuntu-latest
-    needs: generate-config
-    strategy:
-      matrix:
-        build_env: ${{ fromJson(needs.generate-config.outputs.job-config) }}
-      fail-fast: false
-
-    steps:
-      - name: Check if release file exists
-        id: check_release
-        run: |
-          postfix="${{ matrix.build_env.tag }}_${{ matrix.build_env.vermagic }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
-          RELEASE_FILE="kmod-amneziawg_${postfix}.ipk"
-          TAG=${{ matrix.build_env.tag }}
-
-          echo "Checking for release file: $RELEASE_FILE in release: $TAG"
-
-          # Используем GitHub CLI для проверки наличия файла в релизе
-          if gh release view "$TAG" --repo Slava-Shchipunov/awg-openwrt --json assets --jq ".assets | .[].name" | grep -q "$RELEASE_FILE"; then
-            echo "Release file $RELEASE_FILE already exists. Skipping job."
-            echo "FILE_EXISTS=true" >> $GITHUB_ENV
-          else
-            echo "FILE_EXISTS=false" >> $GITHUB_ENV
-          fi
-
-      # Прерываем job'у, если файл уже существует
-      - name: Skip job if release file exists
-        if: env.FILE_EXISTS == 'true'
-        run: |
-          echo "Skipping job as release file already exists."
-          exit 0
-
-      - name: Get snapshot commit SHA and device ARCH
-        if: env.FILE_EXISTS == 'false'
-        run: |
-          PROFILE_URL="https://downloads.openwrt.org/snapshots/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/profiles.json"
-          SNAPSHOT_COMMIT_SHA=$(wget -q $PROFILE_URL -O- | tr ',' '\n' | grep "version_code"| awk -F: '{print $2}' | tr -d '"' | awk -F- '{print $2}')
-          echo "Snapshot commit sha: $SNAPSHOT_COMMIT_SHA"
-          echo "SNAPSHOT_COMMIT_SHA=$SNAPSHOT_COMMIT_SHA" >> $GITHUB_ENV
-
-          DEVICE_ARCH=$(wget -q $PROFILE_URL -O- | tr ',' '\n' | grep "arch_packages"| awk -F: '{print $2}' | tr -d '"')
-          echo "Device ARCH: $DEVICE_ARCH"
-          echo "DEVICE_ARCH=$DEVICE_ARCH" >> $GITHUB_ENV
-
-      - uses: actions/checkout@v4
-        if: env.FILE_EXISTS == 'false'
-        with:
-          repository: openwrt/openwrt
-          fetch-depth: 0
-
-      - name: Checkout snapshot commit in openwrt repo
-        if: env.FILE_EXISTS == 'false'
-        run: git checkout ${{ env.SNAPSHOT_COMMIT_SHA}}
-
-      - name: Building kernel and tools
-        if: env.FILE_EXISTS == 'false'
-        run: |
-          echo "pkgarch: ${{ matrix.build_env.pkgarch}}, target:${{ matrix.build_env.target}}, subtarget: ${{ matrix.build_env.subtarget}}"
-
-          # Setup & install feeds
-          wget https://downloads.openwrt.org/snapshots/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
-          echo "src-git awgopenwrt https://github.com/Slava-Shchipunov/awg-openwrt.git" >> ./feeds.conf
-          ./scripts/feeds update && ./scripts/feeds install -a
-
-          # Setup config with AWG and dependencies
-          wget https://downloads.openwrt.org/snapshots/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
-          echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
-          echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config
-          echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
-          echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
-          echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
-          echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
-
-          make defconfig
-
-          echo "    > make tools/install"
-          make tools/install -i -j `nproc`
-
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
-
-          echo "    > make toolchain/install"
-          make toolchain/install  -i -j `nproc`
-
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
-
-          # compile kernel module
-          echo "    > make target/linux/compile"
-          make target/linux/compile  -i -j `nproc` V=s
-
-          VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
-          VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
-
-          if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
-            echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
-            exit 1
-          fi
-
-      - name: Build AmneziaWG
-        if: env.FILE_EXISTS == 'false'
-        run: |
-          VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
-          echo "Vermagic: $VERMAGIC"
-
-          VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
-
-          if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
-            echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
-            exit 1
-          fi
-
-          # Ignore kmod build for some targets, replace with the awg-go
-          make package/kmod-amneziawg/{clean,download,prepare} V=s || true
-          make package/kmod-amneziawg/compile V=s || true
-
-          make package/luci-app-amneziawg/{clean,download,prepare}
-          make package/luci-app-amneziawg/compile V=s
-
-          make V=s package/amneziawg-tools/{clean,download,prepare}
-          make V=s package/amneziawg-tools/compile
-
-      - name: Prepare artifacts
-        if: env.FILE_EXISTS == 'false'
-        run: |
-          tag_name=${{  github.ref_name }}
-          mkdir -p awgrelease
-          postfix="${{ matrix.build_env.tag }}_${{ matrix.build_env.vermagic }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
-          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
-          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
-          cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
-
-      - name: Delete old release assets
-        if: env.FILE_EXISTS == 'false'
-        run: |
-          postfix="${{ matrix.build_env.pkgarch }}_${{ matrix.build_env.target }}_${{ matrix.build_env.subtarget }}"
-          echo "Looking for old release files ending with: ${postfix}"
-
-          # Получаем список всех артефактов релиза по имени
-          assets=$(gh release view "${{ matrix.build_env.tag }}" --repo Slava-Shchipunov/awg-openwrt --json assets --jq ".assets | .[] | select(.name | endswith(\"$postfix.ipk\")) | .name")
-
-          # Удаляем найденные артефакты по имени
-          for asset_name in $assets; do
-            echo "Deleting asset with name: $asset_name"
-            gh release delete-asset "${{ matrix.build_env.tag }}" "$asset_name" --repo Slava-Shchipunov/awg-openwrt
-          done
-
-      - name: Release
-        if: env.FILE_EXISTS == 'false'
-        uses: softprops/action-gh-release@v1
-        with:
-          files: awgrelease/*.ipk
-          tag_name: ${{ matrix.build_env.tag }}
diff --git a/.github/workflows/run-release.yml b/.github/workflows/run-release.yml
index bfbc0ff..bfbc00f 100644
--- a/.github/workflows/run-release.yml
+++ b/.github/workflows/run-release.yml
@@ -3,7 +3,7 @@ name: Sync OpenWRT Releases
 on:
   # schedule:
    # - cron: '0 0 */3 * *' # Проверка новых релизов раз в три дня
-  workflow_dispatch: # Возможность вручную запустить Action
+  # workflow_dispatch: # Возможность вручную запустить Action
 
 jobs:
   sync-releases:
diff --git a/README.md b/README.md
index 8e6ed8b..97ebefe 100644
--- a/README.md
+++ b/README.md
@@ -26,15 +26,10 @@ sh <(wget -O - https://raw.githubusercontent.com/Slava-Shchipunov/awg-openwrt/re
 10) [24.10.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.2)
 11) AWG-2.0 [24.10.3](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.3)
 
-И собрал пакеты для популярных устройств для OpenWRT [SNAPSHOT](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/SNAPSHOT)
-
 Также запускал сборку для версии [22.03.7](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v22.03.7), но там для двух платформ сборка завершилась ошибкой. Так как это достаточно старая версия OpenWRT, я не стал разбираться, в чем проблема.
 
 В дальнейшем при выходе новых релизов OpenWRT будут автоматически создаваться релизы с пакетами AmneziaWG и запускаться сборка пакетов под все устройства, поддерживаемые новой версией. Github action для проверки появления нового релиза запускается автоматически раз в 3 дня, а также может быть запущен вручную.
 
-## Автоматическая сборка пакетов для SNAPSHOT версии
-В репозитории настроен github action, который запускается каждые 4 часа и проверяет [страницу снапшотов](https://downloads.openwrt.org/snapshots/targets/) сайта OpenWRT. При этом, если для какой-то платформы обнаруживается снапшот с более новой версией ядра, запускается сборка пакетов под эту платформу, а новые файлы заменяют старые. В целях экономии ресурсов и ускорения процесса сборки, пакеты собираются только для популярных платформ, которые указаны в массиве `SNAPSHOT_SUBTARGETS_TO_BUILD` в файле index.js.
-
 ## Выбор пакетов для своего устройства
 В соответствии с пунктом [Указываем переменные для сборки](https://github.com/itdoginfo/domain-routing-openwrt/wiki/Amnezia-WG-Build#%D1%83%D0%BA%D0%B0%D0%B7%D1%8B%D0%B2%D0%B0%D0%B5%D0%BC-%D0%BF%D0%B5%D1%80%D0%B5%D0%BC%D0%B5%D0%BD%D0%BD%D1%8B%D0%B5-%D0%B4%D0%BB%D1%8F-%D1%81%D0%B1%D0%BE%D1%80%D0%BA%D0%B8)
 определить `target` и `subtarget` вашего устройства. Далее перейти на страницу релиза, соответствующего вашей версии OpenWRT, затем поиском по странице (Ctrl+F) найти 3 пакета, название которых оканчивается на `target_subtarget.ipk`, соответствующие вашему устройству.
@@ -71,8 +66,12 @@ At the moment I have collected packages for all devices for OpenWRT versions:
 3) [23.05.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.2)
 4) [23.05.3](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.3)
 5) [23.05.4](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.4)
-
-And collected packages for popular devices for OpenWRT [SNAPSHOT](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/SNAPSHOT)
+6) [23.05.5](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.5)
+7) AWG-2.0 [23.05.6](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v23.05.6)
+8) [24.10.0](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.0)
+9) [24.10.1](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.1)
+10) [24.10.2](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.2)
+11) AWG-2.0 [24.10.3](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v24.10.3)
 
 I also ran the build for version [22.03.7](https://github.com/Slava-Shchipunov/awg-openwrt/releases/tag/v22.03.7), but the build ended with an error for two platforms. Since this is a fairly old version of OpenWRT, I did not bother to figure out what the problem was.
 
diff --git a/amneziawg-install.sh b/amneziawg-install.sh
index a09a12d..efba7f8 100644
--- a/amneziawg-install.sh
+++ b/amneziawg-install.sh
@@ -38,7 +38,7 @@ install_awg_packages() {
         opkg install "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME"
 
         if [ $? -eq 0 ]; then
-            echo "kmod-amneziawg file downloaded successfully"
+            echo "kmod-amneziawg installed successfully"
         else
             echo "Error installing kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again"
             exit 1
@@ -62,37 +62,66 @@ install_awg_packages() {
         opkg install "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME"
 
         if [ $? -eq 0 ]; then
-            echo "amneziawg-tools file downloaded successfully"
+            echo "amneziawg-tools installed successfully"
         else
             echo "Error installing amneziawg-tools. Please, install amneziawg-tools manually and run the script again"
             exit 1
         fi
     fi
     
-    if opkg list-installed | grep -q luci-app-amneziawg; then
-        echo "luci-app-amneziawg already installed"
+    if opkg list-installed | grep -q luci-proto-amneziawg; then
+        echo "luci-proto-amneziawg already installed"
     else
-        LUCI_APP_AMNEZIAWG_FILENAME="luci-app-amneziawg${PKGPOSTFIX}"
+        LUCI_APP_AMNEZIAWG_FILENAME="luci-proto-amneziawg${PKGPOSTFIX}"
         DOWNLOAD_URL="${BASE_URL}v${VERSION}/${LUCI_APP_AMNEZIAWG_FILENAME}"
         wget -O "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL"
 
         if [ $? -eq 0 ]; then
-            echo "luci-app-amneziawg file downloaded successfully"
+            echo "luci-proto-amneziawg file downloaded successfully"
         else
-            echo "Error downloading luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again"
+            echo "Error downloading luci-proto-amneziawg. Please, install luci-proto-amneziawg manually and run the script again"
             exit 1
         fi
 
         opkg install "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME"
 
         if [ $? -eq 0 ]; then
-            echo "luci-app-amneziawg file downloaded successfully"
+            echo "luci-proto-amneziawg installed successfully"
         else
-            echo "Error installing luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again"
+            echo "Error installing luci-proto-amneziawg. Please, install luci-proto-amneziawg manually and run the script again"
             exit 1
         fi
     fi
 
+    # Ask about Russian localization
+    printf "\033[32;1mУстанавливаем пакет с русской локализацией? Install Russian language pack? (y/n) [n]: \033[0m\n"
+    read INSTALL_RU_LANG
+    INSTALL_RU_LANG=${INSTALL_RU_LANG:-n}
+
+    if [ "$INSTALL_RU_LANG" = "y" ] || [ "$INSTALL_RU_LANG" = "Y" ]; then
+        if opkg list-installed | grep -q luci-i18n-amneziawg-ru; then
+            echo "luci-i18n-amneziawg-ru already installed"
+        else
+            LUCI_I18N_AMNEZIAWG_RU_FILENAME="luci-i18n-amneziawg-ru${PKGPOSTFIX}"
+            DOWNLOAD_URL="${BASE_URL}v${VERSION}/${LUCI_I18N_AMNEZIAWG_RU_FILENAME}"
+            wget -O "$AWG_DIR/$LUCI_I18N_AMNEZIAWG_RU_FILENAME" "$DOWNLOAD_URL"
+
+            if [ $? -eq 0 ]; then
+                echo "luci-i18n-amneziawg-ru file downloaded successfully"
+                opkg install "$AWG_DIR/$LUCI_I18N_AMNEZIAWG_RU_FILENAME"
+                if [ $? -eq 0 ]; then
+                    echo "luci-i18n-amneziawg-ru installed successfully"
+                else
+                    echo "Warning: Error installing luci-i18n-amneziawg-ru (non-critical)"
+                fi
+            else
+                echo "Warning: Russian localization not available for this version/platform (non-critical)"
+            fi
+        fi
+    else
+        printf "\033[32;1mSkipping Russian language pack installation.\033[0m\n"
+    fi
+
     rm -rf "$AWG_DIR"
 }
 
diff --git a/amneziawg-tools/Makefile b/amneziawg-tools/Makefile
index 6408e78..ffcee81 100644
--- a/amneziawg-tools/Makefile
+++ b/amneziawg-tools/Makefile
@@ -1,25 +1,18 @@
-#
-# Copyright (C) 2016-2019 Jason A. Donenfeld <Jason@zx2c4.com>
-# Copyright (C) 2016 Baptiste Jonglez <openwrt@bitsofnetworks.org>
-# Copyright (C) 2016-2017 Dan Luedtke <mail@danrl.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=amneziawg-tools
+PKG_VERSION:=1.0.20250903
+PKG_RELEASE:=1
 
-PKG_VERSION:=1.0.20240213
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/amnezia-vpn/amneziawg-tools/archive/refs/tags/
-PKG_HASH:=4bde122630c9ddb1ec013c3e958f2c613b9eea56834674dda92fcb423c6f4d10
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/amnezia-vpn/amneziawg-tools.git
+# Version: latest stable release tag
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,32 +21,29 @@ MAKE_VARS += PLATFORM=linux
 
 define Package/amneziawg-tools
   CATEGORY:=Network
-  URL:=https://www.wireguard.com
-  MAINTAINER:=Jason A. Donenfeld <Jason@zx2c4.com>
-  TITLE:=WireGuard userspace control program (wg)
+  SUBMENU:=VPN
+  URL:=https://amnezia.org/
+  MAINTAINER:=Amnezia Admin <admin@amnezia.org>
+  TITLE:=AmneziaWG userspace control program (awg)
   DEPENDS:= \
 	  +@BUSYBOX_CONFIG_IP \
 	  +@BUSYBOX_CONFIG_FEATURE_IP_LINK
 endef
 
 define Package/amneziawg-tools/description
-  WireGuard is a novel VPN that runs inside the Linux Kernel and utilizes
-  state-of-the-art cryptography. It aims to be faster, simpler, leaner, and
-  more useful than IPSec, while avoiding the massive headache. It intends to
-  be considerably more performant than OpenVPN.  WireGuard is designed as a
-  general purpose VPN for running on embedded interfaces and super computers
-  alike, fit for many different circumstances. It uses UDP.
+  Amnezia VPN — simple and free app to run a self-hosted VPN with
+	high privacy requirements.
 
-  This package provides the userspace control program for WireGuard,
-  `wg(8)`, a netifd protocol helper, and a re-resolve watchdog script.
+  This package provides the userspace control program for AmneziaWG,
+  `awg`, a netifd protocol helper, and a re-resolve watchdog script.
 endef
 
 define Package/amneziawg-tools/install
 	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wg $(1)/usr/bin/amneziawg
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wg $(1)/usr/bin/awg
 	$(INSTALL_BIN) ./files/amneziawg_watchdog $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/lib/netifd/proto/
 	$(INSTALL_BIN) ./files/amneziawg.sh $(1)/lib/netifd/proto/
 endef
 
-$(eval $(call BuildPackage,amneziawg-tools))
\ No newline at end of file
+$(eval $(call BuildPackage,amneziawg-tools))
diff --git a/amneziawg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh
index cb832af..e0587a8 100755
--- a/amneziawg-tools/files/amneziawg.sh
+++ b/amneziawg-tools/files/amneziawg.sh
@@ -2,9 +2,11 @@
 # Copyright 2016-2017 Dan Luedtke <mail@danrl.com>
 # Licensed to the public under the Apache License 2.0.
 
-WG=/usr/bin/amneziawg
-if [ ! -x $WG ]; then
-	logger -t "amnezia-wg" "error: missing amneziawg-tools (${WG})"
+# shellcheck disable=SC1091,SC3003,SC3043
+
+AWG=/usr/bin/awg
+if [ ! -x $AWG ]; then
+	logger -t "amneziawg" "error: missing amneziawg-tools (${AWG})"
 	exit 0
 fi
 
@@ -24,25 +26,34 @@ proto_amneziawg_init_config() {
 	proto_config_add_int "awg_jmax"
 	proto_config_add_int "awg_s1"
 	proto_config_add_int "awg_s2"
-	proto_config_add_int "awg_h1"
-	proto_config_add_int "awg_h2"
-	proto_config_add_int "awg_h3"
-	proto_config_add_int "awg_h4"
+	proto_config_add_int "awg_s3"
+	proto_config_add_int "awg_s4"
+	proto_config_add_string "awg_h1"
+	proto_config_add_string "awg_h2"
+	proto_config_add_string "awg_h3"
+	proto_config_add_string "awg_h4"
+	proto_config_add_string "awg_i1"
+	proto_config_add_string "awg_i2"
+	proto_config_add_string "awg_i3"
+	proto_config_add_string "awg_i4"
+	proto_config_add_string "awg_i5"
+# shellcheck disable=SC2034
 	available=1
+# shellcheck disable=SC2034
 	no_proto_task=1
 }
 
 proto_amneziawg_is_kernel_mode() {
 	if [ ! -e /sys/module/amneziawg ]; then
-		modprobe amneziawg > /dev/null 2&>1 || true
+		modprobe amneziawg > /dev/null 2>&1 || true
 
 		if [ -e /sys/module/amneziawg ]; then
 			return 0
 		else
-			if [ ! command -v "${WG_QUICK_USERSPACE_IMPLEMENTATION:-amneziawg-go}" >/dev/null ]; then
+			if ! command -v "${WG_QUICK_USERSPACE_IMPLEMENTATION:-amneziawg-go}" >/dev/null; then
 				ret=$?
 				echo "Please install either kernel module (kmod-amneziawg package) or user-space implementation in /usr/bin/amneziawg-go."
-				exit $?
+				exit $ret
 			else
 				return 1
 			fi
@@ -83,13 +94,13 @@ proto_amneziawg_setup_peer() {
 		return 0
 	fi
 
-	echo "[Peer]" >> "${wg_cfg}"
-	echo "PublicKey=${public_key}" >> "${wg_cfg}"
+	echo "[Peer]" >> "${awg_cfg}"
+	echo "PublicKey=${public_key}" >> "${awg_cfg}"
 	if [ "${preshared_key}" ]; then
-		echo "PresharedKey=${preshared_key}" >> "${wg_cfg}"
+		echo "PresharedKey=${preshared_key}" >> "${awg_cfg}"
 	fi
-	for allowed_ip in $allowed_ips; do
-		echo "AllowedIPs=${allowed_ip}" >> "${wg_cfg}"
+	for allowed_ip in ${allowed_ips}; do
+		echo "AllowedIPs=${allowed_ip}" >> "${awg_cfg}"
 	done
 	if [ "${endpoint_host}" ]; then
 		case "${endpoint_host}" in
@@ -105,10 +116,10 @@ proto_amneziawg_setup_peer() {
 		else
 			endpoint="${endpoint}:51820"
 		fi
-		echo "Endpoint=${endpoint}" >> "${wg_cfg}"
+		echo "Endpoint=${endpoint}" >> "${awg_cfg}"
 	fi
 	if [ "${persistent_keepalive}" ]; then
-		echo "PersistentKeepalive=${persistent_keepalive}" >> "${wg_cfg}"
+		echo "PersistentKeepalive=${persistent_keepalive}" >> "${awg_cfg}"
 	fi
 
 	if [ ${route_allowed_ips} -ne 0 ]; then
@@ -140,7 +151,7 @@ ensure_key_is_generated() {
 		oldmask="$(umask)"
 		umask 077
 		ucitmp="$(mktemp -d)"
-		private_key="$("${WG}" genkey)"
+		private_key="$("${AWG}" genkey)"
 		uci -q -t "$ucitmp" set network."$1".private_key="$private_key" && \
 			uci -q -t "$ucitmp" commit network
 		rm -rf "$ucitmp"
@@ -150,23 +161,35 @@ ensure_key_is_generated() {
 
 proto_amneziawg_setup() {
 	local config="$1"
-	local wg_dir="/tmp/wireguard"
-	local wg_cfg="${wg_dir}/${config}"
+	local awg_dir="/tmp/amneziawg"
+	local awg_cfg="${awg_dir}/${config}"
 
 	local private_key
 	local listen_port
+	local addresses
 	local mtu
+	local fwmark
+	local ip6prefix
+	local nohostroute
+	local tunlink
 
-	# Amnezia WG specific parameters
+	# AmneziaWG specific parameters
 	local awg_jc
 	local awg_jmin
 	local awg_jmax
 	local awg_s1
 	local awg_s2
+	local awg_s3
+	local awg_s4
 	local awg_h1
 	local awg_h2
 	local awg_h3
 	local awg_h4
+	local awg_i1
+	local awg_i2
+	local awg_i3
+	local awg_i4
+	local awg_i5
 
 	ensure_key_is_generated "${config}"
 
@@ -185,18 +208,25 @@ proto_amneziawg_setup() {
 	config_get awg_jmax "${config}" "awg_jmax"
 	config_get awg_s1 "${config}" "awg_s1"
 	config_get awg_s2 "${config}" "awg_s2"
+	config_get awg_s3 "${config}" "awg_s3"
+	config_get awg_s4 "${config}" "awg_s4"
 	config_get awg_h1 "${config}" "awg_h1"
 	config_get awg_h2 "${config}" "awg_h2"
 	config_get awg_h3 "${config}" "awg_h3"
 	config_get awg_h4 "${config}" "awg_h4"
+	config_get awg_i1 "${config}" "awg_i1"
+	config_get awg_i2 "${config}" "awg_i2"
+	config_get awg_i3 "${config}" "awg_i3"
+	config_get awg_i4 "${config}" "awg_i4"
+	config_get awg_i5 "${config}" "awg_i5"
 
 	if proto_amneziawg_is_kernel_mode; then
-		logger -t "amneziawg" "info: using kernel-space kmod-amneziawg for ${WG}"
-  	ip link del dev "${config}" 2>/dev/null
+		logger -t "amneziawg" "info: using kernel-space kmod-amneziawg for ${AWG}"
+		ip link del dev "${config}" 2>/dev/null
 		ip link add dev "${config}" type amneziawg
 	else
-		logger -t "amneziawg" "info: using user-space amneziawg-go for ${WG}"
-		rm -f "/var/run/wireguard/${config}.sock"
+		logger -t "amneziawg" "info: using user-space amneziawg-go for ${AWG}"
+		rm -f "/var/run/amneziawg/${config}.sock"
 		amneziawg-go "${config}"
 	fi
 
@@ -207,53 +237,73 @@ proto_amneziawg_setup() {
 	proto_init_update "${config}" 1
 
 	umask 077
-	mkdir -p "${wg_dir}"
-	echo "[Interface]" > "${wg_cfg}"
-	echo "PrivateKey=${private_key}" >> "${wg_cfg}"
+	mkdir -p "${awg_dir}"
+	echo "[Interface]" > "${awg_cfg}"
+	echo "PrivateKey=${private_key}" >> "${awg_cfg}"
 	if [ "${listen_port}" ]; then
-		echo "ListenPort=${listen_port}" >> "${wg_cfg}"
+		echo "ListenPort=${listen_port}" >> "${awg_cfg}"
 	fi
 	if [ "${fwmark}" ]; then
-		echo "FwMark=${fwmark}" >> "${wg_cfg}"
+		echo "FwMark=${fwmark}" >> "${awg_cfg}"
 	fi
-	# AWG
+	# AmneziaWG parameters
 	if [ "${awg_jc}" ]; then
-		echo "Jc = ${awg_jc}" >> "${wg_cfg}"
+		echo "Jc=${awg_jc}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_jmin}" ]; then
-		echo "Jmin = ${awg_jmin}" >> "${wg_cfg}"
+		echo "Jmin=${awg_jmin}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_jmax}" ]; then
-		echo "Jmax = ${awg_jmax}" >> "${wg_cfg}"
+		echo "Jmax=${awg_jmax}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_s1}" ]; then
-		echo "S1 = ${awg_s1}" >> "${wg_cfg}"
+		echo "S1=${awg_s1}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_s2}" ]; then
-		echo "S2 = ${awg_s2}" >> "${wg_cfg}"
+		echo "S2=${awg_s2}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_s3}" ]; then
+		echo "S3=${awg_s3}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_s4}" ]; then
+		echo "S4=${awg_s4}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_h1}" ]; then
-		echo "H1 = ${awg_h1}" >> "${wg_cfg}"
+		echo "H1=${awg_h1}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_h2}" ]; then
-		echo "H2 = ${awg_h2}" >> "${wg_cfg}"
+		echo "H2=${awg_h2}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_h3}" ]; then
-		echo "H3 = ${awg_h3}" >> "${wg_cfg}"
+		echo "H3=${awg_h3}" >> "${awg_cfg}"
 	fi
 	if [ "${awg_h4}" ]; then
-		echo "H4 = ${awg_h4}" >> "${wg_cfg}"
+		echo "H4=${awg_h4}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_i1}" ]; then
+		echo "I1=${awg_i1}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_i2}" ]; then
+		echo "I2=${awg_i2}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_i3}" ]; then
+		echo "I3=${awg_i3}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_i4}" ]; then
+		echo "I4=${awg_i4}" >> "${awg_cfg}"
+	fi
+	if [ "${awg_i5}" ]; then
+		echo "I5=${awg_i5}" >> "${awg_cfg}"
 	fi
-
 	config_foreach proto_amneziawg_setup_peer "amneziawg_${config}"
 
-	# apply configuration file
-	${WG} setconf ${config} "${wg_cfg}"
-	WG_RETURN=$?
+	# Apply configuration file
+	${AWG} setconf "${config}" "${awg_cfg}"
+	AWG_RETURN=$?
 
-	rm -f "${wg_cfg}"
+	rm -f "${awg_cfg}"
 
-	if [ ${WG_RETURN} -ne 0 ]; then
+	if [ ${AWG_RETURN} -ne 0 ]; then
 		sleep 5
 		proto_setup_failed "${config}"
 		exit 1
@@ -282,7 +332,8 @@ proto_amneziawg_setup() {
 
 	# endpoint dependency
 	if [ "${nohostroute}" != "1" ]; then
-		${WG} show "${config}" endpoints | \
+		# shellcheck disable=SC2034
+		${AWG} show "${config}" endpoints | \
 		sed -E 's/\[?([0-9.:a-f]+)\]?:([0-9]+)/\1 \2/' | \
 		while IFS=$'\t ' read -r key address port; do
 			[ -n "${port}" ] || continue
@@ -295,14 +346,13 @@ proto_amneziawg_setup() {
 
 proto_amneziawg_teardown() {
 	local config="$1"
-	proto_amneziawg_check_installed
 	if proto_amneziawg_is_kernel_mode; then
 		ip link del dev "${config}" >/dev/null 2>&1
 	else
-		rm -f /var/run/wireguard/${config}.sock
+		rm -f "/var/run/amneziawg/${config}.sock"
 	fi
 }
 
 [ -n "$INCLUDE_ONLY" ] || {
 	add_protocol amneziawg
-}
\ No newline at end of file
+}
diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog
index a9b631a..a8e825c 100755
--- a/amneziawg-tools/files/amneziawg_watchdog
+++ b/amneziawg-tools/files/amneziawg_watchdog
@@ -11,12 +11,13 @@
 # Run this script from cron every minute:
 # echo '* * * * * /usr/bin/wireguard_watchdog' >> /etc/crontabs/root
 
+# shellcheck disable=SC1091,SC3043
 
 . /lib/functions.sh
 
 check_peer_activity() {
-  local cfg=$1
-  local iface=$2
+  local cfg="$1"
+  local iface="$2"
   local disabled
   local public_key
   local endpoint_host
@@ -26,7 +27,7 @@ check_peer_activity() {
   local idle_seconds
 
   config_get_bool disabled "${cfg}" "disabled" 0
-  config_get public_key "${cfg}" "public_key"
+  config_get public_key    "${cfg}" "public_key"
   config_get endpoint_host "${cfg}" "endpoint_host"
   config_get endpoint_port "${cfg}" "endpoint_port"
 
@@ -35,34 +36,35 @@ check_peer_activity() {
     return 0
   fi
 
-  persistent_keepalive=$(wg show ${iface} persistent-keepalive | grep ${public_key} | awk '{print $2}')
+  persistent_keepalive=$(awg show "${iface}" persistent-keepalive | grep "${public_key}" | awk '{print $2}')
 
   # only process peers with endpoints and keepalive set
-  [ -z ${endpoint_host} ] && return 0;
-  [ -z ${persistent_keepalive} -o ${persistent_keepalive} = "off" ] && return 0;
+  [ -z "${endpoint_host}" ] && return 0;
+  if [ -z "${persistent_keepalive}" ] || [ "${persistent_keepalive}" = "off" ]; then return 0; fi
 
   # skip IP addresses
   # check taken from packages/net/ddns-scripts/files/dynamic_dns_functions.sh
   local IPV4_REGEX="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}"
   local IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)"
-  local IPV4=$(echo ${endpoint_host} | grep -m 1 -o "$IPV4_REGEX$")    # do not detect ip in 0.0.0.0.example.com
-  local IPV6=$(echo ${endpoint_host} | grep -m 1 -o "$IPV6_REGEX")
-  [ -n "${IPV4}" -o -n "${IPV6}" ] && return 0;
+  local IPV4 IPV6
+  IPV4="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV4_REGEX$")"    # do not detect ip in 0.0.0.0.example.com
+  IPV6="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV6_REGEX")"
+  [ -n "${IPV4}${IPV6}" ] && return 0;
 
   # re-resolve endpoint hostname if not responding for too long
-  last_handshake=$(wg show ${iface} latest-handshakes | grep ${public_key} | awk '{print $2}')
-  [ -z ${last_handshake} ] && return 0;
+  last_handshake=$(awg show "${iface}" latest-handshakes | grep "${public_key}" | awk '{print $2}')
+  [ -z "${last_handshake}" ] && return 0;
   idle_seconds=$(($(date +%s)-${last_handshake}))
   [ ${idle_seconds} -lt 150 ] && return 0;
-  logger -t "wireguard_monitor" "${iface} endpoint ${endpoint_host}:${endpoint_port} is not responding for ${idle_seconds} seconds, trying to re-resolve hostname"
-  wg set ${iface} peer ${public_key} endpoint "${endpoint_host}:${endpoint_port}"
+  logger -t "amneziawg_monitor" "${iface} endpoint ${endpoint_host}:${endpoint_port} is not responding for ${idle_seconds} seconds, trying to re-resolve hostname"
+  awg set "${iface}" peer "${public_key}" endpoint "${endpoint_host}:${endpoint_port}"
 }
 
 # query ubus for all active wireguard interfaces
-wg_ifaces=$(ubus -S call network.interface dump | jsonfilter -e '@.interface[@.up=true]' | jsonfilter -a -e '@[@.proto="wireguard"].interface' | tr "\n" " ")
+awg_ifaces=$(ubus -S call network.interface dump | jsonfilter -e '@.interface[@.up=true]' | jsonfilter -a -e '@[@.proto="amneziawg"].interface' | tr "\n" " ")
 
 # check every peer in every active wireguard interface
 config_load network
-for iface in $wg_ifaces; do
-  config_foreach check_peer_activity "wireguard_${iface}" "${iface}"
-done
\ No newline at end of file
+for iface in $awg_ifaces; do
+  config_foreach check_peer_activity "amneziawg_${iface}" "${iface}"
+done
diff --git a/index.js b/index.js
index 8528dae..cc0bdcf 100644
--- a/index.js
+++ b/index.js
@@ -3,16 +3,19 @@ const cheerio = require('cheerio');
 const core = require('@actions/core');
 
 const version = process.argv[2]; // Получение версии OpenWRT из аргумента командной строки
+const filterTargetsStr = process.argv[3] || ''; // Фильтр по targets (опционально, через запятую)
+const filterSubtargetsStr = process.argv[4] || ''; // Фильтр по subtargets (опционально, через запятую)
 
-const SNAPSHOT_TARGETS_TO_BUILD = ['mediatek', 'ramips', 'x86', 'armsr'];
-const SNAPSHOT_SUBTARGETS_TO_BUILD = ['filogic', 'mt7622', 'mt7623', 'mt7629', 'mt7620', 'mt7621', 'mt76x8', '64', 'generic', 'armv8'];
+// Преобразуем строки с запятыми в массивы
+const filterTargets = filterTargetsStr ? filterTargetsStr.split(',').map(t => t.trim()).filter(t => t) : [];
+const filterSubtargets = filterSubtargetsStr ? filterSubtargetsStr.split(',').map(s => s.trim()).filter(s => s) : [];
 
 if (!version) {
   core.setFailed('Version argument is required');
   process.exit(1);
 }
 
-const url = version === 'SNAPSHOT' ? 'https://downloads.openwrt.org/snapshots/targets/' : `https://downloads.openwrt.org/releases/${version}/targets/`;
+const url = `https://downloads.openwrt.org/releases/${version}/targets/`;
 
 async function fetchHTML(url) {
   try {
@@ -74,19 +77,38 @@ async function main() {
     const jobConfig = [];
 
     for (const target of targets) {
+      // Пропускаем target, если указан массив фильтров и target не входит в него
+      if (filterTargets.length > 0 && !filterTargets.includes(target)) {
+        continue;
+      }
+
       const subtargets = await getSubtargets(target);
       for (const subtarget of subtargets) {
+        // Пропускаем subtarget, если указан массив фильтров и subtarget не входит в него
+        if (filterSubtargets.length > 0 && !filterSubtargets.includes(subtarget)) {
+          continue;
+        }
+
+        // Добавляем в конфигурацию только если:
+        // 1. Оба массива пустые (автоматическая сборка по тегу) - собираем всё
+        // 2. Оба массива НЕ пустые (ручной запуск) - target И subtarget должны быть в своих массивах
+        const isAutomatic = filterTargets.length === 0 && filterSubtargets.length === 0;
+        const isManualMatch = filterTargets.length > 0 && filterSubtargets.length > 0 &&
+                              filterTargets.includes(target) && filterSubtargets.includes(subtarget);
+        
+        if (!isAutomatic && !isManualMatch) {
+          continue;
+        }
+
         const { vermagic, pkgarch } = await getDetails(target, subtarget);
 
-        if (version !== 'SNAPSHOT' || (SNAPSHOT_SUBTARGETS_TO_BUILD.includes(subtarget) && SNAPSHOT_TARGETS_TO_BUILD.includes(target))) {
-          jobConfig.push({
-            tag: version,
-            target,
-            subtarget,
-            vermagic,
-            pkgarch,
-          });
-        }
+        jobConfig.push({
+          tag: version,
+          target,
+          subtarget,
+          vermagic,
+          pkgarch,
+        });
       }
     }
 
diff --git a/kmod-amneziawg/Makefile b/kmod-amneziawg/Makefile
index 6660664..d5e99c5 100644
--- a/kmod-amneziawg/Makefile
+++ b/kmod-amneziawg/Makefile
@@ -1,10 +1,17 @@
 include $(TOPDIR)/rules.mk
-
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-amneziawg
+PKG_VERSION:=1.0.20250924
 PKG_RELEASE:=1
 
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/amnezia-vpn/amneziawg-linux-kernel-module.git
+# Latest commit from feature/awg2 branch as of 2025-09-24
+PKG_SOURCE_VERSION:=2a94fcc67c332bbb4b983fcebe03ac31057ead19
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+MAKE_PATH:=src
+
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/amneziawg
@@ -12,7 +19,7 @@ define KernelPackage/amneziawg
 	CATEGORY:=Kernel modules
 	SUBMENU:=Network Support
 	TITLE:=AmneziaWG VPN Kernel Module
-	FILES:=$(PKG_BUILD_DIR)/amneziawg.ko
+	FILES:=$(PKG_BUILD_DIR)/$(MAKE_PATH)/amneziawg.ko
 	DEPENDS:= \
 		+kmod-udptunnel4 \
 		+kmod-udptunnel6 \
@@ -21,19 +28,17 @@ define KernelPackage/amneziawg
 endef
 
 define Build/Prepare
-	cp -fr $(LINUX_DIR)/drivers/net/wireguard/{*.c,*.h,selftest/} $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_BUILD_DIR)/uapi
-	cp -f $(LINUX_DIR)/include/uapi/linux/wireguard.h $(PKG_BUILD_DIR)/uapi/
-	patch -d $(PKG_BUILD_DIR)/ < files/amnezia-sources.patch
-	patch -d $(PKG_BUILD_DIR)/uapi/ < files/amnezia-uapi.patch
-	cp -f src/Makefile $(PKG_BUILD_DIR)
+	$(call Build/Prepare/Default)
+	mkdir -p $(PKG_BUILD_DIR)/$(MAKE_PATH)/kernel
+	$(CP) $(LINUX_DIR)/* $(PKG_BUILD_DIR)/$(MAKE_PATH)/kernel/
 endef
 
 define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
+	$(MAKE_VARS) $(MAKE) -C "$(LINUX_DIR)" \
 		$(KERNEL_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)" \
+		M="$(PKG_BUILD_DIR)/$(MAKE_PATH)" \
 		EXTRA_CFLAGS="$(BUILDFLAGS)" \
+		WIREGUARD_VERSION="$(WIREGUARD_VERSION)" \
 		modules
 endef
 
diff --git a/kmod-amneziawg/files/amnezia-sources.patch b/kmod-amneziawg/files/amnezia-sources.patch
deleted file mode 100644
index e8f5f62..0000000
--- a/kmod-amneziawg/files/amnezia-sources.patch
+++ /dev/null
@@ -1,798 +0,0 @@
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/cookie.c ./cookie.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/cookie.c	2023-11-10 18:10:29
-+++ ./cookie.c	2023-11-23 18:59:07
-@@ -179,13 +179,13 @@
- 
- void wg_cookie_message_create(struct message_handshake_cookie *dst,
- 			      struct sk_buff *skb, __le32 index,
--			      struct cookie_checker *checker)
-+			      struct cookie_checker *checker, u32 message_type)
- {
- 	struct message_macs *macs = (struct message_macs *)
- 		((u8 *)skb->data + skb->len - sizeof(*macs));
- 	u8 cookie[COOKIE_LEN];
- 
--	dst->header.type = cpu_to_le32(MESSAGE_HANDSHAKE_COOKIE);
-+	dst->header.type = cpu_to_le32(message_type);
- 	dst->receiver_index = index;
- 	get_random_bytes_wait(dst->nonce, COOKIE_NONCE_LEN);
- 
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/cookie.h ./cookie.h
---- ../../linux-source-6.2.0/drivers/net/wireguard/cookie.h	2023-11-10 18:10:29
-+++ ./cookie.h	2023-11-23 13:11:40
-@@ -52,7 +52,7 @@
- 
- void wg_cookie_message_create(struct message_handshake_cookie *src,
- 			      struct sk_buff *skb, __le32 index,
--			      struct cookie_checker *checker);
-+			      struct cookie_checker *checker, u32 message_type);
- void wg_cookie_message_consume(struct message_handshake_cookie *src,
- 			       struct wg_device *wg);
- 
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/device.c ./device.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/device.c	2023-11-10 18:10:29
-+++ ./device.c	2023-11-26 17:42:17
-@@ -379,6 +379,11 @@
- 	 */
- 	dev->priv_destructor = wg_destruct;
- 
-+	wg->advanced_security_config.init_packet_magic_header = MESSAGE_HANDSHAKE_INITIATION;
-+	wg->advanced_security_config.response_packet_magic_header = MESSAGE_HANDSHAKE_RESPONSE;
-+	wg->advanced_security_config.cookie_packet_magic_header = MESSAGE_HANDSHAKE_COOKIE;
-+	wg->advanced_security_config.transport_packet_magic_header = MESSAGE_DATA;
-+
- 	pr_debug("%s: Interface created\n", dev->name);
- 	return ret;
- 
-@@ -475,4 +480,118 @@
- 	unregister_random_vmfork_notifier(&vm_notifier);
- 	unregister_pm_notifier(&pm_notifier);
- 	rcu_barrier();
-+}
-+
-+int wg_device_handle_post_config(struct net_device *dev, struct amnezia_config *asc)
-+{
-+	struct wg_device *wg = netdev_priv(dev);
-+	bool a_sec_on = false;
-+	int ret = 0;
-+
-+	if (!asc->advanced_security_enabled)
-+		goto out;
-+
-+	if (asc->junk_packet_count < 0) {
-+		net_dbg_ratelimited("%s: JunkPacketCount should be non negative\n", dev->name);
-+		ret = -EINVAL;
-+	}
-+
-+	wg->advanced_security_config.junk_packet_count = asc->junk_packet_count;
-+	if (asc->junk_packet_count != 0)
-+		a_sec_on = true;
-+
-+	wg->advanced_security_config.junk_packet_min_size = asc->junk_packet_min_size;
-+	if (asc->junk_packet_min_size != 0)
-+		a_sec_on = true;
-+
-+	if (asc->junk_packet_count > 0 && asc->junk_packet_min_size == asc->junk_packet_max_size)
-+		asc->junk_packet_max_size++;
-+
-+	if (asc->junk_packet_max_size >= MESSAGE_MAX_SIZE) {
-+		wg->advanced_security_config.junk_packet_min_size = 0;
-+		wg->advanced_security_config.junk_packet_max_size = 1;
-+
-+		net_dbg_ratelimited("%s: JunkPacketMaxSize: %d; should be smaller than maxSegmentSize: %d\n",
-+							dev->name, asc->junk_packet_max_size,
-+							MESSAGE_MAX_SIZE);
-+		ret = -EINVAL;
-+	} else if (asc->junk_packet_max_size < asc->junk_packet_min_size) {
-+		net_dbg_ratelimited("%s: maxSize: %d; should be greater than minSize: %d\n",
-+							dev->name, asc->junk_packet_max_size,
-+							asc->junk_packet_min_size);
-+		ret = -EINVAL;
-+	} else
-+		wg->advanced_security_config.junk_packet_max_size = asc->junk_packet_max_size;
-+
-+	if (asc->junk_packet_max_size != 0)
-+		a_sec_on = true;
-+
-+	if (asc->init_packet_junk_size + MESSAGE_INITIATION_SIZE >= MESSAGE_MAX_SIZE) {
-+		net_dbg_ratelimited("%s: init header size (%d) + junkSize (%d) should be smaller than maxSegmentSize: %d\n",
-+		                    dev->name, MESSAGE_INITIATION_SIZE,
-+							asc->init_packet_junk_size, MESSAGE_MAX_SIZE);
-+		ret = -EINVAL;
-+	} else
-+		wg->advanced_security_config.init_packet_junk_size = asc->init_packet_junk_size;
-+
-+	if (asc->init_packet_junk_size != 0)
-+		a_sec_on = true;
-+
-+	if (asc->response_packet_junk_size + MESSAGE_RESPONSE_SIZE >= MESSAGE_MAX_SIZE) {
-+		net_dbg_ratelimited("%s: response header size (%d) + junkSize (%d) should be smaller than maxSegmentSize: %d\n",
-+		                    dev->name, MESSAGE_RESPONSE_SIZE,
-+		                    asc->response_packet_junk_size, MESSAGE_MAX_SIZE);
-+		ret = -EINVAL;
-+	} else
-+		wg->advanced_security_config.response_packet_junk_size = asc->response_packet_junk_size;
-+
-+	if (asc->response_packet_junk_size != 0)
-+		a_sec_on = true;
-+
-+	if (asc->init_packet_magic_header > MESSAGE_DATA) {
-+		a_sec_on = true;
-+		wg->advanced_security_config.init_packet_magic_header = asc->init_packet_magic_header;
-+	}
-+
-+	if (asc->response_packet_magic_header > MESSAGE_DATA) {
-+		a_sec_on = true;
-+		wg->advanced_security_config.response_packet_magic_header = asc->response_packet_magic_header;
-+	}
-+
-+	if (asc->cookie_packet_magic_header > MESSAGE_DATA) {
-+		a_sec_on = true;
-+		wg->advanced_security_config.cookie_packet_magic_header = asc->cookie_packet_magic_header;
-+	}
-+
-+	if (asc->transport_packet_magic_header > MESSAGE_DATA) {
-+		a_sec_on = true;
-+		wg->advanced_security_config.transport_packet_magic_header = asc->transport_packet_magic_header;
-+	}
-+
-+	if (asc->init_packet_magic_header == asc->response_packet_magic_header ||
-+			asc->init_packet_magic_header == asc->cookie_packet_magic_header ||
-+			asc->init_packet_magic_header == asc->transport_packet_magic_header ||
-+			asc->response_packet_magic_header == asc->cookie_packet_magic_header ||
-+			asc->response_packet_magic_header == asc->transport_packet_magic_header ||
-+			asc->cookie_packet_magic_header == asc->transport_packet_magic_header) {
-+		net_dbg_ratelimited("%s: magic headers should differ; got: init:%d; recv:%d; unde:%d; tran:%d\n",
-+		                    dev->name,
-+							asc->init_packet_magic_header,
-+		                    asc->response_packet_magic_header,
-+							asc->cookie_packet_magic_header,
-+							asc->transport_packet_magic_header);
-+		ret = -EINVAL;
-+	}
-+
-+	if (MESSAGE_INITIATION_SIZE + asc->init_packet_junk_size == MESSAGE_RESPONSE_SIZE + asc->response_packet_junk_size) {
-+		net_dbg_ratelimited("%s: new init size:%d; and new response size:%d; should differ\n",
-+		                    dev->name,
-+		                    MESSAGE_INITIATION_SIZE + asc->init_packet_junk_size,
-+		                    MESSAGE_RESPONSE_SIZE + asc->response_packet_junk_size);
-+		ret = -EINVAL;
-+	}
-+
-+	wg->advanced_security_config.advanced_security_enabled = a_sec_on;
-+out:
-+	return ret;
- }
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/device.h ./device.h
---- ../../linux-source-6.2.0/drivers/net/wireguard/device.h	2023-11-10 18:10:29
-+++ ./device.h	2023-11-23 18:48:52
-@@ -37,6 +37,19 @@
- 	atomic_t count;
- };
- 
-+struct amnezia_config {
-+	bool advanced_security_enabled;
-+	u16 junk_packet_count;
-+	u16 junk_packet_min_size;
-+	u16 junk_packet_max_size;
-+	u16 init_packet_junk_size;
-+	u16 response_packet_junk_size;
-+	u32 init_packet_magic_header;
-+	u32 response_packet_magic_header;
-+	u32 cookie_packet_magic_header;
-+	u32 transport_packet_magic_header;
-+};
-+
- struct wg_device {
- 	struct net_device *dev;
- 	struct crypt_queue encrypt_queue, decrypt_queue, handshake_queue;
-@@ -50,6 +63,7 @@
- 	struct allowedips peer_allowedips;
- 	struct mutex device_update_lock, socket_update_lock;
- 	struct list_head device_list, peer_list;
-+	struct amnezia_config advanced_security_config;
- 	atomic_t handshake_queue_len;
- 	unsigned int num_peers, device_update_gen;
- 	u32 fwmark;
-@@ -58,5 +72,6 @@
- 
- int wg_device_init(void);
- void wg_device_uninit(void);
-+int wg_device_handle_post_config(struct net_device *dev, struct amnezia_config *asc);
- 
- #endif /* _WG_DEVICE_H */
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/main.c ./main.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/main.c	2023-11-10 18:10:29
-+++ ./main.c	2023-11-22 16:37:56
-@@ -3,14 +3,13 @@
-  * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
-  */
- 
--#include "version.h"
- #include "device.h"
- #include "noise.h"
- #include "queueing.h"
- #include "ratelimiter.h"
- #include "netlink.h"
- 
--#include <uapi/linux/wireguard.h>
-+#include "uapi/wireguard.h"
- 
- #include <linux/init.h>
- #include <linux/module.h>
-@@ -45,7 +44,7 @@
- 	if (ret < 0)
- 		goto err_netlink;
- 
--	pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n");
-+	pr_info("WireGuard " WIREGUARD_VERSION " (Amnezia VPN) loaded. See www.wireguard.com for information.\n");
- 	pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.\n");
- 
- 	return 0;
-@@ -71,7 +70,7 @@
- module_init(wg_mod_init);
- module_exit(wg_mod_exit);
- MODULE_LICENSE("GPL v2");
--MODULE_DESCRIPTION("WireGuard secure network tunnel");
-+MODULE_DESCRIPTION("WireGuard (Amnezia VPN) secure network tunnel");
- MODULE_AUTHOR("Jason A. Donenfeld <Jason@zx2c4.com>");
- MODULE_VERSION(WIREGUARD_VERSION);
- MODULE_ALIAS_RTNL_LINK(KBUILD_MODNAME);
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/messages.h ./messages.h
---- ../../linux-source-6.2.0/drivers/net/wireguard/messages.h	2023-11-10 18:10:29
-+++ ./messages.h	2023-11-22 19:16:03
-@@ -117,6 +117,14 @@
- 	MESSAGE_MINIMUM_LENGTH = message_data_len(0)
- };
- 
-+enum message_size {
-+	MESSAGE_INITIATION_SIZE = sizeof(struct message_handshake_initiation),
-+	MESSAGE_RESPONSE_SIZE = sizeof(struct message_handshake_response),
-+	MESSAGE_COOKIE_REPLY_SIZE = sizeof(struct message_handshake_cookie),
-+	MESSAGE_TRANSPORT_SIZE = sizeof(struct message_data),
-+	MESSAGE_MAX_SIZE = 65535
-+};
-+
- #define SKB_HEADER_LEN                                       \
- 	(max(sizeof(struct iphdr), sizeof(struct ipv6hdr)) + \
- 	 sizeof(struct udphdr) + NET_SKB_PAD)
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/netlink.c ./netlink.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/netlink.c	2023-11-10 18:10:29
-+++ ./netlink.c	2023-11-26 17:34:30
-@@ -10,7 +10,7 @@
- #include "queueing.h"
- #include "messages.h"
- 
--#include <uapi/linux/wireguard.h>
-+#include "uapi/wireguard.h"
- 
- #include <linux/if.h>
- #include <net/genetlink.h>
-@@ -27,7 +27,16 @@
- 	[WGDEVICE_A_FLAGS]		= { .type = NLA_U32 },
- 	[WGDEVICE_A_LISTEN_PORT]	= { .type = NLA_U16 },
- 	[WGDEVICE_A_FWMARK]		= { .type = NLA_U32 },
--	[WGDEVICE_A_PEERS]		= { .type = NLA_NESTED }
-+	[WGDEVICE_A_PEERS]		= { .type = NLA_NESTED },
-+	[WGDEVICE_A_JC]		= { .type = NLA_U16 },
-+	[WGDEVICE_A_JMIN]		= { .type = NLA_U16 },
-+	[WGDEVICE_A_JMAX]		= { .type = NLA_U16 },
-+	[WGDEVICE_A_S1]		= { .type = NLA_U16 },
-+	[WGDEVICE_A_S2]		= { .type = NLA_U16 },
-+	[WGDEVICE_A_H1]		= { .type = NLA_U32 },
-+	[WGDEVICE_A_H2]		= { .type = NLA_U32 },
-+	[WGDEVICE_A_H3]		= { .type = NLA_U32 },
-+	[WGDEVICE_A_H4]		= { .type = NLA_U32 }
- };
- 
- static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = {
-@@ -233,7 +242,25 @@
- 				wg->incoming_port) ||
- 		    nla_put_u32(skb, WGDEVICE_A_FWMARK, wg->fwmark) ||
- 		    nla_put_u32(skb, WGDEVICE_A_IFINDEX, wg->dev->ifindex) ||
--		    nla_put_string(skb, WGDEVICE_A_IFNAME, wg->dev->name))
-+		    nla_put_string(skb, WGDEVICE_A_IFNAME, wg->dev->name) ||
-+		    nla_put_u16(skb, WGDEVICE_A_JC,
-+					    wg->advanced_security_config.junk_packet_count) ||
-+		    nla_put_u16(skb, WGDEVICE_A_JMIN,
-+					    wg->advanced_security_config.junk_packet_min_size) ||
-+		    nla_put_u16(skb, WGDEVICE_A_JMAX,
-+					    wg->advanced_security_config.junk_packet_max_size) ||
-+		    nla_put_u16(skb, WGDEVICE_A_S1,
-+					    wg->advanced_security_config.init_packet_junk_size) ||
-+		    nla_put_u16(skb, WGDEVICE_A_S2,
-+					    wg->advanced_security_config.response_packet_junk_size) ||
-+		    nla_put_u32(skb, WGDEVICE_A_H1,
-+					    wg->advanced_security_config.init_packet_magic_header) ||
-+		    nla_put_u32(skb, WGDEVICE_A_H2,
-+					    wg->advanced_security_config.response_packet_magic_header) ||
-+		    nla_put_u32(skb, WGDEVICE_A_H3,
-+					    wg->advanced_security_config.cookie_packet_magic_header) ||
-+		    nla_put_u32(skb, WGDEVICE_A_H4,
-+					    wg->advanced_security_config.transport_packet_magic_header))
- 			goto out;
- 
- 		down_read(&wg->static_identity.lock);
-@@ -493,6 +520,7 @@
- static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
- {
- 	struct wg_device *wg = lookup_interface(info->attrs, skb);
-+	struct amnezia_config *asc = kzalloc(sizeof(*asc), GFP_KERNEL);
- 	u32 flags = 0;
- 	int ret;
- 
-@@ -537,6 +565,51 @@
- 			goto out;
- 	}
- 
-+	if (info->attrs[WGDEVICE_A_JC]) {
-+		asc->advanced_security_enabled = true;
-+		asc->junk_packet_count = nla_get_u16(info->attrs[WGDEVICE_A_JC]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_JMIN]) {
-+		asc->advanced_security_enabled = true;
-+		asc->junk_packet_min_size = nla_get_u16(info->attrs[WGDEVICE_A_JMIN]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_JMAX]) {
-+		asc->advanced_security_enabled = true;
-+		asc->junk_packet_max_size = nla_get_u16(info->attrs[WGDEVICE_A_JMAX]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_S1]) {
-+		asc->advanced_security_enabled = true;
-+		asc->init_packet_junk_size = nla_get_u16(info->attrs[WGDEVICE_A_S1]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_S2]) {
-+		asc->advanced_security_enabled = true;
-+		asc->response_packet_junk_size = nla_get_u16(info->attrs[WGDEVICE_A_S2]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_H1]) {
-+		asc->advanced_security_enabled = true;
-+		asc->init_packet_magic_header = nla_get_u32(info->attrs[WGDEVICE_A_H1]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_H2]) {
-+		asc->advanced_security_enabled = true;
-+		asc->response_packet_magic_header = nla_get_u32(info->attrs[WGDEVICE_A_H2]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_H3]) {
-+		asc->advanced_security_enabled = true;
-+		asc->cookie_packet_magic_header = nla_get_u32(info->attrs[WGDEVICE_A_H3]);
-+	}
-+
-+	if (info->attrs[WGDEVICE_A_H4]) {
-+		asc->advanced_security_enabled = true;
-+		asc->transport_packet_magic_header = nla_get_u32(info->attrs[WGDEVICE_A_H4]);
-+	}
-+
- 	if (flags & WGDEVICE_F_REPLACE_PEERS)
- 		wg_peer_remove_all(wg);
- 
-@@ -597,10 +670,14 @@
- 	ret = 0;
- 
- out:
-+	if (!ret)
-+		ret = wg_device_handle_post_config(wg->dev, asc);
-+
- 	mutex_unlock(&wg->device_update_lock);
- 	rtnl_unlock();
- 	dev_put(wg->dev);
- out_nodev:
-+	kfree(asc);
- 	if (info->attrs[WGDEVICE_A_PRIVATE_KEY])
- 		memzero_explicit(nla_data(info->attrs[WGDEVICE_A_PRIVATE_KEY]),
- 				 nla_len(info->attrs[WGDEVICE_A_PRIVATE_KEY]));
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/noise.c ./noise.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/noise.c	2023-11-10 18:10:29
-+++ ./noise.c	2023-11-23 18:58:26
-@@ -515,7 +515,7 @@
- 
- bool
- wg_noise_handshake_create_initiation(struct message_handshake_initiation *dst,
--				     struct noise_handshake *handshake)
-+				     struct noise_handshake *handshake, u32 message_type)
- {
- 	u8 timestamp[NOISE_TIMESTAMP_LEN];
- 	u8 key[NOISE_SYMMETRIC_KEY_LEN];
-@@ -532,7 +532,7 @@
- 	if (unlikely(!handshake->static_identity->has_identity))
- 		goto out;
- 
--	dst->header.type = cpu_to_le32(MESSAGE_HANDSHAKE_INITIATION);
-+	dst->header.type = cpu_to_le32(message_type);
- 
- 	handshake_init(handshake->chaining_key, handshake->hash,
- 		       handshake->remote_static);
-@@ -665,7 +665,7 @@
- }
- 
- bool wg_noise_handshake_create_response(struct message_handshake_response *dst,
--					struct noise_handshake *handshake)
-+					struct noise_handshake *handshake, u32 message_type)
- {
- 	u8 key[NOISE_SYMMETRIC_KEY_LEN];
- 	bool ret = false;
-@@ -681,7 +681,7 @@
- 	if (handshake->state != HANDSHAKE_CONSUMED_INITIATION)
- 		goto out;
- 
--	dst->header.type = cpu_to_le32(MESSAGE_HANDSHAKE_RESPONSE);
-+	dst->header.type = cpu_to_le32(message_type);
- 	dst->receiver_index = handshake->remote_index;
- 
- 	/* e */
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/noise.h ./noise.h
---- ../../linux-source-6.2.0/drivers/net/wireguard/noise.h	2023-11-10 18:10:29
-+++ ./noise.h	2023-11-23 13:12:55
-@@ -118,13 +118,13 @@
- 
- bool
- wg_noise_handshake_create_initiation(struct message_handshake_initiation *dst,
--				     struct noise_handshake *handshake);
-+				     struct noise_handshake *handshake, u32 message_type);
- struct wg_peer *
- wg_noise_handshake_consume_initiation(struct message_handshake_initiation *src,
- 				      struct wg_device *wg);
- 
- bool wg_noise_handshake_create_response(struct message_handshake_response *dst,
--					struct noise_handshake *handshake);
-+					struct noise_handshake *handshake, u32 message_type);
- struct wg_peer *
- wg_noise_handshake_consume_response(struct message_handshake_response *src,
- 				    struct wg_device *wg);
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/receive.c ./receive.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/receive.c	2023-11-10 18:10:29
-+++ ./receive.c	2023-11-23 19:15:51
-@@ -25,25 +25,51 @@
- 
- #define SKB_TYPE_LE32(skb) (((struct message_header *)(skb)->data)->type)
- 
--static size_t validate_header_len(struct sk_buff *skb)
-+static size_t validate_header_len(struct sk_buff *skb, struct wg_device *wg)
- {
- 	if (unlikely(skb->len < sizeof(struct message_header)))
- 		return 0;
--	if (SKB_TYPE_LE32(skb) == cpu_to_le32(MESSAGE_DATA) &&
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.transport_packet_magic_header) &&
- 	    skb->len >= MESSAGE_MINIMUM_LENGTH)
- 		return sizeof(struct message_data);
--	if (SKB_TYPE_LE32(skb) == cpu_to_le32(MESSAGE_HANDSHAKE_INITIATION) &&
--	    skb->len == sizeof(struct message_handshake_initiation))
--		return sizeof(struct message_handshake_initiation);
--	if (SKB_TYPE_LE32(skb) == cpu_to_le32(MESSAGE_HANDSHAKE_RESPONSE) &&
--	    skb->len == sizeof(struct message_handshake_response))
--		return sizeof(struct message_handshake_response);
--	if (SKB_TYPE_LE32(skb) == cpu_to_le32(MESSAGE_HANDSHAKE_COOKIE) &&
--	    skb->len == sizeof(struct message_handshake_cookie))
--		return sizeof(struct message_handshake_cookie);
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.init_packet_magic_header) &&
-+	    skb->len == MESSAGE_INITIATION_SIZE)
-+		return MESSAGE_INITIATION_SIZE;
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.response_packet_magic_header) &&
-+	    skb->len == MESSAGE_RESPONSE_SIZE)
-+		return MESSAGE_RESPONSE_SIZE;
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.cookie_packet_magic_header) &&
-+	    skb->len == MESSAGE_COOKIE_REPLY_SIZE)
-+		return MESSAGE_COOKIE_REPLY_SIZE;
- 	return 0;
- }
- 
-+void prepare_advanced_secured_message(struct sk_buff *skb, struct wg_device *wg)
-+{
-+	u32 assumed_type = SKB_TYPE_LE32(skb);
-+	u32 assumed_offset;
-+
-+	if (wg->advanced_security_config.advanced_security_enabled) {
-+		if (skb->len == MESSAGE_INITIATION_SIZE + wg->advanced_security_config.init_packet_junk_size) {
-+			assumed_type = cpu_to_le32(wg->advanced_security_config.init_packet_magic_header);
-+			assumed_offset = wg->advanced_security_config.init_packet_junk_size;
-+		} else if (skb->len == MESSAGE_RESPONSE_SIZE + wg->advanced_security_config.response_packet_junk_size) {
-+			assumed_type = cpu_to_le32(wg->advanced_security_config.response_packet_magic_header);
-+			assumed_offset = wg->advanced_security_config.response_packet_junk_size;
-+		} else
-+			return;
-+
-+		if (unlikely(assumed_offset <= 0) || unlikely(!pskb_may_pull(skb, assumed_offset)))
-+			return;
-+
-+		skb_pull(skb, assumed_offset);
-+
-+		if (SKB_TYPE_LE32(skb) != assumed_type) {
-+			skb_push(skb, assumed_offset);
-+		}
-+	}
-+}
-+
- static int prepare_skb_header(struct sk_buff *skb, struct wg_device *wg)
- {
- 	size_t data_offset, data_len, header_len;
-@@ -79,7 +105,8 @@
- 	if (unlikely(skb->len != data_len))
- 		/* Final len does not agree with calculated len */
- 		return -EINVAL;
--	header_len = validate_header_len(skb);
-+	prepare_advanced_secured_message(skb, wg);
-+	header_len = validate_header_len(skb, wg);
- 	if (unlikely(!header_len))
- 		return -EINVAL;
- 	__skb_push(skb, data_offset);
-@@ -101,7 +128,7 @@
- 	bool packet_needs_cookie;
- 	bool under_load;
- 
--	if (SKB_TYPE_LE32(skb) == cpu_to_le32(MESSAGE_HANDSHAKE_COOKIE)) {
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.cookie_packet_magic_header)) {
- 		net_dbg_skb_ratelimited("%s: Receiving cookie response from %pISpfsc\n",
- 					wg->dev->name, skb);
- 		wg_cookie_message_consume(
-@@ -131,8 +158,7 @@
- 		return;
- 	}
- 
--	switch (SKB_TYPE_LE32(skb)) {
--	case cpu_to_le32(MESSAGE_HANDSHAKE_INITIATION): {
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.init_packet_magic_header)) {
- 		struct message_handshake_initiation *message =
- 			(struct message_handshake_initiation *)skb->data;
- 
-@@ -152,9 +178,8 @@
- 				    wg->dev->name, peer->internal_id,
- 				    &peer->endpoint.addr);
- 		wg_packet_send_handshake_response(peer);
--		break;
- 	}
--	case cpu_to_le32(MESSAGE_HANDSHAKE_RESPONSE): {
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.response_packet_magic_header)) {
- 		struct message_handshake_response *message =
- 			(struct message_handshake_response *)skb->data;
- 
-@@ -185,9 +210,7 @@
- 			 */
- 			wg_packet_send_keepalive(peer);
- 		}
--		break;
- 	}
--	}
- 
- 	if (unlikely(!peer)) {
- 		WARN(1, "Somehow a wrong type of packet wound up in the handshake queue!\n");
-@@ -543,10 +566,10 @@
- {
- 	if (unlikely(prepare_skb_header(skb, wg) < 0))
- 		goto err;
--	switch (SKB_TYPE_LE32(skb)) {
--	case cpu_to_le32(MESSAGE_HANDSHAKE_INITIATION):
--	case cpu_to_le32(MESSAGE_HANDSHAKE_RESPONSE):
--	case cpu_to_le32(MESSAGE_HANDSHAKE_COOKIE): {
-+
-+	if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.init_packet_magic_header) ||
-+	    SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.response_packet_magic_header) ||
-+	    SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.cookie_packet_magic_header)) {
- 		int cpu, ret = -EBUSY;
- 
- 		if (unlikely(!rng_is_initialized()))
-@@ -559,23 +582,20 @@
- 		} else
- 			ret = ptr_ring_produce_bh(&wg->handshake_queue.ring, skb);
- 		if (ret) {
--	drop:
-+drop:
- 			net_dbg_skb_ratelimited("%s: Dropping handshake packet from %pISpfsc\n",
--						wg->dev->name, skb);
-+			                        wg->dev->name, skb);
- 			goto err;
- 		}
- 		atomic_inc(&wg->handshake_queue_len);
- 		cpu = wg_cpumask_next_online(&wg->handshake_queue.last_cpu);
- 		/* Queues up a call to packet_process_queued_handshake_packets(skb): */
- 		queue_work_on(cpu, wg->handshake_receive_wq,
--			      &per_cpu_ptr(wg->handshake_queue.worker, cpu)->work);
--		break;
--	}
--	case cpu_to_le32(MESSAGE_DATA):
-+		              &per_cpu_ptr(wg->handshake_queue.worker, cpu)->work);
-+	} else if (SKB_TYPE_LE32(skb) == cpu_to_le32(wg->advanced_security_config.transport_packet_magic_header)) {
- 		PACKET_CB(skb)->ds = ip_tunnel_get_dsfield(ip_hdr(skb), skb);
- 		wg_packet_consume_data(wg, skb);
--		break;
--	default:
-+	} else {
- 		WARN(1, "Non-exhaustive parsing of packet header lead to unknown packet type!\n");
- 		goto err;
- 	}
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/send.c ./send.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/send.c	2023-11-10 18:10:29
-+++ ./send.c	2023-11-24 18:25:50
-@@ -14,13 +14,24 @@
- #include <linux/uio.h>
- #include <linux/inetdevice.h>
- #include <linux/socket.h>
-+#include <linux/random.h>
- #include <net/ip_tunnels.h>
- #include <net/udp.h>
- #include <net/sock.h>
- 
-+u32 wg_get_random_u32_inclusive(u32 floor, u32 ceil)
-+{
-+	u32 diff = ceil - floor + 1;
-+	return floor + (get_random_u32() % diff);
-+}
-+
- static void wg_packet_send_handshake_initiation(struct wg_peer *peer)
- {
- 	struct message_handshake_initiation packet;
-+	struct wg_device *wg = peer->device;
-+	void *buffer;
-+	u8 ds;
-+	u16 junk_packet_count, junk_packet_size;
- 
- 	if (!wg_birthdate_has_expired(atomic64_read(&peer->last_sent_handshake),
- 				      REKEY_TIMEOUT))
-@@ -31,14 +42,37 @@
- 			    peer->device->dev->name, peer->internal_id,
- 			    &peer->endpoint.addr);
- 
--	if (wg_noise_handshake_create_initiation(&packet, &peer->handshake)) {
-+	if (wg->advanced_security_config.advanced_security_enabled) {
-+		junk_packet_count = wg->advanced_security_config.junk_packet_count;
-+		buffer = kzalloc(wg->advanced_security_config.junk_packet_max_size, GFP_KERNEL);
-+
-+		while (junk_packet_count-- > 0) {
-+			junk_packet_size = (u16) wg_get_random_u32_inclusive(
-+					wg->advanced_security_config.junk_packet_min_size,
-+					wg->advanced_security_config.junk_packet_max_size);
-+
-+			get_random_bytes(buffer, junk_packet_size);
-+			get_random_bytes(&ds, 1);
-+			wg_socket_send_buffer_to_peer(peer, buffer, junk_packet_size, ds);
-+		}
-+
-+		kfree(buffer);
-+	}
-+
-+	if (wg_noise_handshake_create_initiation(&packet, &peer->handshake, wg->advanced_security_config.init_packet_magic_header)) {
- 		wg_cookie_add_mac_to_packet(&packet, sizeof(packet), peer);
- 		wg_timers_any_authenticated_packet_traversal(peer);
- 		wg_timers_any_authenticated_packet_sent(peer);
- 		atomic64_set(&peer->last_sent_handshake,
- 			     ktime_get_coarse_boottime_ns());
--		wg_socket_send_buffer_to_peer(peer, &packet, sizeof(packet),
--					      HANDSHAKE_DSCP);
-+
-+		if (wg->advanced_security_config.advanced_security_enabled) {
-+			wg_socket_send_junked_buffer_to_peer(peer, &packet, sizeof(packet),
-+			                              HANDSHAKE_DSCP, wg->advanced_security_config.init_packet_junk_size);
-+		} else {
-+			wg_socket_send_buffer_to_peer(peer, &packet, sizeof(packet),
-+			                              HANDSHAKE_DSCP);
-+		}
- 		wg_timers_handshake_initiated(peer);
- 	}
- }
-@@ -85,13 +119,14 @@
- void wg_packet_send_handshake_response(struct wg_peer *peer)
- {
- 	struct message_handshake_response packet;
-+	struct wg_device *wg = peer->device;
- 
- 	atomic64_set(&peer->last_sent_handshake, ktime_get_coarse_boottime_ns());
- 	net_dbg_ratelimited("%s: Sending handshake response to peer %llu (%pISpfsc)\n",
- 			    peer->device->dev->name, peer->internal_id,
- 			    &peer->endpoint.addr);
- 
--	if (wg_noise_handshake_create_response(&packet, &peer->handshake)) {
-+	if (wg_noise_handshake_create_response(&packet, &peer->handshake, wg->advanced_security_config.response_packet_magic_header)) {
- 		wg_cookie_add_mac_to_packet(&packet, sizeof(packet), peer);
- 		if (wg_noise_handshake_begin_session(&peer->handshake,
- 						     &peer->keypairs)) {
-@@ -100,9 +135,16 @@
- 			wg_timers_any_authenticated_packet_sent(peer);
- 			atomic64_set(&peer->last_sent_handshake,
- 				     ktime_get_coarse_boottime_ns());
--			wg_socket_send_buffer_to_peer(peer, &packet,
--						      sizeof(packet),
--						      HANDSHAKE_DSCP);
-+			if (wg->advanced_security_config.advanced_security_enabled) {
-+				wg_socket_send_junked_buffer_to_peer(peer, &packet,
-+				                              sizeof(packet),
-+				                              HANDSHAKE_DSCP,
-+				                              wg->advanced_security_config.response_packet_junk_size);
-+			} else {
-+				wg_socket_send_buffer_to_peer(peer, &packet,
-+							      sizeof(packet),
-+							      HANDSHAKE_DSCP);
-+			}
- 		}
- 	}
- }
-@@ -116,7 +158,7 @@
- 	net_dbg_skb_ratelimited("%s: Sending cookie response for denied handshake message for %pISpfsc\n",
- 				wg->dev->name, initiating_skb);
- 	wg_cookie_message_create(&packet, initiating_skb, sender_index,
--				 &wg->cookie_checker);
-+				 &wg->cookie_checker, wg->advanced_security_config.cookie_packet_magic_header);
- 	wg_socket_send_buffer_as_reply_to_skb(wg, initiating_skb, &packet,
- 					      sizeof(packet));
- }
-@@ -159,7 +201,7 @@
- 	return padded_size - last_unit;
- }
- 
--static bool encrypt_packet(struct sk_buff *skb, struct noise_keypair *keypair)
-+static bool encrypt_packet(struct sk_buff *skb, struct noise_keypair *keypair, u32 message_type)
- {
- 	unsigned int padding_len, plaintext_len, trailer_len;
- 	struct scatterlist sg[MAX_SKB_FRAGS + 8];
-@@ -203,7 +245,7 @@
- 	 */
- 	skb_set_inner_network_header(skb, 0);
- 	header = (struct message_data *)skb_push(skb, sizeof(*header));
--	header->header.type = cpu_to_le32(MESSAGE_DATA);
-+	header->header.type = cpu_to_le32(message_type);
- 	header->key_idx = keypair->remote_index;
- 	header->counter = cpu_to_le64(PACKET_CB(skb)->nonce);
- 	pskb_put(skb, trailer, trailer_len);
-@@ -289,13 +331,17 @@
- 	struct crypt_queue *queue = container_of(work, struct multicore_worker,
- 						 work)->ptr;
- 	struct sk_buff *first, *skb, *next;
-+	struct wg_device *wg;
- 
- 	while ((first = ptr_ring_consume_bh(&queue->ring)) != NULL) {
- 		enum packet_state state = PACKET_STATE_CRYPTED;
- 
- 		skb_list_walk_safe(first, skb, next) {
-+			wg = PACKET_PEER(first)->device;
-+
- 			if (likely(encrypt_packet(skb,
--					PACKET_CB(first)->keypair))) {
-+					PACKET_CB(first)->keypair,
-+					wg->advanced_security_config.transport_packet_magic_header))) {
- 				wg_reset_packet(skb, true);
- 			} else {
- 				state = PACKET_STATE_DEAD;
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/socket.c ./socket.c
---- ../../linux-source-6.2.0/drivers/net/wireguard/socket.c	2023-11-10 18:10:29
-+++ ./socket.c	2023-11-23 15:45:07
-@@ -200,6 +200,18 @@
- 	return wg_socket_send_skb_to_peer(peer, skb, ds);
- }
- 
-+int wg_socket_send_junked_buffer_to_peer(struct wg_peer *peer, void *buffer,
-+                                          size_t len, u8 ds, u16 junk_size)
-+{
-+	int ret;
-+	void *new_buffer = kzalloc(len + junk_size, GFP_KERNEL);
-+	get_random_bytes(new_buffer, junk_size);
-+	memcpy(new_buffer + junk_size, buffer, len);
-+	ret = wg_socket_send_buffer_to_peer(peer, new_buffer, len + junk_size, ds);
-+	kfree(new_buffer);
-+	return ret;
-+}
-+
- int wg_socket_send_buffer_as_reply_to_skb(struct wg_device *wg,
- 					  struct sk_buff *in_skb, void *buffer,
- 					  size_t len)
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/socket.h ./socket.h
---- ../../linux-source-6.2.0/drivers/net/wireguard/socket.h	2023-11-10 18:10:29
-+++ ./socket.h	2023-11-23 13:20:24
-@@ -16,6 +16,8 @@
- 		      struct sock *new6);
- int wg_socket_send_buffer_to_peer(struct wg_peer *peer, void *data,
- 				  size_t len, u8 ds);
-+int wg_socket_send_junked_buffer_to_peer(struct wg_peer *peer, void *data,
-+                                  size_t len, u8 ds, u16 junk_size);
- int wg_socket_send_skb_to_peer(struct wg_peer *peer, struct sk_buff *skb,
- 			       u8 ds);
- int wg_socket_send_buffer_as_reply_to_skb(struct wg_device *wg,
-diff --color -urN -x uapi -x compat -x crypto -x .idea -x tests -x Kbuild -x Kconfig -x Makefile -x dkms.conf ../../linux-source-6.2.0/drivers/net/wireguard/version.h ./version.h
---- ../../linux-source-6.2.0/drivers/net/wireguard/version.h	2023-11-10 18:10:29
-+++ ./version.h	1970-01-01 02:00:00
-@@ -1 +0,0 @@
--#define WIREGUARD_VERSION "1.0.0"
diff --git a/kmod-amneziawg/files/amnezia-uapi.patch b/kmod-amneziawg/files/amnezia-uapi.patch
deleted file mode 100644
index cbe2193..0000000
--- a/kmod-amneziawg/files/amnezia-uapi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ../../linux-source-6.2.0/include/uapi/linux/wireguard.h	2023-09-23 12:11:13
-+++ ./uapi/wireguard.h	2023-11-28 16:12:36
-@@ -131,7 +131,7 @@
- #ifndef _WG_UAPI_WIREGUARD_H
- #define _WG_UAPI_WIREGUARD_H
- 
--#define WG_GENL_NAME "wireguard"
-+#define WG_GENL_NAME "amneziawg"
- #define WG_GENL_VERSION 1
- 
- #define WG_KEY_LEN 32
-@@ -157,6 +157,15 @@
- 	WGDEVICE_A_LISTEN_PORT,
- 	WGDEVICE_A_FWMARK,
- 	WGDEVICE_A_PEERS,
-+	WGDEVICE_A_JC,
-+	WGDEVICE_A_JMIN,
-+	WGDEVICE_A_JMAX,
-+	WGDEVICE_A_S1,
-+	WGDEVICE_A_S2,
-+	WGDEVICE_A_H1,
-+	WGDEVICE_A_H2,
-+	WGDEVICE_A_H3,
-+	WGDEVICE_A_H4,
- 	__WGDEVICE_A_LAST
- };
- #define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1)
diff --git a/kmod-amneziawg/src/Makefile b/kmod-amneziawg/src/Makefile
deleted file mode 100644
index f0473ba..0000000
--- a/kmod-amneziawg/src/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-WIREGUARD_VERSION = 1.0.0-awg
-
-ccflags-y := -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
-ccflags-y += -D'WIREGUARD_VERSION="$(WIREGUARD_VERSION)"'
-# ccflags-y += -DDEBUG
-amneziawg-y := main.o
-amneziawg-y += noise.o
-amneziawg-y += device.o
-amneziawg-y += peer.o
-amneziawg-y += timers.o
-amneziawg-y += queueing.o
-amneziawg-y += send.o
-amneziawg-y += receive.o
-amneziawg-y += socket.o
-amneziawg-y += peerlookup.o
-amneziawg-y += allowedips.o
-amneziawg-y += ratelimiter.o
-amneziawg-y += cookie.o
-amneziawg-y += netlink.o
-obj-m := amneziawg.o
diff --git a/luci-app-amneziawg/Makefile b/luci-app-amneziawg/Makefile
deleted file mode 100644
index 037cd50..0000000
--- a/luci-app-amneziawg/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2016 Dan Luedtke <mail@danrl.com>
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=Support for AmneziaWG VPN
-LUCI_DEPENDS:=+amneziawg-tools +ucode +qrencode
-LUCI_PKGARCH:=all
-
-PKG_PROVIDES:=luci-app-amneziawg
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile
new file mode 100644
index 0000000..15562da
--- /dev/null
+++ b/luci-proto-amneziawg/Makefile
@@ -0,0 +1,13 @@
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for AmneziaWG VPN
+LUCI_DESCRIPTION:=Provides support and Web UI for AmneziaWG VPN
+PKG_VERSION:=2.0.4
+LUCI_DEPENDS:=+amneziawg-tools +ucode +luci-lib-uqr +resolveip
+LUCI_PKGARCH:=all
+
+PKG_LICENSE:=Apache-2.0
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/icons/amneziawg.svg b/luci-proto-amneziawg/htdocs/luci-static/resources/icons/amneziawg.svg
new file mode 100644
index 0000000..5bf7f01
--- /dev/null
+++ b/luci-proto-amneziawg/htdocs/luci-static/resources/icons/amneziawg.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="linearGradient7889" x1="-7.852" x2="-5.51" y1="3.755" y2="18.94" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" offset="0"/>
+      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+    </linearGradient>
+    <filter id="filter5386" x="-.01972" y="-.02176" width="1.039" height="1.044" color-interpolation-filters="sRGB">
+      <feGaussianBlur stdDeviation="0.26293105"/>
+    </filter>
+    <linearGradient id="linearGradient7822-4">
+      <stop offset="0"/>
+      <stop stop-opacity="0" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4598">
+      <stop stop-color="#fff" offset="0"/>
+      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient7652-3">
+      <stop stop-color="#729fcf" offset="0"/>
+      <stop stop-color="#729fcf" stop-opacity="0" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient1643253" x1="-7.975" x2="-11.01" y1="25.36" y2="-6.568" gradientTransform="matrix(2 0 0 1.933 43.5 .5333)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#d3d7cf" offset="0"/>
+      <stop stop-color="#fff" offset="1"/>
+    </linearGradient>
+    <filter id="filter5386-2" x="-.01972" y="-.02176" width="1.039" height="1.044" color-interpolation-filters="sRGB">
+      <feGaussianBlur stdDeviation="0.26293105"/>
+    </filter>
+    <linearGradient id="linearGradient6175" x1="22.36" x2="28.25" y1="11.89" y2="11.89" gradientUnits="userSpaceOnUse" href="#linearGradient7652-3"/>
+    <linearGradient id="linearGradient6239" x1="22.69" x2="27.97" y1="11.85" y2="11.85" gradientUnits="userSpaceOnUse" href="#linearGradient4598"/>
+    <linearGradient id="linearGradient9" x1="25.05" x2="27.76" y1="16.17" y2="24.54" gradientTransform="matrix(1.088 0 0 1.086 294.4 40.06)" gradientUnits="userSpaceOnUse" href="#linearGradient3983"/>
+    <linearGradient id="linearGradient3983">
+      <stop stop-color="#555753" offset="0"/>
+      <stop stop-color="#888a85" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient11" x1="326.5" x2="326.5" y1="61.7" y2="60.69" gradientUnits="userSpaceOnUse" href="#linearGradient4175"/>
+    <linearGradient id="linearGradient4175">
+      <stop stop-color="#babdb6" offset="0"/>
+      <stop stop-color="#fff" offset="1"/>
+    </linearGradient>
+    <radialGradient id="radialGradient4612-0" cx="306.5" cy="86.38" r="21.91" gradientTransform="matrix(2.238 -.5404 .1485 .615 -392 204.4)" gradientUnits="userSpaceOnUse" href="#linearGradient7822-4"/>
+    <filter id="filter4618-7" x="-.07545" y="-.06204" width="1.151" height="1.143">
+      <feGaussianBlur stdDeviation="0.89652215"/>
+    </filter>
+    <linearGradient id="linearGradient12" x1="322.3" x2="328.4" y1="62.62" y2="68.74" gradientTransform="matrix(.75 0 0 .8333 81.62 10.42)" gradientUnits="userSpaceOnUse" href="#linearGradient4206"/>
+    <linearGradient id="linearGradient4206">
+      <stop stop-color="#fff" offset="0"/>
+      <stop stop-color="#babdb6" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient13" x1="325.4" x2="328.4" y1="63.27" y2="68.74" gradientTransform="matrix(.5 0 0 .5 -489.8 -97.75)" gradientUnits="userSpaceOnUse" href="#linearGradient4206"/>
+    <linearGradient id="linearGradient14" x1="-47.16" x2="-46.15" y1="39.38" y2="44.17" gradientTransform="translate(386,50)" gradientUnits="userSpaceOnUse" href="#linearGradient7652-3"/>
+    <linearGradient id="linearGradient15" x1="-48" x2="-46.75" y1="40.38" y2="45.69" gradientTransform="translate(386,50)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#3465a4" offset="0"/>
+      <stop stop-color="#3465a4" stop-opacity="0" offset="1"/>
+    </linearGradient>
+    <radialGradient id="radialGradient81" cx="306.5" cy="86.38" r="21.91" gradientTransform="matrix(1.058 -1.042 .4439 .4509 -55.95 372.2)" gradientUnits="userSpaceOnUse" href="#linearGradient7822-4"/>
+    <filter id="filter4618" x="-.1134" y="-.08587" width="1.226" height="1.205">
+      <feGaussianBlur stdDeviation="0.89652215"/>
+    </filter>
+    <linearGradient id="linearGradient85" x1="-75.84" x2="-75.96" y1="48.62" y2="53.84" gradientTransform="translate(386,50)" gradientUnits="userSpaceOnUse" href="#linearGradient7652-3"/>
+  </defs>
+  <rect x="22.65" y="10.74" width="5.314" height="2.304" fill="url(#linearGradient6175)" opacity=".7" stroke="#3364a3" stroke-width=".5772"/>
+  <path d="m22.7 11.88 5.271-0.04727" fill="none" opacity=".19" stroke="url(#linearGradient6239)" stroke-width=".795"/>
+  <g transform="rotate(-90 37.29 12.78)">
+    <rect x="22.65" y="10.74" width="5.314" height="2.304" fill="url(#linearGradient6175)" opacity=".7" stroke="#3364a3" stroke-width=".5772"/>
+    <path d="m22.7 11.88 5.271-0.04727" fill="none" opacity=".19" stroke="url(#linearGradient6239)" stroke-width=".795"/>
+  </g>
+  <g transform="matrix(.6351 0 0 .6351 16.55 26.45)" enable-background="new">
+    <rect x="14.5" y="1.5" width="32" height="29" rx="2.877" ry="2.781" fill="url(#linearGradient1643253)" fill-rule="evenodd" stroke="#888a85" stroke-dashoffset=".7" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".9924"/>
+    <path transform="matrix(2.143 0 0 2.087 44.43 -.6302)" d="m-12.5 1.498c-0.573 0-1.002 0.429-1.002 1.002v11c0 0.573 0.429 1.002 1.002 1.002h12c0.573 0 1.002-0.429 1.002-1.002v-11c0-0.573-0.429-1.002-1.002-1.002z" fill="none" stroke="url(#linearGradient7889)" stroke-dashoffset=".7" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".9924" stroke-width=".4729"/>
+    <rect transform="matrix(1.016 0 0 1.016 -.49 -.2715)" x="15.38" y="2.875" width="32" height="29" rx="3.723" ry="3.723" fill-rule="evenodd" filter="url(#filter5386-2)" opacity=".1205"/>
+  </g>
+  <g transform="matrix(.6351 0 0 .6351 -6.855 1.584)" enable-background="new">
+    <rect x="14.5" y="1.5" width="32" height="29" rx="2.877" ry="2.781" fill="url(#linearGradient1643253)" fill-rule="evenodd" stroke="#888a85" stroke-dashoffset=".7" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".9924"/>
+    <path transform="matrix(2.143 0 0 2.087 44.43 -.6302)" d="m-12.5 1.498c-0.573 0-1.002 0.429-1.002 1.002v11c0 0.573 0.429 1.002 1.002 1.002h12c0.573 0 1.002-0.429 1.002-1.002v-11c0-0.573-0.429-1.002-1.002-1.002z" fill="none" stroke="url(#linearGradient7889)" stroke-dashoffset=".7" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".9924" stroke-width=".4729"/>
+    <rect transform="matrix(1.016 0 0 1.016 -.49 -.2715)" x="15.38" y="2.875" width="32" height="29" rx="3.723" ry="3.723" fill-rule="evenodd" filter="url(#filter5386)" opacity=".1205"/>
+    <g transform="matrix(1.406 0 0 1.406 -428.3 -73.72)" enable-background="new">
+      <path d="m325 59.07c-0.64 0-1.16 0.516-1.16 1.154v0.288c0 0.293-0.23 0.543-0.54 0.543h-0.12c-0.64 0-1.16 0.704-1.16 1.342v5.445c0 0.638 0.52 1.154 1.16 1.154h6.56c0.64 0 1.16-0.516 1.16-1.154v-5.445c0-0.638-0.52-1.342-1.16-1.342h-0.14c-0.26 0.02-0.55-0.186-0.55-0.526v-0.305c0-0.638-0.51-1.154-1.15-1.154z" fill="url(#linearGradient9)" fill-rule="evenodd" stroke="#fff" stroke-width="2"/>
+      <path d="m325 59.07c-0.64 0-1.16 0.516-1.16 1.154v0.288c0 0.293-0.23 0.543-0.54 0.543h-0.12c-0.64 0-1.16 0.704-1.16 1.342v5.445c0 0.638 0.52 1.154 1.16 1.154h6.56c0.64 0 1.16-0.516 1.16-1.154v-5.445c0-0.638-0.52-1.342-1.16-1.342h-0.14c-0.26 0.02-0.55-0.186-0.55-0.526v-0.305c0-0.638-0.51-1.154-1.15-1.154z" fill="url(#linearGradient9)" fill-rule="evenodd"/>
+      <rect x="325" y="60" width="3" height="2" rx=".3978" ry=".3978" color="#000000" fill="url(#linearGradient11)"/>
+      <path d="m300.6 93.52c-10.11-0.638 23.68-8.647 25.95-26.52" fill="none" filter="url(#filter4618)" opacity=".4944" stroke="url(#radialGradient81)" stroke-width="2"/>
+      <rect x="323.5" y="62.5" width="6" height="5" rx=".1768" ry=".1768" color="#000000" fill="#d3d7cf" stroke="url(#linearGradient12)"/>
+      <rect transform="scale(-1)" x="-328.5" y="-66.5" width="4" height="3" rx=".1768" ry=".1768" color="#000000" fill="#888a85" stroke="url(#linearGradient13)"/>
+      <path d="m325 63.81c-1.03 8.083-9.29 14.95-16.38 19.75-3.54 2.401-6.67 4.247-8.53 5.718-0.46 0.368-0.85 0.712-1.18 1.125-0.34 0.414 0.82 1.821 1.56 1.287 3.35-2.449 5.69-2.784 12.14-7.804 5.82-4.537 14.14-9.908 15.39-19.7z" color="#000000" fill="url(#linearGradient85)" fill-rule="evenodd" stroke="#3465a4" stroke-linejoin="round"/>
+      <path transform="scale(-1)" d="m-324.5-63.99c0 0.1-0.13 0.492-0.21 0.492h-3.64c-0.1 0-0.18-0.08-0.18-0.177v-2.646c0-0.1 0.42-0.177 0.5-0.177" color="#000000" fill="none" stroke="url(#linearGradient13)"/>
+    </g>
+  </g>
+  <g transform="matrix(.8965 0 0 .8965 -256.5 -20.48)" enable-background="new">
+    <path d="m325 59.07c-0.64 0-1.16 0.516-1.16 1.154v0.288c0 0.293-0.23 0.543-0.54 0.543h-0.12c-0.64 0-1.16 0.704-1.16 1.342v5.445c0 0.638 0.52 1.154 1.16 1.154h6.56c0.64 0 1.16-0.516 1.16-1.154v-5.445c0-0.638-0.52-1.342-1.16-1.342h-0.14c-0.26 0.02-0.55-0.186-0.55-0.526v-0.305c0-0.638-0.51-1.154-1.15-1.154z" fill="url(#linearGradient9)" fill-rule="evenodd" stroke="#fff" stroke-width="2"/>
+    <path d="m325 59.07c-0.64 0-1.16 0.516-1.16 1.154v0.288c0 0.293-0.23 0.543-0.54 0.543h-0.12c-0.64 0-1.16 0.704-1.16 1.342v5.445c0 0.638 0.52 1.154 1.16 1.154h6.56c0.64 0 1.16-0.516 1.16-1.154v-5.445c0-0.638-0.52-1.342-1.16-1.342h-0.14c-0.26 0.02-0.55-0.186-0.55-0.526v-0.305c0-0.638-0.51-1.154-1.15-1.154z" fill="url(#linearGradient9)" fill-rule="evenodd"/>
+    <rect x="325" y="60" width="3" height="2" rx=".3978" ry=".3978" color="#000000" fill="url(#linearGradient11)"/>
+    <path d="m327.7 103.7s20-14 12-16-28.06 7.627-38 7c-10.11-0.638 22.5-9.83 24.77-27.71" fill="none" filter="url(#filter4618-7)" opacity=".4944" stroke="url(#radialGradient4612-0)" stroke-width="2"/>
+    <rect x="323.5" y="62.5" width="6" height="5" rx=".1768" ry=".1768" color="#000000" fill="#d3d7cf" stroke="url(#linearGradient12)"/>
+    <rect transform="scale(-1)" x="-328.5" y="-66.5" width="4" height="3" rx=".1768" ry=".1768" color="#000000" fill="#888a85" stroke="url(#linearGradient13)"/>
+    <path d="m325 63.81c-1.03 8.083-9.29 14.95-16.38 19.75-3.54 2.401-6.67 4.247-8.53 5.718-0.46 0.368-0.85 0.712-1.18 1.125-0.34 0.414-0.74 1.02-0.57 1.907 0.17 0.886 0.92 1.362 1.47 1.562 0.56 0.2 1.11 0.299 1.81 0.344 5.52 0.347 13.01-2.019 20.25-4.094 7.25-2.075 14.34-3.76 17.5-2.969 0.73 0.182 0.75 0.332 0.75 0.344 0 0.01 0 0.304-0.25 0.906-0.56 1.204-2.21 3.148-4.15 4.969-3.89 3.642-8.85 7.095-8.85 7.095l1.72 2.47s5.04-3.519 9.16-7.377c2.06-1.93 3.91-3.892 4.84-5.875 0.47-0.992 0.75-2.114 0.32-3.25-0.44-1.137-1.55-1.87-2.82-2.188-4.83-1.209-11.76 0.918-19.03 3-6.88 1.972-13.91 3.965-18.4 3.938 1.62-1.195 4.33-2.874 7.65-5.125 7.26-4.922 16.44-12.08 17.69-21.88z" color="#000000" fill="url(#linearGradient14)" fill-rule="evenodd" stroke="url(#linearGradient15)" stroke-linejoin="round"/>
+    <path transform="scale(-1)" d="m-324.5-64c0 0.1-0.1 0.501-0.17 0.501h-3.64c-0.1 0-0.18-0.08-0.18-0.177v-2.646c0-0.1 0.42-0.177 0.5-0.177" color="#000000" fill="none" stroke="url(#linearGradient13)"/>
+  </g>
+  <mask id="mask1_2489_28656" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="209" y="16" width="367" height="354">
+    <path d="M575.262 143.166C575.45 143.286 575.435 143.567 575.234 143.667C573.666 144.448 572.115 145.269 570.51 145.981C558.183 151.454 546.387 157.828 536.365 166.986C532.938 170.116 529.84 173.669 526.939 177.306C524.187 180.752 523.268 184.974 523.31 189.356C523.317 190.032 523.416 190.708 523.528 191.45C523.641 192.204 524.288 192.772 525.051 192.772H538.379C539.214 192.772 539.896 193.452 539.848 194.286C539.539 199.618 537.65 204.216 534.407 208.071C530.013 213.288 528.222 219.489 526.151 225.714C523.131 234.788 522.928 244.143 523.644 253.426C524.39 263.103 520.808 270.818 515.03 278.015C510.493 283.667 506.1 289.438 501.587 295.114C496.961 300.933 495.235 307.504 495.731 314.891C496.37 324.359 498.59 333.487 500.662 342.705C502.351 350.229 502.906 358.004 503.927 365.671C503.956 365.888 503.959 366.107 503.947 366.357C503.895 367.417 502.727 368.093 501.743 367.699C500.257 367.105 498.903 366.575 497.755 365.755C491.994 361.647 488.448 355.792 485.547 349.502C484.148 346.466 482.792 343.409 481.433 340.391C481.269 340.028 480.967 339.745 480.597 339.599C476.701 338.056 475.549 337.071 474.438 334.438C474.198 333.869 473.657 333.477 473.04 333.47C466.967 333.408 460.925 334.018 455.109 336.033C444.687 339.64 434.246 343.212 423.973 347.2C412.523 351.648 400.674 352.548 388.747 351.112C377.328 349.734 366.04 347.254 354.686 345.328C350.877 344.684 347.021 344.303 343.195 343.724C342.245 343.581 341.302 343.212 340.431 342.788C333.554 339.438 326.761 335.908 319.818 332.7C312.291 329.224 306.477 331.704 303.689 339.42C302.543 342.592 301.862 345.924 300.752 349.108C299.057 353.968 297.284 358.815 295.332 363.573C293.987 366.855 291.465 368.581 287.76 369.14C286.846 369.278 286.092 368.487 286.168 367.566C286.418 364.52 286.586 361.575 287.082 358.69C288.145 352.531 289.936 346.473 290.586 340.278C291.231 334.089 290.915 327.793 290.843 321.551C290.831 320.645 289.995 319.595 289.285 318.868C284.193 313.693 279.101 308.517 273.884 303.473C268.362 298.131 262.996 292.61 259.307 285.861C255.952 279.726 250.711 278.849 244.902 279.982C235.554 281.806 226.32 284.179 217.037 286.338C214.717 286.878 212.413 287.481 210.105 288.058C209.819 288.13 209.52 287.996 209.383 287.735C209.255 287.492 209.296 287.195 209.484 286.996C210.592 285.82 211.627 284.714 212.87 283.679C219.896 277.836 227.084 272.177 234.026 266.239C238.169 262.692 242.031 258.804 245.863 254.917C246.633 254.136 247.117 252.639 247.039 251.518C245.117 223.746 251.576 197.685 263.121 172.674C267.974 162.156 273.013 151.723 278.101 140.985C278.363 140.433 278.937 140.111 279.546 140.054C283.711 139.665 284.388 135.342 286.085 132.178C287.197 130.106 288.025 127.882 288.934 125.556C289.319 124.569 290.576 124.298 291.345 125.028C291.896 125.551 292.433 126.062 292.998 126.6C293.59 127.163 294.523 127.155 295.126 126.604C296.564 125.293 298.031 124.067 299.087 122.555C303.409 116.378 307.659 110.142 311.593 103.72C313.407 100.757 315.425 98.8968 318.899 97.925C330.475 94.6868 341.942 91.0734 353.361 87.6188C353.722 87.5097 354.08 87.2998 354.242 86.9597C354.262 86.9177 354.276 86.8768 354.28 86.8352C355.127 80.0025 355.683 79.4301 362.595 78.2973C369.956 77.0929 374.594 73.1578 375.835 65.7169C377.071 58.2939 377.435 50.7219 378.157 43.2095C378.76 36.8835 379.208 30.5397 379.954 24.2316C380.398 20.4688 381.41 18.6027 383.814 17.0597C384.528 16.6015 385.462 16.9254 385.85 17.68C387.136 20.1856 388.551 22.6468 389.404 25.287C391.809 32.7457 393.72 40.3595 396.06 47.8421C398.071 54.2694 400.191 60.6788 402.626 66.9571C405.885 75.3698 412.553 78.9352 421.304 79.0843C424.689 79.1439 428.074 79.2631 431.452 79.1141C435.589 78.9352 439.433 79.8415 442.746 82.2145C451.707 88.6418 460.75 94.9677 469.37 101.83C475.831 106.978 481.737 112.825 488.164 118.667C488.548 119.017 489.085 119.131 489.598 119.045C492.703 118.528 495.464 120.108 498.247 122.01C498.86 122.43 499.067 123.238 498.742 123.905C497.882 125.668 497.029 127.416 496.137 129.25C495.748 130.048 496.131 131.004 496.939 131.37C503.342 134.275 507.862 139.355 512.881 143.792C514.666 145.367 516.582 146.803 518.474 148.252C522.038 150.983 525.984 151.549 530.318 150.458C538.699 148.348 547.074 146.207 555.515 144.377C562.061 142.956 568.259 142.171 575.146 143.123C575.188 143.129 575.227 143.143 575.262 143.166ZM398.164 325.244C398.166 325.243 398.168 325.241 398.171 325.241C405.029 325.241 411.886 325.319 418.743 325.194C420.576 325.158 422.594 324.89 424.2 324.079C432.795 319.744 441.445 315.493 449.761 310.664C458.339 305.685 459.061 303.211 456.518 293.51C454.226 284.776 449.993 276.876 445.516 269.149C440.221 260.003 436.091 250.636 435.828 239.808C435.691 234.126 434.055 228.677 431.351 223.579C428.957 219.066 425.25 216.931 420.254 216.866C406.435 216.687 392.902 218.338 379.739 222.792C345.714 234.317 324.988 262.304 324.415 297.249C324.278 305.679 327.931 311.403 335.303 314.742C340.443 317.073 345.797 319.011 351.194 320.668C366.504 325.372 382.309 325.808 398.157 325.248C398.159 325.247 398.162 325.246 398.164 325.244ZM276.748 235.237C276.749 235.236 276.75 235.235 276.751 235.235C278.141 235.122 279.119 235.116 280.068 234.961C292.15 232.988 303.409 228.57 314.285 223.168C317.729 221.457 320.953 219.239 324.081 216.979C325.274 216.115 326.283 214.606 326.737 213.187C335.852 184.86 344.878 156.504 353.91 128.154C354.003 127.858 354.077 127.557 354.144 127.246C354.317 126.436 353.791 125.62 352.967 125.533C349.69 125.187 346.841 126.268 344.114 127.879C333.554 134.122 323.728 141.372 314.792 149.761C301.695 162.049 290.622 175.804 284.056 192.778C278.828 206.291 276.917 220.34 276.743 235.236C276.743 235.238 276.747 235.239 276.748 235.237ZM497.985 188.751C497.986 188.752 497.985 188.754 497.984 188.754C497.024 188.753 496.136 188.623 495.295 188.778C491.003 189.541 486.675 190.179 482.449 191.234C473.364 193.506 464.624 196.743 456.476 201.435C451.915 204.065 451.098 205.794 452.011 210.927C452.339 212.782 452.674 214.654 453.265 216.436C456.924 227.544 460.308 238.759 464.469 249.676C468.099 259.198 472.564 268.409 476.82 277.681C477.359 278.85 478.254 279.854 479.25 280.979C479.961 281.782 481.283 281.666 481.798 280.725C486.442 272.237 489.924 264.067 492.119 255.352C497.528 233.894 498.393 212.018 498.202 190.042C498.202 189.673 498.084 189.299 497.982 188.753C497.982 188.751 497.984 188.75 497.985 188.751ZM356.638 202.384C356.638 202.387 356.64 202.39 356.643 202.39C357.267 202.474 357.737 202.592 358.208 202.592C367.866 202.598 377.459 201.93 386.855 199.492C393.242 197.834 399.301 195.431 404.799 191.711C409.085 188.807 411.061 184.825 410.303 179.721C409.807 176.4 409.228 173.025 408.148 169.865C402.835 154.381 394.43 140.412 386.276 126.329C385.028 124.171 382.867 124.236 381.53 126.329C380.844 127.408 380.283 128.601 379.859 129.811C377.853 135.517 375.806 141.211 373.967 146.97C368.284 164.821 362.691 182.708 357.074 200.577C356.9 201.119 356.805 201.691 356.638 202.383C356.638 202.383 356.638 202.384 356.638 202.384ZM416.547 121.158C416.547 121.157 416.545 121.156 416.544 121.157L415.839 121.895C415.734 122.004 415.698 122.162 415.745 122.305C419.878 135.035 423.832 147.829 428.235 160.469C429.882 165.203 432.419 169.663 434.861 174.075C437.087 178.105 440.627 179.584 445.373 179.155C457.098 178.101 466.69 171.984 476.598 167.046C477.049 166.821 477.366 166.387 477.411 165.885C477.785 161.678 476.59 158.22 474.169 155.168C472.504 153.076 470.827 150.929 468.839 149.164C455.706 137.484 440.824 128.678 424.283 122.746C421.83 121.864 419.132 121.673 416.548 121.16C416.547 121.16 416.547 121.159 416.547 121.158ZM298.104 289.713C298.476 289.549 298.737 289.212 298.849 288.822C301.453 279.687 304.061 270.658 306.566 261.594C306.889 260.433 306.982 259.209 307.097 257.857C307.178 256.916 306.406 256.102 305.465 256.175C297.672 256.782 290.584 258.27 284.665 263.341C282.408 265.273 280.534 267.807 281.089 270.842C282.444 278.283 285.626 284.782 292.264 289.063C294.059 290.22 295.95 290.66 298.104 289.713Z" fill="white"/>
+  </mask>
+  <g mask="url(#mask1_2489_28656)" transform="matrix(0.064, 0, 0, 0.064, 10.707213, 0.094359)" style="">
+    <path d="M346.086 303.933C345.753 308.532 344.534 313.298 345.255 317.675C347.083 328.758 338.827 327.871 332.676 328.481C325.971 329.146 320.375 335.851 312.949 332.027C313.282 331.584 313.559 331.196 313.891 330.753C322.591 324.768 327.301 313.907 338.827 310.97C341.043 310.472 340.933 303.822 346.086 303.933Z" fill="#F3AC49"/>
+    <path d="M205.729 195.765C205.729 133.64 205.729 71.5154 205.676 9.39075C205.676 7.59768 206.045 7.22852 207.839 7.22852C332.246 7.28125 456.706 7.28125 581.114 7.22852C582.907 7.22852 583.276 7.59768 583.276 9.39075C583.223 133.798 583.223 258.259 583.276 382.666C583.276 384.459 582.907 384.828 581.114 384.828C456.706 384.776 332.246 384.776 207.839 384.828C206.045 384.828 205.676 384.459 205.676 382.666C205.729 320.33 205.729 258.048 205.729 195.765ZM209.157 212.904C209.157 266.96 209.104 321.016 209.104 375.019C210.159 377.076 206.309 381.453 211.372 381.453C321.91 381.559 432.447 381.559 542.985 381.506C543.934 381.506 545.78 380.187 545.674 379.871C543.723 371.275 549.102 371.855 554.745 372.119C560.863 372.435 567.033 372.066 573.203 372.224C575.418 372.277 575.946 371.644 575.946 369.429C575.84 344.431 575.893 319.487 575.893 294.489C575.84 200.827 575.84 107.166 575.787 13.5043C575.365 13.1351 574.996 12.5023 574.574 12.5023C563.236 12.5023 551.95 12.5023 540.612 12.6605C540.031 12.6605 538.924 14.4535 538.924 15.3501C538.818 47.1507 538.924 78.8986 539.346 110.647C539.451 118.241 535.285 121.247 529.326 123.04C527.322 123.567 525.529 123.831 523.525 124.358C515.878 124.358 507.967 121.985 504.75 133.376C502.693 140.496 496.048 146.297 491.46 152.678C489.298 154.26 487.347 156.264 484.974 157.372C474.057 162.646 463.72 154.419 452.065 156.053C439.197 157.847 430.744 161.379 430.322 174.933C430.322 175.566 436.87 188.572 424.747 181.116C424.219 180.799 423.482 181.104 422.796 181.104C413.989 175.25 403.442 181.262 394.423 176.832C394.054 176.146 393.685 175.461 393.263 174.775C393.316 171.242 393.632 167.708 393.316 164.228C392.841 159.323 393.527 156.528 399.644 157.583C403.283 158.216 409.19 159.429 410.508 155.421C415.307 140.918 422.532 127.681 428.755 113.916C432.342 105.953 424.062 98.306 423.06 90.1844C422.058 82.3793 415.624 75.7344 418.103 67.4019C421.583 55.9051 429.863 47.2562 436.561 37.658C437.246 36.9724 437.932 36.2868 438.67 35.5485C444.419 27.005 451.116 19.6218 461.453 16.563C463.035 15.7192 466.515 17.2486 465.988 13.9262C465.566 11.0783 462.56 12.555 460.873 12.555C380.079 12.6077 299.285 12.7659 218.439 12.2913C208.999 12.2386 207.522 15.5083 209.051 23.1552C209.051 84.2779 209.051 145.453 209.051 206.576C209.104 208.685 209.157 210.795 209.157 212.904ZM488.718 58.542C488.612 58.542 488.507 58.542 488.349 58.542C488.349 44.6721 488.349 30.8021 488.349 16.9322C488.349 15.4028 489.034 13.4515 486.134 13.5043C483.233 13.557 484.077 15.6138 484.077 17.0377C483.866 44.092 483.708 71.1462 483.497 98.2005C483.497 101.207 484.763 103.158 487.505 104.213C487.716 104.318 488.665 103.422 488.665 103.052C488.718 88.1804 488.718 73.3612 488.718 58.542Z" fill="#F4ACBA"/>
+    <path d="M575.691 13.6094C575.744 107.271 575.744 200.933 575.797 294.594C575.797 319.592 575.797 344.537 575.849 369.534C575.849 371.696 575.322 372.382 573.107 372.329C566.937 372.171 560.819 372.487 554.649 372.224C548.953 371.96 543.574 371.38 545.578 379.976C545.684 380.345 543.838 381.611 542.889 381.611C432.351 381.664 321.813 381.664 211.276 381.558C206.213 381.558 210.01 377.181 209.008 375.124C209.588 374.544 210.168 373.964 210.696 373.384C216.444 367.003 222.193 360.621 227.888 354.24C248.298 353.924 268.76 353.818 289.169 352.869C291.542 352.764 292.07 360.41 294.97 353.977C295.972 351.762 297.818 349.968 299.242 347.964C298.925 349.441 297.871 351.34 298.398 352.342C299.98 355.242 301.193 351.972 301.984 351.392C307.1 347.279 311.477 351.92 315.749 352.974C318.544 353.66 320.39 358.512 322.499 361.571C324.345 364.26 325.927 367.161 327.615 369.956C327.72 367.635 327.931 365.315 327.984 363.047C328.036 360.938 327.773 358.828 328.036 356.719C328.88 350.074 327.456 343.851 335.947 338.841C342.75 334.833 352.929 329.559 351.083 317.377C350.292 312.208 351.083 306.829 351.188 301.503C356.462 297.706 361.788 293.856 367.062 290.059C374.498 283.678 383.094 279.564 392.376 276.716C392.64 276.716 392.903 276.716 393.167 276.716C393.589 276.558 394.064 276.347 394.486 276.189C404.928 277.244 403.715 268.647 405.56 262.688C419.008 257.573 434.302 267.434 447.223 257.414C450.809 254.619 455.608 253.143 458.509 249.926C463.361 244.546 468.423 240.486 475.859 239.22C479.973 238.534 486.618 241.224 487.778 235.95C488.991 230.466 486.829 224.295 486.143 218.389C488.675 215.224 491.153 212.113 493.685 208.949C495.794 202.409 500.066 207.419 503.23 207.314C513.83 206.839 515.518 197.135 520.475 191.018C529.599 179.732 535.083 166.284 539.566 152.783C543.838 140.074 539.83 126.626 539.83 113.441C539.883 81.1132 539.83 48.838 539.883 16.5099C539.883 15.6661 540.304 14.7696 540.515 13.9258C541.148 14.2422 541.781 14.5059 542.361 14.8223C541.939 14.9805 541.465 15.1388 541.043 15.297C541.201 15.4552 541.306 15.6134 541.465 15.8243C541.728 15.5079 542.045 15.1915 542.309 14.8223C553.542 14.295 564.616 13.9258 575.691 13.6094Z" fill="#F18928" stroke="#F18928" stroke-width="0.755388"/>
+    <path d="M208.957 206.575C208.957 145.453 208.957 84.2773 208.957 23.1547C209.22 23.1547 209.537 23.102 209.8 23.102C241.865 23.102 273.929 23.4184 305.993 22.891C314.748 22.7328 320.813 25.1587 326.666 31.5399C332.257 37.552 339.323 42.1929 345.757 47.4139C351.453 52.424 348.816 59.8072 348.658 65.1337C348.236 80.4802 348.236 96.0905 343.279 111.068C342.066 114.812 342.224 119.084 340.958 122.828C338.321 130.739 343.068 139.546 337.003 147.246C332.151 153.416 328.723 160.747 324.662 167.55C321.076 173.298 315.855 178.15 315.17 185.428C314.8 185.533 314.431 185.586 314.062 185.691C306.257 184.162 296.923 192.653 290.541 181.947C290.541 181.947 290.119 182.105 290.067 182.211C288.168 188.17 281.945 188.381 277.884 189.436C259.954 194.129 241.39 193.918 223.09 192.6C211.277 191.756 207.533 195.448 209.695 206.523C209.484 206.575 209.22 206.575 208.957 206.575Z" fill="#66BCB2" stroke="#66BCB2" stroke-width="0.755388"/>
+    <path d="M324.715 167.498C328.776 160.694 332.204 153.364 337.055 147.194C343.12 139.494 338.374 130.687 341.011 122.776C342.276 119.032 342.065 114.813 343.331 111.016C348.236 96.0912 348.236 80.4282 348.71 65.0816C348.869 59.7024 351.453 52.3719 345.81 47.3618C353.509 50.8952 363.846 46.518 369.489 57.1182C374.235 66.0308 381.197 54.8505 387.261 56.96C388.369 53.3739 391.428 50.8952 391.533 46.4125C391.639 42.8791 392.641 35.1267 396.912 36.2342C410.149 39.7149 423.387 35.4432 436.413 37.8163C429.715 47.4145 421.383 56.0635 417.955 67.5602C415.476 75.84 421.91 82.5376 422.912 90.3428C423.914 98.4643 432.194 106.111 428.608 114.075C422.385 127.839 415.159 141.129 410.36 155.579C409.042 159.587 403.135 158.374 399.496 157.741C393.326 156.686 392.693 159.429 393.168 164.386C393.484 167.867 393.168 171.4 393.115 174.934C385.679 174.564 378.243 174.406 370.86 173.721C368.645 173.51 366.536 172.033 364.373 171.136C365.428 169.027 364.426 165.705 368.012 165.019C368.381 164.966 369.014 163.648 368.856 163.384C366.799 160.536 364.637 157.794 362.422 155.104C362.369 155.052 361.104 155.737 360.629 156.265C351.031 167.339 340.061 174.459 324.715 167.498Z" fill="#7EBAD2" stroke="#7EBAD2" stroke-width="0.755388"/>
+    <path d="M436.465 37.8166C423.439 35.4962 410.202 39.7152 396.965 36.2345C392.64 35.127 391.691 42.8794 391.586 46.4128C391.427 50.8955 388.421 53.3742 387.314 56.9603C381.249 54.8508 374.288 66.0311 369.541 57.1185C363.898 46.5183 353.562 50.8955 345.862 47.3621C339.428 42.1411 332.309 37.5002 326.771 31.4881C320.917 25.1069 314.8 22.681 306.098 22.8392C273.928 23.4193 241.864 23.1029 209.8 23.1029C211.487 20.1496 206.108 13.7684 212.911 13.7156C292.492 13.452 372.125 13.5047 451.706 13.7156C454.923 13.7156 458.087 15.6669 461.304 16.7217C450.968 19.7277 444.27 27.1637 438.522 35.7071C437.836 36.3927 437.151 37.0783 436.465 37.8166Z" fill="#6E9ACA" stroke="#87ADD4" stroke-width="0.755388"/>
+    <path d="M426.866 236.003C427.394 230.571 430.03 227.882 435.779 227.46C441.791 227.038 437.994 221.342 439.576 218.283C443.215 211.164 445.693 203.306 445.324 194.974C447.645 194.13 450.123 193.602 452.18 192.337C459.352 187.907 464.468 181.209 473.697 178.678C478.76 177.254 483.928 177.623 488.674 175.988C497.376 172.982 496.954 163.542 500.804 157.055C505.55 153.258 507.713 148.037 510.455 142.764C512.986 137.964 509.137 128.788 518.787 128.313C521.635 128.155 522.69 126.731 523.165 124.305C525.169 123.778 527.216 123.291 529.22 122.764C533.966 146.074 524.114 165.071 507.027 178.098C495.214 187.063 495.583 197.558 493.684 208.843C491.153 212.008 488.674 215.119 486.143 218.283C483.453 223.399 478.654 220.815 474.752 221.289C471.271 221.711 467.79 220.709 464.573 223.399C453.762 232.523 441.211 237.111 426.866 236.003Z" fill="#F3AC49" stroke="#F3AC49" stroke-width="0.755388"/>
+    <path d="M500.965 156.968C497.115 163.455 497.462 172.927 488.761 175.986C484.014 177.621 478.824 177.238 473.761 178.662C464.532 181.193 459.403 187.909 452.231 192.339C450.174 193.604 447.601 194.142 445.334 194.986C437.792 190.398 430.254 185.67 422.66 181.082C423.346 181.082 424.242 180.765 424.717 181.082C436.425 188.307 430.149 175.544 430.149 174.911C430.571 161.358 439.114 157.825 451.929 156.031C463.584 154.397 473.868 162.624 484.838 157.35C487.211 156.19 489.162 154.238 491.324 152.656C494.541 154.08 497.801 155.544 500.965 156.968Z" fill="#FBCF67" stroke="#FBCF67" stroke-width="0.755388" stroke-linejoin="bevel"/>
+    <path d="M405.542 262.558C403.64 268.581 404.908 277.139 394.448 276.083C394.222 275.462 393.271 276.126 393.127 276.664C392.863 276.664 392.466 276.476 392.202 276.476C390.617 246.31 391.912 216.121 386.946 186.167C387.369 181.465 390.327 178.718 394.342 176.764C403.376 181.254 413.942 175.232 422.764 181.043C430.319 185.639 437.722 190.373 445.329 194.97C445.699 203.317 443.368 210.997 439.723 218.182C438.138 221.246 441.941 226.951 435.919 227.374C430.161 227.744 427.519 230.491 426.991 235.932C419.753 244.808 412.621 253.683 405.542 262.558Z" fill="#8D888C" stroke="#8D888C" stroke-width="0.755388"/>
+    <path d="M208.957 206.576C209.22 206.576 209.484 206.523 209.748 206.523C242.128 207.684 274.509 209.213 306.837 205.521C297.45 217.493 288.168 227.46 269.974 225.878C250.303 224.191 230.262 226.511 210.433 227.144C209.959 222.397 209.537 217.651 209.062 212.905C209.009 210.795 208.957 208.686 208.957 206.576Z" fill="#5E5F97" stroke="#5E5F97" stroke-width="0.755388"/>
+    <path d="M493.685 208.843C495.583 197.557 495.214 187.063 507.027 178.097C524.114 165.071 533.976 146.086 529.177 122.776C535.136 120.983 539.039 118.399 538.933 110.804C538.511 79.0565 538.775 47.2559 538.828 15.508C538.828 14.5587 539.883 12.8184 540.515 12.8184C551.854 12.6074 563.14 12.6074 574.478 12.6602C574.9 12.6602 575.269 13.293 575.691 13.6622C564.616 13.9786 553.542 14.3478 542.467 14.6642C541.834 14.3478 541.201 14.0841 540.621 13.7676C540.41 14.6114 539.988 15.508 539.988 16.3518C539.935 48.6798 539.988 80.9551 539.935 113.283C539.883 126.415 543.943 139.916 539.672 152.625C535.136 166.126 529.704 179.574 520.581 190.86C515.623 196.977 513.936 206.734 503.336 207.156C500.066 207.314 495.794 202.304 493.685 208.843Z" fill="#F6A453"/>
+    <path d="M394.498 176.706C390.543 178.657 387.418 181.631 386.944 186.325C384.834 187.749 382.672 189.226 380.562 190.649C370.015 190.333 359.52 189.964 348.973 189.647C346.863 189.331 344.754 188.962 342.644 188.645C333.942 183.635 324.397 186.114 315.221 185.376C315.906 178.098 321.127 173.246 324.713 167.498C340.06 174.406 350.977 167.287 360.68 156.212C361.155 155.685 362.421 154.999 362.473 155.052C364.688 157.741 366.851 160.484 368.907 163.331C369.066 163.595 368.485 164.861 368.064 164.966C364.477 165.652 365.532 168.974 364.425 171.084C366.587 171.98 368.696 173.457 370.911 173.668C378.295 174.301 385.94 174.4 393.376 174.769C393.745 175.455 394.129 176.02 394.498 176.706Z" fill="#87ADD4"/>
+    <path d="M488.816 58.4798C488.816 73.3607 488.737 88.65 488.684 103.531C488.684 103.954 487.731 104.802 487.519 104.696C484.818 103.637 483.494 101.73 483.494 98.6588C483.706 71.4921 483.795 44.2996 484.007 17.1328C484.007 15.703 483.208 13.5276 486.121 13.4746C488.981 13.4217 488.434 15.389 488.487 16.9247C488.487 30.8523 488.445 44.4993 488.445 58.4269C488.551 58.4798 488.657 58.4798 488.816 58.4798Z" fill="#DDC4E0"/>
+    <path d="M500.805 157.108C497.641 155.684 494.371 153.997 491.207 152.573C495.795 146.192 502.335 140.443 504.391 133.324C507.661 121.985 516.019 124.242 523.613 124.189C523.138 126.615 521.742 128.208 518.894 128.314C509.243 128.788 513.251 138.017 510.72 142.816C508.03 148.143 505.551 153.311 500.805 157.108Z" fill="#F8C9D1" stroke="#F8C9D1" stroke-width="0.755388"/>
+    <path d="M461.304 16.7208C458.087 15.6661 454.923 13.7148 451.706 13.7148C372.125 13.5566 292.492 13.4511 212.911 13.7148C206.108 13.7148 211.434 20.096 209.799 23.1021C209.536 23.1021 209.219 23.1548 208.956 23.1548C207.373 15.5079 208.85 12.2382 218.29 12.2909C299.084 12.7655 379.93 12.5546 460.724 12.6601C462.464 12.6601 465.418 11.1834 465.839 14.0312C466.42 17.4064 462.939 15.877 461.304 16.7208Z" fill="#7EBAD2" stroke="#7EBAD2" stroke-width="0.755388"/>
+    <path d="M209.009 212.904C209.484 217.651 209.906 222.397 210.38 227.143C210.17 230.36 209.748 233.577 209.748 236.794C209.695 281.305 209.695 325.815 209.748 370.325C209.748 371.327 210.328 372.329 210.644 373.331C210.064 373.912 209.484 374.492 208.957 375.072C208.957 321.016 209.009 266.96 209.009 212.904Z" fill="#9B8BC1"/>
+    <path d="M436.466 37.8165C437.151 37.1309 437.837 36.4454 438.575 35.707C437.837 36.3926 437.151 37.0782 436.466 37.8165Z" fill="#7EBAD2"/>
+    <path d="M210.643 373.331C210.327 372.329 209.747 371.327 209.747 370.325C209.694 325.815 209.694 281.304 209.747 236.794C209.747 233.577 210.168 230.36 210.379 227.143C230.261 226.563 250.249 224.19 269.92 225.877C288.114 227.46 297.396 217.492 306.783 205.521C307.047 205.468 307.364 205.415 307.627 205.31C311.319 203.939 313.059 206.048 316.276 207.947C328.775 215.225 342.381 211.48 354.353 205.679C362.369 201.829 367.853 204.097 370.648 210.056C377.926 225.825 374.762 243.175 376.66 259.788C378.823 278.457 367.537 273.974 357.886 274.027C351.452 274.079 345.071 274.132 338.637 273.974C337.266 273.921 335.684 273.341 334.629 272.445C327.509 266.749 319.124 273.658 311.846 270.071C304.041 266.222 298.82 275.925 291.648 273.816C289.433 273.183 287.798 268.911 285.899 268.964C274.508 269.175 263.011 269.228 253.36 277.138C249.194 280.566 242.18 281.304 241.864 288.16C241.336 298.761 241.442 309.413 241.495 320.014C241.547 329.77 241.653 329.77 247.243 331.774C247.559 331.88 247.638 332.68 247.796 333.155C241.152 340.169 234.533 347.173 227.888 354.135C222.14 360.569 216.391 366.95 210.643 373.331Z" fill="#513F92" stroke="#513F92" stroke-width="0.755388"/>
+    <path d="M247.77 333.198C247.611 332.724 247.559 331.933 247.242 331.827C241.652 329.823 241.547 329.876 241.494 320.067C241.441 309.466 241.388 298.814 241.863 288.213C242.179 281.357 249.193 280.619 253.36 277.191C263.011 269.281 274.507 269.175 285.899 269.017C287.744 268.964 289.432 273.236 291.647 273.869C298.819 275.978 304.04 266.275 311.845 270.124C319.071 273.711 327.508 266.802 334.628 272.498C335.683 273.341 337.265 273.974 338.636 274.027C345.07 274.185 351.451 274.132 357.885 274.08C367.536 274.027 378.769 278.51 376.66 259.841C374.761 243.228 377.925 225.878 370.648 210.109C367.905 204.15 362.368 201.882 354.352 205.732C342.38 211.533 328.774 215.278 316.275 208C313.058 206.101 311.318 203.992 307.626 205.363C309.789 198.823 311.944 192.184 314.107 185.645C314.476 185.539 314.856 185.48 315.225 185.375C324.402 186.113 333.939 183.622 342.641 188.632C344.75 188.948 346.874 189.323 348.983 189.639C350.407 192.065 377.94 192.879 380.533 190.661C382.643 189.237 384.841 187.712 386.95 186.288C391.908 216.19 390.688 246.604 392.27 276.717C382.988 279.512 374.339 283.625 366.956 290.059C358.096 289.69 349.025 290.217 340.376 288.688C328.036 286.526 318.543 291.852 308.998 297.917C305.042 300.396 300.718 301.029 296.552 299.816C282.26 295.755 269.234 304.456 269.972 318.907C270.499 328.61 269.234 334.359 257.631 331.089C255.258 330.403 252.358 331.511 249.721 331.774C249.088 332.196 248.402 332.671 247.77 333.198Z" fill="#5E5F97" stroke="#5E5F97" stroke-width="0.755388"/>
+    <path d="M249.774 331.722C252.411 331.458 255.311 330.35 257.685 331.036C269.34 334.306 270.552 328.61 270.025 318.854C269.287 304.404 282.26 295.702 296.605 299.763C300.771 300.976 305.095 300.343 309.051 297.864C318.596 291.852 328.089 286.473 340.43 288.635C349.078 290.164 358.149 289.637 367.009 290.006C361.735 293.803 356.409 297.653 351.135 301.45C349.289 302.558 347.496 303.665 345.651 304.72C340.799 304.615 340.851 310.943 338.689 311.47C327.72 314.265 323.237 324.602 314.957 330.298C314.114 328.768 313.533 328.346 311.529 329.454C308.418 331.141 304.832 332.671 301.351 332.829C285.424 333.515 269.55 333.726 253.624 333.884C252.305 333.937 251.04 332.46 249.774 331.722Z" fill="#8D888C" stroke="#8D888C" stroke-width="0.755388"/>
+    <path d="M426.867 236.003C441.212 237.163 453.764 232.522 464.627 223.399C467.844 220.709 471.325 221.711 474.806 221.289C478.708 220.815 483.507 223.399 486.197 218.283C486.883 224.19 488.992 230.36 487.832 235.845C486.672 241.171 480.027 238.429 475.913 239.114C468.477 240.38 463.414 244.388 458.563 249.82C455.609 253.09 450.81 254.567 447.277 257.309C434.356 267.382 419.062 257.467 405.614 262.583C412.628 253.723 419.748 244.863 426.867 236.003Z" fill="#F6A453"/>
+    <path d="M249.774 331.722C251.07 332.488 252.352 333.929 253.618 333.876C269.545 333.665 285.471 333.459 301.345 332.826C304.826 332.667 308.402 331.155 311.514 329.414C313.518 328.307 314.177 328.737 315.021 330.267C314.704 330.689 314.377 331.142 314.061 331.564C309.104 336.996 304.199 342.48 299.242 347.912C297.765 349.916 295.972 351.709 294.97 353.924C292.069 360.358 291.595 352.711 289.169 352.817C268.76 353.819 248.258 353.853 227.849 354.17C234.494 347.156 241.106 340.154 247.751 333.192C248.384 332.665 249.088 332.197 249.774 331.722Z" fill="#B59259" stroke="#B59259" stroke-width="0.755388"/>
+    <path d="M299.242 347.859C304.199 342.427 309.104 336.942 314.061 331.51C321.128 335.149 326.454 328.768 332.836 328.135C338.689 327.555 346.547 328.399 344.807 317.852C344.121 313.633 345.282 309.15 345.598 304.773C347.444 303.665 349.237 302.558 351.083 301.503C351.03 306.777 350.186 312.209 350.977 317.377C352.823 329.559 342.645 334.833 335.842 338.841C327.351 343.851 328.775 350.074 327.931 356.719C327.667 358.776 327.931 360.938 327.878 363.047C327.825 365.368 327.615 367.688 327.509 369.956C325.821 367.161 324.239 364.26 322.394 361.571C320.284 358.459 318.438 353.66 315.643 352.975C311.371 351.92 306.994 347.332 301.879 351.392C301.14 351.973 299.927 355.242 298.293 352.342C297.871 351.287 298.925 349.388 299.242 347.859Z" fill="#F8B570"/>
+    <path d="M314.114 185.639C311.951 192.178 309.842 198.77 307.68 205.31C307.416 205.363 307.1 205.415 306.836 205.521C274.508 209.265 242.127 207.683 209.746 206.523C207.584 195.501 211.381 191.809 223.142 192.6C241.442 193.866 260.005 194.077 277.936 189.436C281.997 188.381 288.22 188.118 290.118 182.211C290.171 182.053 290.593 181.947 290.593 181.947C296.974 192.6 306.361 184.162 314.114 185.639Z" fill="#8D888C" stroke="#8D888C" stroke-width="0.755388"/>
+    <path d="M380.562 190.649C378.295 192.969 350.449 192.072 348.973 189.646C359.52 189.963 370.068 190.332 380.562 190.649Z" fill="#7D89C1" stroke="#7D89C1" stroke-width="0.755388"/>
+    <path d="M348.971 189.648C346.862 189.331 344.752 188.962 342.643 188.646C344.752 188.962 346.862 189.331 348.971 189.648Z" fill="#7D89C1"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/luci-app-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
similarity index 81%
rename from luci-app-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
rename to luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
index b9142b8..d432d8d 100644
--- a/luci-app-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
+++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js
@@ -7,6 +7,7 @@
 'require form';
 'require network';
 'require validation';
+'require uqr';
 
 var generateKey = rpc.declare({
 	object: 'luci.amneziawg',
@@ -64,42 +65,16 @@ function generateDescription(name, texts) {
 	]);
 }
 
-function invokeQREncode(data, div) {
-	
-	var code = div.children[0];
-	var btn = div.children[1];
-	
-	dom.content(btn, [
-				E('a', {
-					'class': 'btn cbi-button-action',
-					'style': 'text-align: center',
-					'href': 'data:text/plain;charset=utf-8,' + encodeURIComponent(data),
-					'download': 'amneziawg.conf'
-
-				}, ['Download Configuration']),	
-	]);
-	
-	return fs.exec_direct('/usr/bin/qrencode', [
-		'--inline', '--8bit', '--type=SVG',
-		'--output=-', '--', data
-	]).then(function(svg) {
-		div.style.opacity = '';
-		dom.content(code, Object.assign(E(svg), { style: 'width:100%;height:auto' }));
-	}).catch(function(error) {
-		div.style.opacity = '';
-
-		if (L.isObject(error) && error.name == 'NotFoundError') {
-			dom.content(code, [
-				Object.assign(E(qrIcon), { style: 'width:32px;height:32px;opacity:.2' }),
-				E('p', _('The <em>qrencode</em> package is required for generating an QR code image of the configuration.'))
-			]);
-		}
-		else {
-			dom.content(code, [
-				_('Unable to generate QR code: %s').format(L.isObject(error) ? error.message : error)
-			]);
-		}
-	});
+function buildSVGQRCode(data, code) {
+	// pixel size larger than 4 clips right and bottom edges of complex configs
+	const options = {
+		pixelSize: 4,
+		whiteColor: 'white',
+		blackColor: 'black'
+	};
+	const svg = uqr.renderSVG(data, options);
+	code.style.opacity = '';
+	dom.content(code, Object.assign(E(svg), { style: 'width:100%;height:auto' }));
 }
 
 var cbiKeyPairGenerate = form.DummyValue.extend({
@@ -111,9 +86,6 @@ var cbiKeyPairGenerate = form.DummyValue.extend({
 				    pub = this.section.getUIElement(section_id, 'public_key'),
 				    map = this.map;
 
-				if ((prv.getValue() || pub.getValue()) && !confirm(_('Do you want to replace the current keys?')))
-					return;
-
 				return generateKey().then(function(keypair) {
 					prv.setValue(keypair.priv);
 					pub.setValue(keypair.pub);
@@ -137,7 +109,7 @@ return network.registerProtocol('amneziawg', {
 		return this._ubus('l3_device') || this.sid;
 	},
 
-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'amneziawg-tools';
 	},
 
@@ -212,7 +184,7 @@ return network.registerProtocol('amneziawg', {
 		o.placeholder = '1420';
 		o.optional = true;
 
-		o = s.taboption('advanced', form.Value, 'fwmark', _('Firewall Mark'), _('Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, starting with <code>0x</code>.'));
+		o = s.taboption('advanced', form.Value, 'fwmark', _('Firewall Mark'), _('Optional. 32-bit mark for packets during firewall processing. Enter value in hex, starting with <code>0x</code>.'));
 		o.optional = true;
 		o.validate = function(section_id, value) {
 			if (value.length > 0 && !value.match(/^0x[a-fA-F0-9]{1,8}$/))
@@ -224,62 +196,102 @@ return network.registerProtocol('amneziawg', {
         // AmneziaWG
 
         try {
-            s.tab('amneziawg', _('AmneziaWG Settings'), _('Further information about AmneziaWG interfaces and peers at <a href=\'http://amnezia.org\'>amnezia.org</a>.'));
+            s.tab('amneziawg', _('AmneziaWG Settings'), _('Further information about AmneziaWG interfaces and peers at <a href=\'https://docs.amnezia.org/documentation/amnezia-wg\'>amnezia.org</a>.'));
         }
         catch(e) {}
 
         o = s.taboption('amneziawg', form.Value, 'awg_jc', _('Jc'), _('Junk packet count.'));
         o.datatype = 'uinteger';
+        o.placeholder = '0';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_jmin', _('Jmin'), _('Junk packet minimum size.'));
         o.datatype = 'uinteger';
+        o.placeholder = '0';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_jmax', _('Jmax'), _('Junk packet maximum size.'));
         o.datatype = 'uinteger';
+        o.placeholder = '0';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_s1', _('S1'), _('Handshake initiation packet junk header size.'));
         o.datatype = 'uinteger';
+        o.placeholder = '0';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_s2', _('S2'), _('Handshake response packet junk header size.'));
         o.datatype = 'uinteger';
+        o.placeholder = '0';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_s3', _('S3'), _('Cookie reply packet junk header size.'));
+        o.datatype = 'uinteger';
+        o.placeholder = '0';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_s4', _('S4'), _('Transport packet junk header size.'));
+        o.datatype = 'uinteger';
+        o.placeholder = '0';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_h1', _('H1'), _('Handshake initiation packet type header.'));
-        o.datatype = 'uinteger';
+        o.datatype = 'string';
+        o.placeholder = '1';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_h2', _('H2'), _('Handshake response packet type header.'));
-        o.datatype = 'uinteger';
+        o.datatype = 'string';
+        o.placeholder = '2';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_h3', _('H3'), _('Handshake cookie packet type header.'));
-        o.datatype = 'uinteger';
+        o.datatype = 'string';
+        o.placeholder = '3';
         o.optional = true;
 
         o = s.taboption('amneziawg', form.Value, 'awg_h4', _('H4'), _('Transport packet type header.'));
-        o.datatype = 'uinteger';
+        o.datatype = 'string';
+        o.placeholder = '4';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_i1', _('I1'), _('First special junk packet signature.'));
+        o.datatype = 'string';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_i2', _('I2'), _('Second special junk packet signature.'));
+        o.datatype = 'string';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_i3', _('I3'), _('Third special junk packet signature.'));
+        o.datatype = 'string';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_i4', _('I4'), _('Fourth special junk packet signature.'));
+        o.datatype = 'string';
+        o.optional = true;
+		
+		o = s.taboption('amneziawg', form.Value, 'awg_i5', _('I5'), _('Fifth special junk packet signature.'));
+        o.datatype = 'string';
         o.optional = true;
 
 		// -- peers -----------------------------------------------------------------------
 
 		try {
-			s.tab('peers', _('Peers'), _('Further information about AmneziaWG interfaces and peers at <a href=\'http://amneziawg.com\'>amneziawg.com</a>.'));
+			s.tab('peers', _('Peers'), _('Further information about AmneziaWG interfaces and peers at <a href=\'https://docs.amnezia.org/documentation/amnezia-wg\'>amnezia.org</a>.'));
 		}
 		catch(e) {}
 
 		o = s.taboption('peers', form.SectionValue, '_peers', form.GridSection, 'amneziawg_%s'.format(s.section));
 		o.depends('proto', 'amneziawg');
 
-        ss = o.subsection;
+		ss = o.subsection;
 		ss.anonymous = true;
 		ss.addremove = true;
 		ss.addbtntitle = _('Add peer');
 		ss.nodescriptions = true;
 		ss.modaltitle = _('Edit peer');
+		ss.sortable = true;
 
 		ss.handleDragConfig = function(ev) {
 			ev.stopPropagation();
@@ -416,15 +428,22 @@ return network.registerProtocol('amneziawg', {
 					s.getOption('public_key').getUIElement(s.section).setValue(keypair.pub);
 					s.getOption('listen_port').getUIElement(s.section).setValue(config.interface_listenport || '');
 					s.getOption('addresses').getUIElement(s.section).setValue(config.interface_address);
-                    			s.getOption('awg_jc').getUIElement(s.section).setValue(config.interface_jc);
-					s.getOption('awg_jmin').getUIElement(s.section).setValue(config.interface_jmin);
-                    			s.getOption('awg_jmax').getUIElement(s.section).setValue(config.interface_jmax);
-                    			s.getOption('awg_s1').getUIElement(s.section).setValue(config.interface_s1);
-                    			s.getOption('awg_s2').getUIElement(s.section).setValue(config.interface_s2);
-                    			s.getOption('awg_h1').getUIElement(s.section).setValue(config.interface_h1);
-                    			s.getOption('awg_h2').getUIElement(s.section).setValue(config.interface_h2);
-                    			s.getOption('awg_h3').getUIElement(s.section).setValue(config.interface_h3);
-                    			s.getOption('awg_h4').getUIElement(s.section).setValue(config.interface_h4);
+					s.getOption('awg_jc').getUIElement(s.section).setValue(config.interface_jc || '');
+					s.getOption('awg_jmin').getUIElement(s.section).setValue(config.interface_jmin || '');
+					s.getOption('awg_jmax').getUIElement(s.section).setValue(config.interface_jmax || '');
+					s.getOption('awg_s1').getUIElement(s.section).setValue(config.interface_s1 || '');
+					s.getOption('awg_s2').getUIElement(s.section).setValue(config.interface_s2 || '');
+					s.getOption('awg_s3').getUIElement(s.section).setValue(config.interface_s3 || '');
+					s.getOption('awg_s4').getUIElement(s.section).setValue(config.interface_s4 || '');
+					s.getOption('awg_h1').getUIElement(s.section).setValue(config.interface_h1 || '');
+					s.getOption('awg_h2').getUIElement(s.section).setValue(config.interface_h2 || '');
+					s.getOption('awg_h3').getUIElement(s.section).setValue(config.interface_h3 || '');
+					s.getOption('awg_h4').getUIElement(s.section).setValue(config.interface_h4 || '');
+					s.getOption('awg_i1').getUIElement(s.section).setValue(config.interface_i1 || '');
+					s.getOption('awg_i2').getUIElement(s.section).setValue(config.interface_i2 || '');
+					s.getOption('awg_i3').getUIElement(s.section).setValue(config.interface_i3 || '');
+					s.getOption('awg_i4').getUIElement(s.section).setValue(config.interface_i4 || '');
+					s.getOption('awg_i5').getUIElement(s.section).setValue(config.interface_i5 || '');
 
 					if (config.interface_dns)
 						s.getOption('dns').getUIElement(s.section).setValue(config.interface_dns);
@@ -500,7 +519,7 @@ return network.registerProtocol('amneziawg', {
 					E('p', _('Drag or paste a valid <em>*.conf</em> file below to configure the local AmneziaWG interface.'))
 				] : [
 					E('p', _('Paste or drag a AmneziaWG configuration (commonly <em>wg0.conf</em>) from another system below to create a matching peer entry allowing that system to connect to the local AmneziaWG interface.')),
-					E('p', _('To fully configure the local AmneziaWG interface from an existing (e.g. provider supplied) configuration file, use the <strong><a class="full-import" href="#">configuration import</a></strong> instead.'))
+					E('p', _('To configure fully the local AmneziaWG interface from an existing (e.g. provider supplied) configuration file, use the <strong><a class="full-import" href="#">configuration import</a></strong> instead.'))
 				]),
 				E('p', [
 					E('textarea', {
@@ -575,9 +594,10 @@ return network.registerProtocol('amneziawg', {
 			return E('em', _('No peers defined yet.'));
 		};
 
-		o = ss.option(form.Flag, 'disabled', _('Peer disabled'), _('Enable / Disable peer. Restart amneziawg interface to apply changes.'));
-		o.modalonly = true;
+		o = ss.option(form.Flag, 'disabled', _('Disabled'), _('Enable / Disable peer. Restart amneziawg interface to apply changes.'));
+		o.editable = true;
 		o.optional = true;
+		o.width = '5%';
 
 		o = ss.option(form.Value, 'description', _('Description'), _('Optional. Description of peer.'));
 		o.placeholder = 'My Peer';
@@ -675,9 +695,6 @@ return network.registerProtocol('amneziawg', {
 					var psk = this.section.getUIElement(section_id, 'preshared_key'),
 					    map = this.map;
 
-					if (psk.getValue() && !confirm(_('Do you want to replace the current PSK?')))
-						return;
-
 					return generatePsk().then(function(key) {
 						psk.setValue(key);
 						map.save(null, true);
@@ -757,69 +774,78 @@ return network.registerProtocol('amneziawg', {
 
 		o.modalonly = true;
 
-	        o.createPeerConfig = function (section_id, endpoint, ips, eips, dns) {
+		o.createPeerConfig = function(section_id, endpoint, ips, eips, dns) {
 			var pub = s.formvalue(s.section, 'public_key'),
-			port = s.formvalue(s.section, 'listen_port') || '51820',
-			prv = this.section.formvalue(section_id, 'private_key'),
-			psk = this.section.formvalue(section_id, 'preshared_key'),
-			eport = this.section.formvalue(section_id, 'endpoint_port'),
-			keep = this.section.formvalue(section_id, 'persistent_keepalive'),
-			jc = s.formvalue(s.section, 'awg_jc'),
-			jmin = s.formvalue(s.section, 'awg_jmin'),
-			jmax = s.formvalue(s.section, 'awg_jmax'),
-			s1 = s.formvalue(s.section, 'awg_s1'),
-			s2 = s.formvalue(s.section, 'awg_s2'),
-			h1 = s.formvalue(s.section, 'awg_h1'),
-			h2 = s.formvalue(s.section, 'awg_h2'),
-			h3 = s.formvalue(s.section, 'awg_h3'),
-			h4 = s.formvalue(s.section, 'awg_h4');		
-				
+			    port = s.formvalue(s.section, 'listen_port') || '51820',
+				jc = s.formvalue(s.section, 'awg_jc'),
+				jmin = s.formvalue(s.section, 'awg_jmin'),
+				jmax = s.formvalue(s.section, 'awg_jmax'),
+				s1 = s.formvalue(s.section, 'awg_s1'),
+				s2 = s.formvalue(s.section, 'awg_s2'),
+				s3 = s.formvalue(s.section, 'awg_s3'),
+				s4 = s.formvalue(s.section, 'awg_s4'),
+				h1 = s.formvalue(s.section, 'awg_h1'),
+				h2 = s.formvalue(s.section, 'awg_h2'),
+				h3 = s.formvalue(s.section, 'awg_h3'),
+				h4 = s.formvalue(s.section, 'awg_h4'),
+				i1 = s.formvalue(s.section, 'awg_i1'),
+				i2 = s.formvalue(s.section, 'awg_i2'),
+				i3 = s.formvalue(s.section, 'awg_i3'),
+				i4 = s.formvalue(s.section, 'awg_i4'),
+				i5 = s.formvalue(s.section, 'awg_i5'),
+			    prv = this.section.formvalue(section_id, 'private_key'),
+			    psk = this.section.formvalue(section_id, 'preshared_key'),
+			    eport = this.section.formvalue(section_id, 'endpoint_port'),
+			    keep = this.section.formvalue(section_id, 'persistent_keepalive');
+
+			// If endpoint is IPv6 we must escape it with []
 			if (endpoint.indexOf(':') > 0) {
-			endpoint = '[' + endpoint + ']';
+				endpoint = '['+endpoint+']';
 			}
-			var configLines = [
+
+			return [
 				'[Interface]',
 				'PrivateKey = ' + prv,
-				eport ? 'ListenPort = ' + eport : '# ListenPort not defined',
 				eips && eips.length ? 'Address = ' + eips.join(', ') : '# Address not defined',
+				eport ? 'ListenPort = ' + eport : '# ListenPort not defined',
 				dns && dns.length ? 'DNS = ' + dns.join(', ') : '# DNS not defined',
-				''
-			];
-	
-			if (jc) configLines.push('jc = ' + jc);
-			if (jmin) configLines.push('jmin = ' + jmin);
-			if (jmax) configLines.push('jmax = ' + jmax);
-			if (s1) configLines.push('s1 = ' + s1);
-			if (s2) configLines.push('s2 = ' + s2);
-			if (h1) configLines.push('h1 = ' + h1);
-			if (h2) configLines.push('h2 = ' + h2);
-			if (h3) configLines.push('h3 = ' + h3);
-			if (h4) configLines.push('h4 = ' + h4);
-	
-			configLines.push(
+				jc ? 'Jc = ' + jc : '# Jc not defined',
+				jmin ? 'Jmin = ' + jmin : '# Jmin not defined',
+				jmax ? 'Jmax = ' + jmax : '# Jmax not defined',
+				s1 ? 'S1 = ' + s1 : '# S1 not defined',
+				s2 ? 'S2 = ' + s2 : '# S2 not defined',
+				s3 ? 'S3 = ' + s3 : '# S3 not defined',
+				s4 ? 'S4 = ' + s4 : '# S4 not defined',
+				h1 ? 'H1 = ' + h1 : '# H1 not defined',
+				h2 ? 'H2 = ' + h2 : '# H2 not defined',
+				h3 ? 'H3 = ' + h3 : '# H3 not defined',
+				h4 ? 'H4 = ' + h4 : '# H4 not defined',
+				i1 ? 'I1 = ' + i1 : '# I1 not defined',
+				i2 ? 'I2 = ' + i2 : '# I2 not defined',
+				i3 ? 'I3 = ' + i3 : '# I3 not defined',
+				i4 ? 'I4 = ' + i4 : '# I4 not defined',
+				i5 ? 'I5 = ' + i5 : '# I5 not defined',
 				'',
 				'[Peer]',
 				'PublicKey = ' + pub,
 				psk ? 'PresharedKey = ' + psk : '# PresharedKey not used',
 				ips && ips.length ? 'AllowedIPs = ' + ips.join(', ') : '# AllowedIPs not defined',
 				endpoint ? 'Endpoint = ' + endpoint + ':' + port : '# Endpoint not defined',
-				keep ? 'PersistentKeepAlive = ' + keep : '# PersistentKeepAlive not defined',
-				''
-			);
-	
-			return configLines.join('\n');
-	        };
+				keep ? 'PersistentKeepAlive = ' + keep : '# PersistentKeepAlive not defined'
+			].join('\n');
+		};
 
 		o.handleGenerateQR = function(section_id, ev) {
 			var mapNode = ss.getActiveModalMap(),
-				headNode = mapNode.parentNode.querySelector('h4'),
-				configGenerator = this.createPeerConfig.bind(this, section_id),
-				parent = this.map,
+			    headNode = mapNode.parentNode.querySelector('h4'),
+			    configGenerator = this.createPeerConfig.bind(this, section_id),
+			    parent = this.map,
 				eips = this.section.formvalue(section_id, 'allowed_ips');
 
 			return Promise.all([
 				network.getWANNetworks(),
 				network.getWAN6Networks(),
+				network.getNetwork('lan'),
 				L.resolveDefault(uci.load('ddns')),
 				L.resolveDefault(uci.load('system')),
 				parent.save(null, true)
@@ -827,12 +853,12 @@ return network.registerProtocol('amneziawg', {
 				var hostnames = [];
 
 				uci.sections('ddns', 'service', function(s) {
-					if (typeof(s.lookup_host) == 'string' && s.enabled == '1')
+					if (typeof(s?.lookup_host) == 'string' && s?.enabled == '1')
 						hostnames.push(s.lookup_host);
 				});
 
 				uci.sections('system', 'system', function(s) {
-					if (typeof(s.hostname) == 'string' && s.hostname.indexOf('.') > 0)
+					if (typeof(s?.hostname) == 'string' && s?.hostname?.indexOf('.') > 0)
 						hostnames.push(s.hostname);
 				});
 
@@ -846,34 +872,34 @@ return network.registerProtocol('amneziawg', {
 
 				var dns = [];
 
+				var lan = data[2];
+				if (lan) {
+					var lanIp = lan.getIPAddr();
+					if (lanIp) {
+						dns.unshift(lanIp)
+					}
+				}
+
 				var qrm, qrs, qro;
 
-				qrm = new form.JSONMap({
-		                    config: {
-		                        endpoint: hostnames[0],
-		                        allowed_ips: ips,
-					addresses: eips,
-					dns_servers: dns
-		                    }
-		                }, null, _('The generated configuration can be imported into a AmneziaWG client application to set up a connection towards this device.'));
-				
+				qrm = new form.JSONMap({ config: { endpoint: hostnames[0], allowed_ips: ips, addresses: eips, dns_servers: dns } }, null, _('The generated configuration can be imported into a WireGuard client application to set up a connection towards this device.'));
 				qrm.parent = parent;
 
 				qrs = qrm.section(form.NamedSection, 'config');
 
 				function handleConfigChange(ev, section_id, value) {
 					var code = this.map.findElement('.qr-code'),
-					conf = this.map.findElement('.client-config'),
-					endpoint = this.section.getUIElement(section_id, 'endpoint'),
-					ips = this.section.getUIElement(section_id, 'allowed_ips');
-					eips = this.section.getUIElement(section_id, 'addresses');
-					dns = this.section.getUIElement(section_id, 'dns_servers');					
+					    conf = this.map.findElement('.client-config'),
+					    endpoint = this.section.getUIElement(section_id, 'endpoint'),
+					    ips = this.section.getUIElement(section_id, 'allowed_ips');
+					    eips = this.section.getUIElement(section_id, 'addresses');
+					    dns = this.section.getUIElement(section_id, 'dns_servers');
 
 					if (this.isValid(section_id)) {
 						conf.firstChild.data = configGenerator(endpoint.getValue(), ips.getValue(), eips.getValue(), dns.getValue());
 						code.style.opacity = '.5';
 
-						invokeQREncode(conf.firstChild.data, code);
+						buildSVGQRCode(conf.firstChild.data, code);
 					}
 				};
 
@@ -897,7 +923,7 @@ return network.registerProtocol('amneziawg', {
 				qro.datatype = 'ipaddr';
 				qro.default = eips;
 				eips.forEach(function(eip) { qro.value(eip) });
-				qro.onchange = handleConfigChange;				
+				qro.onchange = handleConfigChange;
 
 				qro = qrs.option(form.DummyValue, 'output');
 				qro.renderWidget = function() {
@@ -908,16 +934,9 @@ return network.registerProtocol('amneziawg', {
 					}, [
 						E('div', {
 							'class': 'qr-code',
-							'style': 'display:flex; flex-direction: column; text-align: center',
+							'style': 'width:320px;flex:0 1 320px;text-align:center'
 						}, [
-							E('div', {
-								'style': 'width:320px;flex:0 1 320px;text-align:center'
-							}, [
-								E('em', { 'class': 'spinning' }, [ _('Generating QR code…') ])
-							]),
-							
-							E('div', {
-							}, ['Download Configuration']),	
+							E('em', { 'class': 'spinning' }, [ _('Generating QR code…') ])
 						]),
 						E('pre', {
 							'class': 'client-config',
@@ -934,7 +953,7 @@ return network.registerProtocol('amneziawg', {
 						}, [ peer_config ])
 					]);
 
-					invokeQREncode(peer_config, node.firstChild);
+					buildSVGQRCode(peer_config, node.firstChild);
 
 					return node;
 				};
diff --git a/luci-app-amneziawg/htdocs/luci-static/resources/view/amneziawg/status.js b/luci-proto-amneziawg/htdocs/luci-static/resources/view/amneziawg/status.js
similarity index 95%
rename from luci-app-amneziawg/htdocs/luci-static/resources/view/amneziawg/status.js
rename to luci-proto-amneziawg/htdocs/luci-static/resources/view/amneziawg/status.js
index dc6c89b..716f8b4 100644
--- a/luci-app-amneziawg/htdocs/luci-static/resources/view/amneziawg/status.js
+++ b/luci-proto-amneziawg/htdocs/luci-static/resources/view/amneziawg/status.js
@@ -6,9 +6,9 @@
 'require ui';
 
 
-var callGetWgInstances = rpc.declare({
+var callgetAwgInstances = rpc.declare({
 	object: 'luci.amneziawg',
-	method: 'getWgInstances'
+	method: 'getAwgInstances'
 });
 
 function timestampToStr(timestamp) {
@@ -128,7 +128,7 @@ return view.extend({
 					'click': ui.createHandlerFn(this, handleInterfaceDetails, ifaces[instanceName])
 				}, [
 					E('span', { 'class': 'ifacebadge' }, [
-						E('img', { 'src': L.resource('icons', 'tunnel.svg') }),
+						E('img', { 'src': L.resource('icons', 'amneziawg.svg') }),
 						'\xa0',
 						instanceName
 					]),
@@ -153,7 +153,7 @@ return view.extend({
 
 	render: function() {
 		poll.add(L.bind(function () {
-			return callGetWgInstances().then(L.bind(function(ifaces) {
+			return callgetAwgInstances().then(L.bind(function(ifaces) {
 				dom.content(
 					document.querySelector('#view'),
 					this.renderIfaces(ifaces)
diff --git a/luci-proto-amneziawg/po/ru/amneziawg.po b/luci-proto-amneziawg/po/ru/amneziawg.po
new file mode 100644
index 0000000..d6fdeac
--- /dev/null
+++ b/luci-proto-amneziawg/po/ru/amneziawg.po
@@ -0,0 +1,158 @@
+msgid "Imports settings from an existing AmneziaWG configuration file"
+msgstr "Импортирует настройки из существующего файла конфигурации AmneziaWG"
+
+msgid ""
+"Drag or paste a valid <em>*.conf</em> file below to configure the local "
+"AmneziaWG interface."
+msgstr ""
+"Перетащите или вставьте правильный файл <em>*.conf</em> ниже, чтобы "
+"настроить локальный интерфейс AmneziaWG."
+
+msgid ""
+"Paste or drag a AmneziaWG configuration (commonly <em>wg0.conf</em>) from "
+"another system below to create a matching peer entry allowing that system to "
+"connect to the local AmneziaWG interface."
+msgstr ""
+"Вставьте или перетащите конфигурацию AmneziaWG (обычно <em>wg0.conf</em>) из "
+"другой системы ниже, чтобы создать соответствующую запись узла, позволяющую "
+"этой системе подключиться к локальному интерфейсу AmneziaWG."
+
+msgid ""
+"To configure fully the local AmneziaWG interface from an existing (e.g. "
+"provider supplied) configuration file, use the <strong><a class=\"full-"
+"import\" href=\"#\">configuration import</a></strong> instead."
+msgstr ""
+"Чтобы полностью настроить локальный интерфейс AmneziaWG из существующего "
+"(например, предоставленного провайдером) файла конфигурации, используйте "
+"вместо этого <strong><a class=\"full-import\" href=\"#\">импорт "
+"конфигурации</a></strong>."
+
+msgid "Paste or drag supplied AmneziaWG configuration file…"
+msgstr "Вставьте или перетащите имеющийся файл конфигурации AmneziaWG…"
+
+msgid "Paste or drag AmneziaWG peer configuration (wg0.conf) file…"
+msgstr "Вставьте или перетащите файл конфигурации узлов AmneziaWG (wg0.conf)…"
+
+msgid "Recommended. IP addresses of the AmneziaWG interface."
+msgstr "Рекомендуемый. IP адреса интерфейса AmneziaWG."
+
+msgid "Imports settings from an existing AmneziaWG configuration file"
+msgstr "Импортирует настройки из существующего файла конфигурации AmneziaWG"
+
+msgid "AmneziaWG Settings"
+msgstr "Настройки AmneziaWG"
+
+msgid "Imports settings from an existing AmneziaWG configuration file"
+msgstr "Импортирует настройки из существующего файла конфигурации AmneziaWG"
+
+msgid "Imports settings from an existing AmneziaWG configuration file"
+msgstr "Импортирует настройки из существующего файла конфигурации AmneziaWG"
+
+msgid "Imports settings from an existing AmneziaWG configuration file"
+msgstr "Импортирует настройки из существующего файла конфигурации AmneziaWG"
+
+msgid ""
+"Further information about AmneziaWG interfaces and peers at <a href='https://"
+"docs.amnezia.org/documentation/amnezia-wg'>amnezia.org</a>."
+msgstr ""
+"Дополнительная информация об AmneziaWG интерфейсах и узлах приведена по "
+"адресу <a href='https://docs.amnezia.org/documentation/amnezia-wg'>amnezia.org</a>."
+
+msgid "Junk packet count."
+msgstr "Количество мусорных пакетов."
+
+msgid "Junk packet minimum size."
+msgstr "Минимальный размер мусорного пакета."
+
+msgid "Junk packet maximum size."
+msgstr "Максимальный размер мусорного пакета."
+
+msgid "Handshake initiation packet junk header size."
+msgstr "Размер мусорного заголовка пакета инициации рукопожатия."
+
+msgid "Handshake response packet junk header size."
+msgstr "Размер мусорного заголовка пакета ответа на рукопожатие."
+
+msgid "Cookie reply packet junk header size."
+msgstr "Размер мусорного заголовка пакета ответа cookie."
+
+msgid "Transport packet junk header size."
+msgstr "Размер мусорного заголовка транспортного пакета."
+
+msgid "Handshake initiation packet type header."
+msgstr "Тип заголовка пакета инициации рукопожатия."
+
+msgid "Handshake response packet type header."
+msgstr "Тип заголовка пакета ответа на рукопожатие."
+
+msgid "Handshake cookie packet type header."
+msgstr "Тип заголовка пакета под нагрузкой."
+
+msgid "Transport packet type header."
+msgstr "Тип заголовка транспортного пакета."
+
+msgid "First special junk packet signature."
+msgstr "Сигнатура первого special junk пакета."
+
+msgid "Second special junk packet signature."
+msgstr "Сигнатура второго special junk пакета."
+
+msgid "Third special junk packet signature."
+msgstr "Сигнатура третьего special junk пакета."
+
+msgid "Fourth special junk packet signature."
+msgstr "Сигнатура четвертого special junk пакета."
+
+msgid "Fifth special junk packet signature."
+msgstr "Сигнатура пятого special junk пакета."
+
+msgid "Enable / Disable peer. Restart amneziawg interface to apply changes."
+msgstr ""
+"Включить/выключить узел. Перезапустите интерфейс AmneziaWG, чтобы применить "
+"изменения."
+
+msgid "AmneziaWG peer is disabled"
+msgstr "Узел AmneziaWG отключён"
+
+msgctxt "Label indicating that AmneziaWG peer is disabled"
+msgid "Disabled"
+msgstr "Отключено"
+
+msgctxt "Label indicating that AmneziaWG peer lacks public key"
+msgid "Key missing"
+msgstr "Отсутствует ключ"
+
+msgctxt "Tooltip displaying full AmneziaWG peer public key"
+msgid "Public key: %h"
+msgstr "Публичный ключ: %h"
+
+msgctxt "Label indicating that AmneziaWG peer private key is stored"
+msgid "Private"
+msgstr "Private"
+
+msgctxt "Label indicating that AmneziaWG peer uses a PSK"
+msgid "PSK"
+msgstr "PSK"
+
+msgid "Required. Public key of the AmneziaWG peer."
+msgstr "Обязательно. Публичный ключ AmneziaWG узла."
+
+"Optional. Private key of the AmneziaWG peer. The key is not required for "
+"establishing a connection but allows generating a peer configuration or QR "
+"code if available. It can be removed after the configuration has been "
+"exported."
+msgstr ""
+"Необязательно. Закрытый ключ узла AmneziaWG. Ключ не требуется для "
+"установления соединения, но позволяет сгенерировать конфигурацию узла или QR-"
+"код, если он доступен. Он может быть удален после экспорта конфигурации."
+
+msgid "Generates a configuration suitable for import on a AmneziaWG peer"
+msgstr "Создает конфигурацию, подходящую для импорта на узле AmneziaWG"
+
+msgid ""
+"No fixed interface listening port defined, peers might not be able to "
+"initiate connections to this AmneziaWG instance!"
+msgstr ""
+"Не определен фиксированный порт прослушивания интерфейса, поэтому узлы могут "
+"оказаться не в состоянии инициировать соединения с этим экземпляром "
+"AmneziaWG!"
\ No newline at end of file
diff --git a/luci-proto-amneziawg/po/ru/status.po b/luci-proto-amneziawg/po/ru/status.po
new file mode 100644
index 0000000..a7f743f
--- /dev/null
+++ b/luci-proto-amneziawg/po/ru/status.po
@@ -0,0 +1,25 @@
+msgid "AmneziaWG Status"
+msgstr "Состояние AmneziaWG"
+
+msgctxt "AmneziaWG instance heading"
+msgid "Instance \"%h\""
+msgstr "Экземпляр «%h»"
+
+msgctxt "No AmneziaWG peer handshake yet"
+msgid "Never"
+msgstr "Никогда"
+
+msgctxt "AmneziaWG keep alive interval"
+msgid "every %ds"
+msgstr "каждые %dс"
+
+msgctxt "Tooltip displaying full AmneziaWG peer public key"
+msgid "Public key: %h"
+msgstr "Публичный ключ: %h"
+
+msgctxt "AmneziaWG listen port"
+msgid "Port %d"
+msgstr "Порт %d"
+
+msgid "No AmneziaWG interfaces configured."
+msgstr "Интерфейсы AmneziaWG не настроены."
\ No newline at end of file
diff --git a/luci-app-amneziawg/root/usr/share/luci/menu.d/luci-proto-amneziawg.json b/luci-proto-amneziawg/root/usr/share/luci/menu.d/luci-proto-amneziawg.json
similarity index 100%
rename from luci-app-amneziawg/root/usr/share/luci/menu.d/luci-proto-amneziawg.json
rename to luci-proto-amneziawg/root/usr/share/luci/menu.d/luci-proto-amneziawg.json
diff --git a/luci-app-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json b/luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json
similarity index 67%
rename from luci-app-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json
rename to luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json
index 96a22f8..2e7472f 100644
--- a/luci-app-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json
+++ b/luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json
@@ -2,15 +2,12 @@
 	"luci-proto-amneziawg": {
 		"description": "Grant access to LuCI AmneziaWG procedures",
 		"read": {
-			"file": {
-				"/usr/bin/qrencode --inline --8bit --type=SVG --output=- -- *": [ "exec" ]
-			},
 			"ubus": {
 				"luci.amneziawg": [
-					"getWgInstances"
+					"getAwgInstances"
 				]
 			},
-			"uci": [ "ddns", "system" ]
+			"uci": [ "ddns", "system", "network" ]
 		},
 		"write": {
 			"ubus": {
diff --git a/luci-app-amneziawg/root/usr/share/rpcd/ucode/luci.amneziawg b/luci-proto-amneziawg/root/usr/share/rpcd/ucode/luci.amneziawg
similarity index 65%
rename from luci-app-amneziawg/root/usr/share/rpcd/ucode/luci.amneziawg
rename to luci-proto-amneziawg/root/usr/share/rpcd/ucode/luci.amneziawg
index 53ce368..453510f 100644
--- a/luci-app-amneziawg/root/usr/share/rpcd/ucode/luci.amneziawg
+++ b/luci-proto-amneziawg/root/usr/share/rpcd/ucode/luci.amneziawg
@@ -15,18 +15,33 @@ function command(cmd) {
 	return trim(popen(cmd)?.read?.('all'));
 }
 
+function checkPeerHost(configHost, configPort, wgHost) {
+	const ips = popen(`resolveip ${shellquote(configHost)} 2>/dev/null`);
+	const hostIp = replace(wgHost, /\[|\]/g, "");
+	if (ips) {
+		for (let line = ips.read('line'); length(line); line = ips.read('line')) {
+			const ip = rtrim(line, '\n');
+			if (configPort && (ip + ":" + configPort == hostIp)) {
+				return true;
+			} else if (ip == substr(hostIp, 0, rindex(hostIp, ":"))) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
 
 const methods = {
 	generatePsk: {
 		call: function() {
-			return { psk: command('amneziawg genpsk 2>/dev/null') };
+			return { psk: command('awg genpsk 2>/dev/null') };
 		}
 	},
 
 	generateKeyPair: {
 		call: function() {
-			const priv = command('amneziawg genkey 2>/dev/null');
-			const pub = command(`echo ${shellquote(priv)} | amneziawg pubkey 2>/dev/null`);
+			const priv = command('awg genkey 2>/dev/null');
+			const pub = command(`echo ${shellquote(priv)} | awg pubkey 2>/dev/null`);
 
 			return { keys: { priv, pub } };
 		}
@@ -36,20 +51,20 @@ const methods = {
 		args: { privkey: "privkey" },
 		call: function(req) {
 			const priv = req.args?.privkey;
-			const pub = command(`echo ${shellquote(priv)} | amneziawg pubkey 2>/dev/null`);
+			const pub = command(`echo ${shellquote(priv)} | awg pubkey 2>/dev/null`);
 
 			return { keys: { priv, pub } };
 		}
 	},
 
-	getWgInstances: {
+	getAwgInstances: {
 		call: function() {
 			const data = {};
 			let last_device;
 			let qr_pubkey = {};
 
 			const uci = cursor();
-			const wg_dump = popen("amneziawg show all dump 2>/dev/null");
+			const wg_dump = popen("awg show all dump 2>/dev/null");
 
 			if (wg_dump) {
 				uci.load("network");
@@ -74,12 +89,17 @@ const methods = {
 					}
 					else {
 						let peer_name;
+						let peer_name_legacy;
 
 						uci.foreach('network', `amneziawg_${last_device}`, (s) => {
-							if (s.public_key == record[1])
+							if (!s.disabled && s.public_key == record[1] && (!s.endpoint_host || checkPeerHost(s.endpoint_host, s.endpoint_port, record[3])))
 								peer_name = s.description;
+							if (s.public_key == record[1])
+								peer_name_legacy = s.description;
 						});
 
+						if (!peer_name) peer_name = peer_name_legacy;
+
 						const peer = {
 							name: peer_name,
 							public_key: record[1],