diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..2d06f13e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# The JSON files contain newlines inconsistently
+[*.json]
+insert_final_newline = ignore
+
+# Minified JavaScript files shouldn't be changed
+[**.min.js]
+indent_style = ignore
+insert_final_newline = ignore
+
+[*.md]
+trim_trailing_whitespace = false
+
diff --git a/.env b/.env
new file mode 100644
index 00000000..e9362edc
--- /dev/null
+++ b/.env
@@ -0,0 +1,11 @@
+WG_HOST=🚨YOUR_SERVER_IP
+# (Supports: en, ru, tr, no, pl, fr, de, ca, es)
+LANGUAGE=en
+PORT=51821
+WG_DEVICE=eth0
+WG_PORT=51820
+WG_DEFAULT_ADDRESS=10.8.0.x
+WG_DEFAULT_DNS=1.1.1.1
+WG_ALLOWED_IPS=0.0.0.0/0, ::/0
+DICEBEAR_TYPE=bottts
+USE_GRAVATAR=true
\ No newline at end of file
diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
index 98baa0d8..3346cc42 100644
--- a/.github/workflows/deploy-pr.yml
+++ b/.github/workflows/deploy-pr.yml
@@ -7,21 +7,21 @@ jobs:
   deploy:
     name: Build & Deploy
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'wg-easy'
+    if: github.repository_owner == 'evoll'
     permissions:
       packages: write
       contents: read
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v3.11.1
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v3.6.0
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -32,4 +32,4 @@ jobs:
       with:
         push: false
         platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
-        tags: ghcr.io/wg-easy/wg-easy:pr
+        tags: ghcr.io/evoll/awg-easy:pr
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4c945f72..19384d3f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,13 +10,13 @@ jobs:
     name: Build & Deploy
     runs-on: ubuntu-latest
     if: |
-      github.repository_owner == 'wg-easy' &&
+      github.repository_owner == 'evoll' &&
       !contains(github.event.head_commit.message, '!skipci')
     permissions:
       packages: write
       contents: read
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: v14
 
@@ -24,10 +24,10 @@ jobs:
       uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v3.11.1
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v3.6.0
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -38,4 +38,4 @@ jobs:
       with:
         push: true
         platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
-        tags: ghcr.io/wg-easy/wg-easy:latest, ghcr.io/wg-easy/wg-easy:14
+        tags: ghcr.io/evoll/awg-easy:14
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 00000000..e86ba8f8
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,98 @@
+name: Docker
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  schedule:
+    - cron: '43 21 * * *'
+  push:
+    branches: [ "v14" ]
+    # Publish semver tags as releases.
+    tags: [ 'v*.*.*' ]
+  pull_request:
+    branches: [ "v14" ]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad #v4.0.0
+        with:
+          cosign-release: 'v2.2.4'
+
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@1583c0f09d26c58c59d25b0eef29792b7ce99d9a # v3.0.0
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@28fdb31ff34708d19615a74d67103ddc2ea9725c # v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+      - name: Sign the published Docker image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
+          TAGS: ${{ steps.meta.outputs.tags }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+        # This step uses the identity token to provision an ephemeral certificate
+        # against the sigstore community Fulcio instance.
+        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ae44d928..451fc7d0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,10 +10,10 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'wg-easy'
+    if: github.repository_owner == 'evoll'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
diff --git a/.gitignore b/.gitignore
index e6fce2a6..16e763a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /src/node_modules
 .DS_Store
 *.swp
+.idea
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a9922746..dc23b5b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 # As a workaround we have to build on nodejs 18
 # nodejs 20 hangs on build with armv6/armv7
-FROM docker.io/library/node:lts-alpine AS build_node_modules
+FROM docker.io/library/node:18-alpine AS build_node_modules
 
 # Update npm to latest
-RUN npm install -g npm@latest
+RUN npm install -g npm@10.8.2
 
 # Copy Web UI
 COPY src /app
@@ -13,8 +13,8 @@ RUN npm ci --omit=dev &&\
 
 # Copy build result to a new image.
 # This saves a lot of disk space.
-FROM docker.io/library/node:lts-alpine
-HEALTHCHECK CMD /usr/bin/timeout 5s /bin/sh -c "/usr/bin/wg show | /bin/grep -q interface || exit 1" --interval=1m --timeout=5s --retries=3
+FROM amneziavpn/amnezia-wg:latest
+HEALTHCHECK CMD /usr/bin/timeout 5s /bin/sh -c "/usr/bin/awg show | /bin/grep -q interface || exit 1" --interval=1m --timeout=5s --retries=3
 COPY --from=build_node_modules /app /app
 
 # Move node_modules one directory up, so during development
@@ -35,15 +35,15 @@ RUN apk add --no-cache \
     dpkg \
     dumb-init \
     iptables \
-    iptables-legacy \
-    wireguard-tools
+    nodejs \
+    npm
 
 # Use iptables-legacy
-RUN update-alternatives --install /usr/sbin/iptables iptables /usr/sbin/iptables-legacy 10 --slave /usr/sbin/iptables-restore iptables-restore /usr/sbin/iptables-legacy-restore --slave /usr/sbin/iptables-save iptables-save /usr/sbin/iptables-legacy-save
+RUN update-alternatives --install /sbin/iptables iptables /sbin/iptables-legacy 10 --slave /sbin/iptables-restore iptables-restore /sbin/iptables-legacy-restore --slave /sbin/iptables-save iptables-save /sbin/iptables-legacy-save
 
 # Set Environment
 ENV DEBUG=Server,WireGuard
 
 # Run Web UI
 WORKDIR /app
-CMD ["/usr/bin/dumb-init", "node", "server.js"]
\ No newline at end of file
+CMD ["/usr/bin/dumb-init", "node", "server.js"]
diff --git a/How_to_generate_an_bcrypt_hash.md b/How_to_generate_an_bcrypt_hash.md
index d1780bc9..da56d7cc 100644
--- a/How_to_generate_an_bcrypt_hash.md
+++ b/How_to_generate_an_bcrypt_hash.md
@@ -1,45 +1,42 @@
-# Generating bcrypt-hashed password
+# wg-password
 
-With version 14 of wg-easy, a password hashed with bcrypt is needed instead of the plain-text password string. This doc explains how to generate the hash based on a plain-text password.
+`wg-password` (wgpw) is a script that generates bcrypt password hashes for use with `awg-easy`, enhancing security by requiring passwords.
 
-## Using Docker + node
+## Features
 
-- You are using docker compose
+- Generate bcrypt password hashes.
+- Easily integrate with `awg-easy` to enforce password requirements.
 
-    The easiest way to generate a bcrypt password hash with wgpw is using docker and node:
+## Usage with Docker
 
-    ```sh
-    docker run ghcr.io/wg-easy/wg-easy:14 node -e 'const bcrypt = require("bcryptjs"); const hash = bcrypt.hashSync("YOUR_PASSWORD", 10); console.log(hash.replace(/\$/g, "$$$$"));'
-    ```
-
-    The hashed password will get printed on your terminal. Copy it and use on the `PASSWORD_HASH` environment variable in your docker compose.
-
-- You are using `docker run`
-
-    If you are using `docker run` for running wg-easy, you must enclose the hash string in single quotes (`'...'`). You can use this command:
-
-    ```sh
-    docker run --rm ghcr.io/wg-easy/wg-easy:14 node -e "const bcrypt = require('bcryptjs'); const hash = bcrypt.hashSync('YOUR_PASSWORD', 10); console.log('\'' + hash + '\'');"
-    ```
-
-    The hashed password will get printed on your terminal. Copy it and use on the `PASSWORD_HASH` environment variable in your docker run command.
-
-## Using Docker + wgpw
-
-`wg-password` (wgpw) is a script that generates bcrypt password hashes. You can use it with docker:
+To generate a bcrypt password hash using docker, run the following command :
 
 ```sh
-docker run ghcr.io/wg-easy/wg-easy:14 wgpw YOUR_PASSWORD
+docker run -it ghcr.io/evoll/awg-easy:14 wgpw YOUR_PASSWORD
+PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW' // literally YOUR_PASSWORD
 ```
-
-You will see an output similar to this:
-
+If a password is not provided, the tool will prompt you for one :
 ```sh
+docker run -it ghcr.io/evoll/awg-easy:14 wgpw
+Enter your password:      // hidden prompt, type in your password
 PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW'
 ```
 
-In this example, the `$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW` string is your hashed password. For using it with docker-compose, you need to escape each `$` characters by adding another `$` before them, or they will get interpreted as variables. The final password you can use in docker-compose will look like this:
+**Important** : make sure to enclose your password in **single quotes** when you run `docker run` command :
 
-```sh
-$$2b$$12$$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW
+```bash
+$ echo $2b$12$coPqCsPtcF <-- not correct
+b2
+$ echo "$2b$12$coPqCsPtcF" <-- not correct
+b2
+$ echo '$2b$12$coPqCsPtcF' <-- correct
+$2b$12$coPqCsPtcF
 ```
+
+**Important** : Please note: don't wrap the generated hash password in single quotes when you use `docker-compose.yml`. Instead, replace each `$` symbol with two `$$` symbols. For example:
+
+``` yaml
+- PASSWORD_HASH=$$2y$$10$$hBCoykrB95WSzuV4fafBzOHWKu9sbyVa34GJr8VV5R/pIelfEMYyG
+```
+
+This hash is for the password 'foobar123', obtained using the command `docker run ghcr.io/evoll/awg-easy:14 wgpw foobar123` and then inserted an additional `$` before each existing `$` symbol.
diff --git a/README.md b/README.md
index a01fcb2c..7f438d34 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,32 @@
-# WireGuard Easy
+# AmnewziaWG Easy
 
-[![Build & Publish Docker Image to Docker Hub](https://github.com/wg-easy/wg-easy/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/wg-easy/wg-easy/actions/workflows/deploy.yml)
-[![Lint](https://github.com/wg-easy/wg-easy/actions/workflows/lint.yml/badge.svg?branch=master)](https://github.com/wg-easy/wg-easy/actions/workflows/lint.yml)
-![Docker](https://img.shields.io/docker/pulls/weejewel/wg-easy.svg)
-[![Sponsor](https://img.shields.io/github/sponsors/weejewel)](https://github.com/sponsors/WeeJeWel)
-![GitHub Stars](https://img.shields.io/github/stars/wg-easy/wg-easy)
-
-You have found the easiest way to install & manage WireGuard on any Linux host!
+You have found the easiest way to install & manage AmnewziaWG on any Linux host!
 
 <p align="center">
   <img src="./assets/screenshot.png" width="802" />
 </p>
 
 ## Features
-* All-in-one: WireGuard + Web UI.
+
+* All-in-one: AmneziaWG + Web UI.
 * Easy installation, simple to use.
 * List, create, edit, delete, enable & disable clients.
 * Show a client's QR code.
 * Download a client's configuration file.
 * Statistics for which clients are connected.
 * Tx/Rx charts for each connected client.
-* Gravatar support.
+* Gravatar support or random avatars.
 * Automatic Light / Dark Mode
 * Multilanguage Support
-* UI_TRAFFIC_STATS (default off)
+* Traffic Stats (default off)
+* One Time Links (default off)
+* Client Expiry (default off)
+* Prometheus metrics support
 
 ## Requirements
 
-* A host with a kernel that supports WireGuard (all modern kernels).
 * A host with Docker installed.
 
-## Versions
-
-This branch is only for the v14 release of WireGuard Easy.
-For newer versions, please refer to the [master branch](https://github.com/wg-easy/wg-easy/tree/master).
-
 ## Installation
 
 ### 1. Install Docker
@@ -49,70 +41,83 @@ exit
 
 And log in again.
 
-### 2. Run WireGuard Easy
+### 2. Run AmneziaWG Easy
 
-To automatically install & run wg-easy, simply run:
+To automatically install & run awg-easy, simply run:
 
 ```
   docker run -d \
-  --name=wg-easy \
-  -e LANG=de \
+  --name=awg-easy \
+  -e LANG=en \
   -e WG_HOST=<🚨YOUR_SERVER_IP> \
   -e PASSWORD_HASH=<🚨YOUR_ADMIN_PASSWORD_HASH> \
   -e PORT=51821 \
   -e WG_PORT=51820 \
-  -v ~/.wg-easy:/etc/wireguard \
+  -v ~/.awg-easy:/etc/amnezia/amneziawg \
   -p 51820:51820/udp \
   -p 51821:51821/tcp \
   --cap-add=NET_ADMIN \
   --cap-add=SYS_MODULE \
   --sysctl="net.ipv4.conf.all.src_valid_mark=1" \
   --sysctl="net.ipv4.ip_forward=1" \
+  --device=/dev/net/tun:/dev/net/tun \
   --restart unless-stopped \
-  ghcr.io/wg-easy/wg-easy:14
+  ghcr.io/evoll/awg-easy:14
 ```
 
 > 💡 Replace `YOUR_SERVER_IP` with your WAN IP, or a Dynamic DNS hostname.
 >
-> 💡 Replace `YOUR_ADMIN_PASSWORD_HASH` with a bcrypt password hash to log in on the Web UI. See [How_to_generate_an_bcrypt_hash.md](./How_to_generate_an_bcrypt_hash.md) for know how generate the hash.
+> 💡 Replace `YOUR_ADMIN_PASSWORD_HASH` with a bcrypt password hash to log in on the Web UI.
+> See [How_to_generate_an_bcrypt_hash.md](./How_to_generate_an_bcrypt_hash.md) for know how generate the hash.
 
 The Web UI will now be available on `http://0.0.0.0:51821`.
 
-> 💡 Your configuration files will be saved in `~/.wg-easy`
+The Prometheus metrics will now be available on `http://0.0.0.0:51821/metrics`. Grafana dashboard [21733](https://grafana.com/grafana/dashboards/21733-wireguard/)
 
-WireGuard Easy can be launched with Docker Compose as well - just download
-[`docker-compose.yml`](docker-compose.yml), make necessary adjustments and
-execute `docker compose up --detach`.
-
-### 3. Sponsor
-
-Are you enjoying this project? [Buy Emile a beer!](https://github.com/sponsors/WeeJeWel) 🍻
+> 💡 Your configuration files will be saved in `~/.awg-easy`
 
 ## Options
 
 These options can be configured by setting environment variables using `-e KEY="VALUE"` in the `docker run` command.
 
-| Env | Default | Example | Description                                                                                                                                          |
-| - | - | - |------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `PORT` | `51821` | `6789` | TCP port for Web UI.                                                                                                                                 |
-| `WEBUI_HOST` | `0.0.0.0` | `localhost` | IP address web UI binds to.                                                                                                                          |
-| `PASSWORD_HASH` | - | `$2y$05$Ci...` | When set, requires a password when logging in to the Web UI. See [How to generate an bcrypt hash.md]("https://github.com/wg-easy/wg-easy/blob/master/How_to_generate_an_bcrypt_hash.md") for know how generate the hash. |
-| `WG_HOST` | - | `vpn.myserver.com` | The public hostname of your VPN server.                                                                                                              |
-| `WG_DEVICE` | `eth0` | `ens6f0` | Ethernet device the wireguard traffic should be forwarded through.                                                                                   |
-| `WG_PORT` | `51820` | `12345` | The public UDP port of your VPN server. WireGuard will listen on that (othwise default) inside the Docker container.                                 |
-| `WG_CONFIG_PORT`| `51820` | `12345` | The UDP port used on [Home Assistant Plugin](https://github.com/adriy-be/homeassistant-addons-jdeath/tree/main/wgeasy)                               
-| `WG_MTU` | `null` | `1420` | The MTU the clients will use. Server uses default WG MTU.                                                                                            |
-| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. If this value is 0, then connections won't be kept alive.                                            |
-| `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range.                                                                                                                            |
-| `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. If set to blank value, clients will not use any DNS.                                                                    |
-| `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use.                                                                                                                        |
-| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L19) for the default value.                                             |
-| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L20) for the default value.                                             |
-| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L27) for the default value.                                             |
-| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L28) for the default value.                                             |
-| `LANG` | `en` | `de` | Web UI language (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi).                                        |
-| `UI_TRAFFIC_STATS` | `false` | `true` | Enable detailed RX / TX client stats in Web UI                                                                                                       |
-| `UI_CHART_TYPE` | `0` | `1` | UI_CHART_TYPE=0 # Charts disabled, UI_CHART_TYPE=1 # Line chart, UI_CHART_TYPE=2 # Area chart, UI_CHART_TYPE=3 # Bar chart                           |
+| Env                           | Default           | Example                        | Description                                                                                                                                                                                                              |
+|-------------------------------|-------------------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `PORT`                        | `51821`           | `6789`                         | TCP port for Web UI.                                                                                                                                                                                                     |
+| `WEBUI_HOST`                  | `0.0.0.0`         | `localhost`                    | IP address web UI binds to.                                                                                                                                                                                              |
+| `PASSWORD_HASH`               | -                 | `$2y$05$Ci...`                 | When set, requires a password when logging in to the Web UI. See [How to generate an bcrypt hash.md]("https://github.com/evoll/awg-easy/blob/v14/How_to_generate_an_bcrypt_hash.md") for know how generate the hash. |
+| `WG_HOST`                     | -                 | `vpn.myserver.com`             | The public hostname of your VPN server.                                                                                                                                                                                  |
+| `WG_DEVICE`                   | `eth0`            | `ens6f0`                       | Ethernet device the wireguard traffic should be forwarded through.                                                                                                                                                       |
+| `WG_PORT`                     | `51820`           | `12345`                        | The public UDP port of your VPN server. WireGuard will listen on that (othwise default) inside the Docker container.                                                                                                     |
+| `WG_CONFIG_PORT`              | `51820`           | `12345`                        | The UDP port used on [Home Assistant Plugin](https://github.com/adriy-be/homeassistant-addons-jdeath/tree/main/wgeasy)                                                                                                   |
+| `WG_MTU`                      | `null`            | `1420`                         | The MTU the clients will use. Server uses default WG MTU.                                                                                                                                                                |
+| `WG_PERSISTENT_KEEPALIVE`     | `0`               | `25`                           | Value in seconds to keep the "connection" open. If this value is 0, then connections won't be kept alive.                                                                                                                |
+| `WG_DEFAULT_ADDRESS`          | `10.8.0.x`        | `10.6.0.x`                     | Clients IP address range.                                                                                                                                                                                                |
+| `WG_DEFAULT_DNS`              | `1.1.1.1`         | `8.8.8.8, 8.8.4.4`             | DNS server clients will use. If set to blank value, clients will not use any DNS.                                                                                                                                        |
+| `WG_ALLOWED_IPS`              | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use.                                                                                                                                                                                            |
+| `WG_PRE_UP`                   | `...`             | -                              | See [config.js](https://github.com/evoll/awg-easy/blob/v14/src/config.js#L19) for the default value.                                                                                                                 |
+| `WG_POST_UP`                  | `...`             | `iptables ...`                 | See [config.js](https://github.com/evoll/awg-easy/blob/v14/src/config.js#L20) for the default value.                                                                                                                 |
+| `WG_PRE_DOWN`                 | `...`             | -                              | See [config.js](https://github.com/evoll/awg-easy/blob/v14/src/config.js#L27) for the default value.                                                                                                                 |
+| `WG_POST_DOWN`                | `...`             | `iptables ...`                 | See [config.js](https://github.com/evoll/awg-easy/blob/v14/src/config.js#L28) for the default value.                                                                                                                 |
+| `WG_ENABLE_EXPIRES_TIME`      | `false`           | `true`                         | Enable expire time for clients                                                                                                                                                                                           |
+| `LANG`                        | `en`              | `de`                           | Web UI language (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi).                                                                                                            |
+| `UI_TRAFFIC_STATS`            | `false`           | `true`                         | Enable detailed RX / TX client stats in Web UI                                                                                                                                                                           |
+| `UI_CHART_TYPE`               | `0`               | `1`                            | UI_CHART_TYPE=0 # Charts disabled, UI_CHART_TYPE=1 # Line chart, UI_CHART_TYPE=2 # Area chart, UI_CHART_TYPE=3 # Bar chart                                                                                               |
+| `DICEBEAR_TYPE`               | `false`           | `bottts`                       | see [dicebear types](https://www.dicebear.com/styles/)                                                                                                                                                                   |
+| `USE_GRAVATAR`                | `false`           | `true`                         | Use or not GRAVATAR service                                                                                                                                                                                              |
+| `WG_ENABLE_ONE_TIME_LINKS`    | `false`           | `true`                         | Enable display and generation of short one time download links (expire after 5 minutes)                                                                                                                                  |
+| `MAX_AGE`                     | `0`               | `1440`                         | The maximum age of Web UI sessions in minutes. `0` means that the session will exist until the browser is closed.                                                                                                        |
+| `UI_ENABLE_SORT_CLIENTS`      | `false`           | `true`                         | Enable UI sort clients by name                                                                                                                                                                                           |
+| `ENABLE_PROMETHEUS_METRICS`   | `false`           | `true`                         | Enable Prometheus metrics `http://0.0.0.0:51821/metrics` and `http://0.0.0.0:51821/metrics/json`                                                                                                                         |
+| `PROMETHEUS_METRICS_PASSWORD` | -                 | `$2y$05$Ci...`                 | If set, Basic Auth is required when requesting metrics. See [How to generate an bcrypt hash.md]("https://github.com/evoll/awg-easy/blob/v14/How_to_generate_an_bcrypt_hash.md") for know how generate the hash.      |
+| `JC`                          | `random`          | `5`                            | Junk packet count — number of packets with random data that are sent before the start of the session.                                                                                                                    |
+| `JMIN`                        | `50`              | `25`                           | Junk packet minimum size — minimum packet size for Junk packet. That is, all randomly generated packets will have a size no smaller than Jmin.                                                                           |
+| `JMAX`                        | `1000`            | `250`                          | Junk packet maximum size — maximum size for Junk packets.                                                                                                                                                                |
+| `S1`                          | `random`          | `75`                           | Init packet junk size — the size of random data that will be added to the init packet, the size of which is initially fixed.                                                                                             |
+| `S2`                          | `random`          | `75`                           | Response packet junk size — the size of random data that will be added to the response packet, the size of which is initially fixed.                                                                                     |
+| `H1`                          | `random`          | `1234567891`                   | Init packet magic header — the header of the first byte of the handshake. Must be < uint_max.                                                                                                                            |
+| `H2`                          | `random`          | `1234567892`                   | Response packet magic header — header of the first byte of the handshake response. Must be < uint_max.                                                                                                                   |
+| `H3`                          | `random`          | `1234567893`                   | Underload packet magic header — UnderLoad packet header. Must be < uint_max.                                                                                                                                             |
+| `H4`                          | `random`          | `1234567894`                   | Transport packet magic header — header of the packet of the data packet. Must be < uint_max.                                                                                                                             |
 
 > If you change `WG_PORT`, make sure to also change the exposed port.
 
@@ -121,17 +126,14 @@ These options can be configured by setting environment variables using `-e KEY="
 To update to the latest version, simply run:
 
 ```bash
-docker stop wg-easy
-docker rm wg-easy
-docker pull ghcr.io/wg-easy/wg-easy:14
+docker stop awg-easy
+docker rm awg-easy
+docker pull ghcr.io/evoll/awg-easy
 ```
 
 And then run the `docker run -d \ ...` command above again.
 
-With Docker Compose WireGuard Easy can be updated with a single command:
-`docker compose up --detach --pull always` (if an image tag is specified in the
-Compose file and it is not `latest`, make sure that it is changed to the desired
-one; by default it is omitted and
-[defaults to `latest`](https://docs.docker.com/engine/reference/run/#image-references)). \
-The WireGuard Easy container will be automatically recreated if a newer image
-was pulled.
+## Thanks
+
+Based on [wg-easy](https://github.com/wg-easy/wg-easy) by Emile Nijssen.  
+Use integrations and adaptation with AmneziaWg from [amnezia-wg-easy](https://github.com/w0rng/amnezia-wg-easy) by w0rng.
diff --git a/assets/awg-easy.sketch b/assets/awg-easy.sketch
new file mode 100644
index 00000000..3a996729
Binary files /dev/null and b/assets/awg-easy.sketch differ
diff --git a/assets/screenshot.png b/assets/screenshot.png
index 5f54cfe5..e90c5335 100644
Binary files a/assets/screenshot.png and b/assets/screenshot.png differ
diff --git a/assets/wg-easy.sketch b/assets/wg-easy.sketch
deleted file mode 100644
index c72b7c3d..00000000
Binary files a/assets/wg-easy.sketch and /dev/null differ
diff --git a/wg-easy.service b/awg-easy.service
similarity index 86%
rename from wg-easy.service
rename to awg-easy.service
index bcdf72fd..e22656d0 100644
--- a/wg-easy.service
+++ b/awg-easy.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Wireguard VPN + Web-based Admin UI
+Description=AmneziaWG VPN + Web-based Admin UI
 After=network-online.target nss-lookup.target
 
 [Service]
-Environment="WG_HOST=raspberrypi.local" # Change this to your host's public address or static public ip.
+Environment="WG_HOST=local" # Change this to your host's public address or static public ip.
 Environment="PASSWORD=REPLACEME" # When set, requires a password when logging in to the Web UI, to disable add a hashtag
 #Environment="WG_DEFAULT_ADDRESS=10.0.8.x" #Clients IP address range.
 #Environment="WG_DEFAULT_DNS=10.0.8.1, 1.1.1.1" #DNS server clients will use. If set to blank value, clients will not use any DNS.
diff --git a/contributing.md b/contributing.md
deleted file mode 100644
index 83cb3d94..00000000
--- a/contributing.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Contributing to wg-easy
-
-First and foremost, thank you! We appreciate that you want to contribute to wg-easy, your time is valuable, and your contributions mean a lot to us.
-
-
-## Important!
-
-By contributing to this project, you:
-
-* Agree that you have authored 100% of the content
-* Agree that you have the necessary rights to the content
-* Agree that you have received the necessary permissions from your employer to make the contributions (if applicable)
-* Agree that the content you contribute may be provided under the Project license(s)
-* Agree that, if you did not author 100% of the content, the appropriate licenses and copyrights have been added along with any other necessary attribution.
-
-
-## Getting started
-
-**What does "contributing" mean?**
-
-Creating an issue is the simplest form of contributing to a project. But there are many ways to contribute, including the following:
-
-- Updating or correcting documentation
-- Feature requests
-- Bug reports
-
-
-## Showing support for wg-easy
-
-Please keep in mind that open source software is built by people like you, who spend their free time creating things the rest the community can use.
-
-Don't have time to contribute? No worries, here are some other ways to show your support for wg-easy:
-
-- star the [project](https://github.com/wg-easy/wg-easy)
-- tweet your support for wg-easy
-
-
-## Issues
-
-Please only create issues for bug reports or feature requests. Issues discussing any other topics may be closed by the project's maintainers without further explanation.
-
-Do not create issues about bumping dependencies unless a bug has been identified and you can demonstrate that it effects this library.
-
-**Help us to help you**
-
-Remember that we’re here to help, but not to make guesses about what you need help with:
-
-- Whatever bug or issue you're experiencing, assume that it will not be as obvious to the maintainers as it is to you.
-- Spell it out completely. Keep in mind that maintainers need to think about _all potential use cases_ of a library. It's important that you explain how you're using a library so that maintainers can make that connection and solve the issue.
-
-_It can't be understated how frustrating and draining it can be to maintainers to have to ask clarifying questions on the most basic things, before it's even possible to start debugging. Please try to make the best use of everyone's time involved, including yourself, by providing this information up front._
-
-### Before creating an issue
-
-Please try to determine if the issue is caused by an underlying library, and if so, create the issue there. Sometimes this is difficult to know. We only ask that you attempt to give a reasonable attempt to find out. Oftentimes the readme will have advice about where to go to create issues.
-
-Try to follow these guidelines:
-
-- **Avoid creating issues for implementation help** - It's much better for discoverability, SEO, and semantics - to keep the issue tracker focused on bugs and feature requests - to ask implementation-related questions on [stackoverflow.com][so]
-- **Investigate the issue** - Search for exising issues (open or closed) that address the issue, and might have even resolved it already.
-- **Check the readme** - oftentimes you will find notes about creating issues, and where to go depending on the type of issue.
-- Create the issue in the appropriate repository.
-
-### Creating an issue
-
-Please be as descriptive as possible when creating an issue. Give us the information we need to successfully answer your question or address your issue by answering the following in your issue:
-
-- **description**: (required) What is the bug you're experiencing? How are you using this library/app?
-- **OS**: (required) what operating system are you on?
-- **version**: (required) please note the version of wg-easy are you using
-- **error messages**: (required) please paste any error messages into the issue, or a [gist](https://gist.github.com/)
-- **extensions, plugins, helpers, etc** (if applicable): please list any extensions you're using
-
-
-### Closing issues
-
-The original poster or the maintainers of wg-easy may close an issue at any time. Typically, but not exclusively, issues are closed when:
-
-- The issue is resolved
-- The project's maintainers have determined the issue is out of scope
-- An issue is clearly a duplicate of another issue, in which case the duplicate issue will be linked.
-- A discussion has clearly run its course
-
-
-## Next steps
-
-**Tips for creating idiomatic issues**
-
-Spending just a little extra time to review best practices and brush up on your contributing skills will, at minimum, make your issue easier to read, easier to resolve, and more likely to be found by others who have the same or similar issue in the future. At best, it will open up doors and potential career opportunities by helping you be at your best.
-
-The following resources were hand-picked to help you be the most effective contributor you can be:
-
-- The [Guide to Idiomatic Contributing](https://github.com/jonschlinkert/idiomatic-contributing) is a great place for newcomers to start, but there is also information for experienced contributors there.
-- Take some time to learn basic markdown. We can't stress this enough. Don't start pasting code into GitHub issues before you've taken a moment to review this [markdown cheatsheet](https://gist.github.com/jonschlinkert/5854601)
-- The GitHub guide to [basic markdown](https://help.github.com/articles/markdown-basics/) is another great markdown resource.
-- Learn about [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/). And if you want to really go above and beyond, read [mastering markdown](https://guides.github.com/features/mastering-markdown/).
-
-At the very least, please try to:
-
-- Use backticks to wrap code. This ensures that it retains its formatting and isn't modified when it's rendered by GitHub, and makes the code more readable to others
-- When applicable, use syntax highlighting by adding the correct language name after the first "code fence"
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d1b7cf66..deb401d7 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,11 +1,11 @@
 services:
-  wg-easy:
+  awg-easy:
     build:
       dockerfile: ./Dockerfile
     command: npm run serve
     volumes:
       - ./src/:/app/
-      # - ./data/:/etc/wireguard
+      # - ./data/:/etc/amnezia/amneziawg
     ports:
       - "51820:51820/udp"
       - "51821:51821/tcp"
diff --git a/docker-compose.yml b/docker-compose.yml
index 025e2065..9cac058d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,40 +1,17 @@
 volumes:
-  etc_wireguard:
+  etc_amnezia:
 
 services:
-  wg-easy:
-    environment:
-      # Change Language:
-      # (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi)
-      - LANG=de
-      # ⚠️ Required:
-      # Change this to your host's public address
-      - WG_HOST=raspberrypi.local
-
-      # Optional:
-      # - PASSWORD_HASH=$$2y$$10$$hBCoykrB95WSzuV4fafBzOHWKu9sbyVa34GJr8VV5R/pIelfEMYyG # (needs double $$, hash of 'foobar123'; see "How_to_generate_an_bcrypt_hash.md" for generate the hash)
-      # - PORT=51821
-      # - WG_PORT=51820
-      # - WG_CONFIG_PORT=92820
-      # - WG_DEFAULT_ADDRESS=10.8.0.x
-      # - WG_DEFAULT_DNS=1.1.1.1
-      # - WG_MTU=1420
-      # - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24
-      # - WG_PERSISTENT_KEEPALIVE=25
-      # - WG_PRE_UP=echo "Pre Up" > /etc/wireguard/pre-up.txt
-      # - WG_POST_UP=echo "Post Up" > /etc/wireguard/post-up.txt
-      # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt
-      # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt
-      # - UI_TRAFFIC_STATS=true
-      # - UI_CHART_TYPE=0 # (0 Charts disabled, 1 # Line chart, 2 # Area chart, 3 # Bar chart)
-
-    image: ghcr.io/wg-easy/wg-easy:14
-    container_name: wg-easy
+  awg-easy:
+    env_file:
+      - .env
+    image: ghcr.io/evoll/awg-easy:14
+    container_name: awg-easy
     volumes:
-      - etc_wireguard:/etc/wireguard
+      - etc_amnezia:/etc/amnezia/amneziawg
     ports:
-      - "51820:51820/udp"
-      - "51821:51821/tcp"
+      - "${WG_PORT}:${WG_PORT}/udp"
+      - "${PORT}:${PORT}/tcp"
     restart: unless-stopped
     cap_add:
       - NET_ADMIN
@@ -43,3 +20,5 @@ services:
     sysctls:
       - net.ipv4.ip_forward=1
       - net.ipv4.conf.all.src_valid_mark=1
+    devices:
+    - /dev/net/tun:/dev/net/tun
diff --git a/package-lock.json b/package-lock.json
index f57675bd..a2c832a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "wg-easy",
-  "version": "1.0.1",
+  "name": "awg-easy",
+  "version": "14.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "1.0.1"
+      "version": "14.0.0"
     }
   }
 }
diff --git a/package.json b/package.json
index 81c45aac..49c142e9 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
-  "version": "1.0.1",
+  "version": "14.0.0",
   "scripts": {
-    "sudobuild": "DOCKER_BUILDKIT=1 sudo docker build --tag wg-easy .",
-    "build": "DOCKER_BUILDKIT=1 docker build --tag wg-easy .",
+    "sudobuild": "DOCKER_BUILDKIT=1 sudo docker build --tag awg-easy .",
+    "build": "DOCKER_BUILDKIT=1 docker build --tag awg-easy .",
     "serve": "docker compose -f docker-compose.yml -f docker-compose.dev.yml up",
-    "sudostart": "sudo docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy",
-    "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy"
+    "sudostart": "sudo docker run --env WG_HOST=0.0.0.0 --name awg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/amnezia/amneziawg -p 51820:51820/udp -p 51821:51821/tcp awg-easy",
+    "start": "docker run --env WG_HOST=0.0.0.0 --name awg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/amnezia/amneziawg -p 51820:51820/udp -p 51821:51821/tcp awg-easy"
   }
-}
\ No newline at end of file
+}
diff --git a/src/config.js b/src/config.js
index eb06a4b4..931f26f5 100644
--- a/src/config.js
+++ b/src/config.js
@@ -5,10 +5,9 @@ const { release: { version } } = require('./package.json');
 module.exports.RELEASE = version;
 module.exports.PORT = process.env.PORT || '51821';
 module.exports.WEBUI_HOST = process.env.WEBUI_HOST || '0.0.0.0';
-/** This is only kept for migration purpose. DO NOT USE! */
-module.exports.PASSWORD = process.env.PASSWORD;
 module.exports.PASSWORD_HASH = process.env.PASSWORD_HASH;
-module.exports.WG_PATH = process.env.WG_PATH || '/etc/wireguard/';
+module.exports.MAX_AGE = parseInt(process.env.MAX_AGE, 10) * 1000 * 60 || 0;
+module.exports.WG_PATH = process.env.WG_PATH || '/etc/amnezia/amneziawg/';
 module.exports.WG_DEVICE = process.env.WG_DEVICE || 'eth0';
 module.exports.WG_HOST = process.env.WG_HOST;
 module.exports.WG_PORT = process.env.WG_PORT || '51820';
@@ -39,3 +38,25 @@ iptables -D FORWARD -o wg0 -j ACCEPT;
 module.exports.LANG = process.env.LANG || 'en';
 module.exports.UI_TRAFFIC_STATS = process.env.UI_TRAFFIC_STATS || 'false';
 module.exports.UI_CHART_TYPE = process.env.UI_CHART_TYPE || 0;
+module.exports.WG_ENABLE_ONE_TIME_LINKS = process.env.WG_ENABLE_ONE_TIME_LINKS || 'false';
+module.exports.UI_ENABLE_SORT_CLIENTS = process.env.UI_ENABLE_SORT_CLIENTS || 'false';
+module.exports.WG_ENABLE_EXPIRES_TIME = process.env.WG_ENABLE_EXPIRES_TIME || 'false';
+module.exports.ENABLE_PROMETHEUS_METRICS = process.env.ENABLE_PROMETHEUS_METRICS || 'false';
+module.exports.PROMETHEUS_METRICS_PASSWORD = process.env.PROMETHEUS_METRICS_PASSWORD;
+
+module.exports.DICEBEAR_TYPE = process.env.DICEBEAR_TYPE || false;
+module.exports.USE_GRAVATAR = process.env.USE_GRAVATAR || false;
+
+const getRandomInt = (min, max) => min + Math.floor(Math.random() * (max - min));
+const getRandomJunkSize = () => getRandomInt(15, 150);
+const getRandomHeader = () => getRandomInt(1, 2_147_483_647);
+
+module.exports.JC = process.env.JC || getRandomInt(3, 10);
+module.exports.JMIN = process.env.JMIN || 50;
+module.exports.JMAX = process.env.JMAX || 1000;
+module.exports.S1 = process.env.S1 || getRandomJunkSize();
+module.exports.S2 = process.env.S2 || getRandomJunkSize();
+module.exports.H1 = process.env.H1 || getRandomHeader();
+module.exports.H2 = process.env.H2 || getRandomHeader();
+module.exports.H3 = process.env.H3 || getRandomHeader();
+module.exports.H4 = process.env.H4 || getRandomHeader();
diff --git a/src/lib/Server.js b/src/lib/Server.js
index 4fb89dba..6abea18b 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -2,6 +2,7 @@
 
 const bcrypt = require('bcryptjs');
 const crypto = require('node:crypto');
+const basicAuth = require('basic-auth');
 const { createServer } = require('node:http');
 const { stat, readFile } = require('node:fs/promises');
 const { resolve, sep } = require('node:path');
@@ -28,14 +29,22 @@ const {
   PORT,
   WEBUI_HOST,
   RELEASE,
-  PASSWORD,
   PASSWORD_HASH,
+  MAX_AGE,
   LANG,
   UI_TRAFFIC_STATS,
   UI_CHART_TYPE,
+  WG_ENABLE_ONE_TIME_LINKS,
+  UI_ENABLE_SORT_CLIENTS,
+  WG_ENABLE_EXPIRES_TIME,
+  ENABLE_PROMETHEUS_METRICS,
+  PROMETHEUS_METRICS_PASSWORD,
+  DICEBEAR_TYPE,
+  USE_GRAVATAR,
 } = require('../config');
 
 const requiresPassword = !!PASSWORD_HASH;
+const requiresPrometheusPassword = !!PROMETHEUS_METRICS_PASSWORD;
 
 /**
  * Checks if `password` matches the PASSWORD_HASH.
@@ -45,18 +54,22 @@ const requiresPassword = !!PASSWORD_HASH;
  * @param {string} password String to test
  * @returns {boolean} true if matching environment, otherwise false
  */
-const isPasswordValid = (password) => {
+const isPasswordValid = (password, hash) => {
   if (typeof password !== 'string') {
     return false;
   }
-
-  if (PASSWORD_HASH) {
-    return bcrypt.compareSync(password, PASSWORD_HASH);
+  if (hash) {
+    return bcrypt.compareSync(password, hash);
   }
 
   return false;
 };
 
+const cronJobEveryMinute = async () => {
+  await WireGuard.cronJobEveryMinute();
+  setTimeout(cronJobEveryMinute, 60 * 1000);
+};
+
 module.exports = class Server {
 
   constructor() {
@@ -83,9 +96,14 @@ module.exports = class Server {
         return `"${LANG}"`;
       }))
 
+      .get('/api/remember-me', defineEventHandler((event) => {
+        setHeader(event, 'Content-Type', 'application/json');
+        return MAX_AGE > 0;
+      }))
+
       .get('/api/ui-traffic-stats', defineEventHandler((event) => {
         setHeader(event, 'Content-Type', 'application/json');
-        return `"${UI_TRAFFIC_STATS}"`;
+        return `${UI_TRAFFIC_STATS}`;
       }))
 
       .get('/api/ui-chart-type', defineEventHandler((event) => {
@@ -93,6 +111,29 @@ module.exports = class Server {
         return `"${UI_CHART_TYPE}"`;
       }))
 
+      .get('/api/wg-enable-one-time-links', defineEventHandler((event) => {
+        setHeader(event, 'Content-Type', 'application/json');
+        return `${WG_ENABLE_ONE_TIME_LINKS}`;
+      }))
+
+      .get('/api/ui-sort-clients', defineEventHandler((event) => {
+        setHeader(event, 'Content-Type', 'application/json');
+        return `${UI_ENABLE_SORT_CLIENTS}`;
+      }))
+
+      .get('/api/wg-enable-expire-time', defineEventHandler((event) => {
+        setHeader(event, 'Content-Type', 'application/json');
+        return `${WG_ENABLE_EXPIRES_TIME}`;
+      }))
+
+      .get('/api/ui-avatar-settings', defineEventHandler((event) => {
+        setHeader(event, 'Content-Type', 'application/json');
+        return {
+          dicebear: DICEBEAR_TYPE,
+          gravatar: USE_GRAVATAR,
+        };
+      }))
+
       // Authentication
       .get('/api/session', defineEventHandler((event) => {
         const authenticated = requiresPassword
@@ -104,8 +145,26 @@ module.exports = class Server {
           authenticated,
         };
       }))
+      .get('/cnf/:clientOneTimeLink', defineEventHandler(async (event) => {
+        if (WG_ENABLE_ONE_TIME_LINKS === 'false') {
+          throw createError({
+            status: 404,
+            message: 'Invalid state',
+          });
+        }
+        const clientOneTimeLink = getRouterParam(event, 'clientOneTimeLink');
+        const clients = await WireGuard.getClients();
+        const client = clients.find((client) => client.oneTimeLink === clientOneTimeLink);
+        if (!client) return;
+        const clientId = client.id;
+        const config = await WireGuard.getClientConfiguration({ clientId });
+        await WireGuard.eraseOneTimeLink({ clientId });
+        setHeader(event, 'Content-Disposition', `attachment; filename="${clientOneTimeLink}.conf"`);
+        setHeader(event, 'Content-Type', 'text/plain');
+        return config;
+      }))
       .post('/api/session', defineEventHandler(async (event) => {
-        const { password } = await readBody(event);
+        const { password, remember } = await readBody(event);
 
         if (!requiresPassword) {
           // if no password is required, the API should never be called.
@@ -116,13 +175,16 @@ module.exports = class Server {
           });
         }
 
-        if (!isPasswordValid(password)) {
+        if (!isPasswordValid(password, PASSWORD_HASH)) {
           throw createError({
             status: 401,
             message: 'Incorrect Password',
           });
         }
 
+        if (MAX_AGE && remember) {
+          event.node.req.session.cookie.maxAge = MAX_AGE;
+        }
         event.node.req.session.authenticated = true;
         event.node.req.session.save();
 
@@ -143,7 +205,7 @@ module.exports = class Server {
         }
 
         if (req.url.startsWith('/api/') && req.headers['authorization']) {
-          if (isPasswordValid(req.headers['authorization'])) {
+          if (isPasswordValid(req.headers['authorization'], PASSWORD_HASH)) {
             return next();
           }
           return res.status(401).json({
@@ -193,7 +255,8 @@ module.exports = class Server {
       }))
       .post('/api/wireguard/client', defineEventHandler(async (event) => {
         const { name } = await readBody(event);
-        await WireGuard.createClient({ name });
+        const { expiredDate } = await readBody(event);
+        await WireGuard.createClient({ name, expiredDate });
         return { success: true };
       }))
       .delete('/api/wireguard/client/:clientId', defineEventHandler(async (event) => {
@@ -209,6 +272,20 @@ module.exports = class Server {
         await WireGuard.enableClient({ clientId });
         return { success: true };
       }))
+      .post('/api/wireguard/client/:clientId/generateOneTimeLink', defineEventHandler(async (event) => {
+        if (WG_ENABLE_ONE_TIME_LINKS === 'false') {
+          throw createError({
+            status: 404,
+            message: 'Invalid state',
+          });
+        }
+        const clientId = getRouterParam(event, 'clientId');
+        if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
+          throw createError({ status: 403 });
+        }
+        await WireGuard.generateOneTimeLink({ clientId });
+        return { success: true };
+      }))
       .post('/api/wireguard/client/:clientId/disable', defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
         if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
@@ -234,6 +311,15 @@ module.exports = class Server {
         const { address } = await readBody(event);
         await WireGuard.updateClientAddress({ clientId, address });
         return { success: true };
+      }))
+      .put('/api/wireguard/client/:clientId/expireDate', defineEventHandler(async (event) => {
+        const clientId = getRouterParam(event, 'clientId');
+        if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
+          throw createError({ status: 403 });
+        }
+        const { expireDate } = await readBody(event);
+        await WireGuard.updateClientExpireDate({ clientId, expireDate });
+        return { success: true };
       }));
 
     const safePathJoin = (base, target) => {
@@ -259,6 +345,50 @@ module.exports = class Server {
       });
     };
 
+    // Check Prometheus credentials
+    app.use(
+      fromNodeMiddleware((req, res, next) => {
+        if (!requiresPrometheusPassword || !req.url.startsWith('/metrics')) {
+          return next();
+        }
+        const user = basicAuth(req);
+        if (!user) {
+          res.statusCode = 401;
+          return { error: 'Not Logged In' };
+        }
+        if (user.pass) {
+          if (isPasswordValid(user.pass, PROMETHEUS_METRICS_PASSWORD)) {
+            return next();
+          }
+          res.statusCode = 401;
+          return { error: 'Incorrect Password' };
+        }
+        res.statusCode = 401;
+        return { error: 'Not Logged In' };
+      }),
+    );
+
+    // Prometheus Metrics API
+    const routerPrometheusMetrics = createRouter();
+    app.use(routerPrometheusMetrics);
+
+    // Prometheus Routes
+    routerPrometheusMetrics
+      .get('/metrics', defineEventHandler(async (event) => {
+        setHeader(event, 'Content-Type', 'text/plain');
+        if (ENABLE_PROMETHEUS_METRICS === 'true') {
+          return WireGuard.getMetrics();
+        }
+        return '';
+      }))
+      .get('/metrics/json', defineEventHandler(async (event) => {
+        setHeader(event, 'Content-Type', 'application/json');
+        if (ENABLE_PROMETHEUS_METRICS === 'true') {
+          return WireGuard.getMetricsJSON();
+        }
+        return '';
+      }));
+
     // backup_restore
     const router3 = createRouter();
     app.use(router3);
@@ -297,6 +427,7 @@ module.exports = class Server {
             if (id.endsWith('.json')) setHeader(event, 'Content-Type', 'application/json');
             if (id.endsWith('.css')) setHeader(event, 'Content-Type', 'text/css');
             if (id.endsWith('.png')) setHeader(event, 'Content-Type', 'image/png');
+            if (id.endsWith('.svg')) setHeader(event, 'Content-Type', 'image/svg+xml');
 
             return {
               size: stats.size,
@@ -307,12 +438,10 @@ module.exports = class Server {
       }),
     );
 
-    if (PASSWORD) {
-      throw new Error('DO NOT USE PASSWORD ENVIRONMENT VARIABLE. USE PASSWORD_HASH INSTEAD.\nSee https://github.com/wg-easy/wg-easy/blob/v14/How_to_generate_an_bcrypt_hash.md');
-    }
-
     createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST);
     debug(`Listening on http://${WEBUI_HOST}:${PORT}`);
+
+    cronJobEveryMinute();
   }
 
 };
diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js
index adf6ca95..2ad98bbd 100644
--- a/src/lib/WireGuard.js
+++ b/src/lib/WireGuard.js
@@ -5,6 +5,7 @@ const path = require('path');
 const debug = require('debug')('WireGuard');
 const crypto = require('node:crypto');
 const QRCode = require('qrcode');
+const CRC32 = require('crc-32');
 
 const Util = require('./Util');
 const ServerError = require('./ServerError');
@@ -23,6 +24,17 @@ const {
   WG_POST_UP,
   WG_PRE_DOWN,
   WG_POST_DOWN,
+  WG_ENABLE_EXPIRES_TIME,
+  WG_ENABLE_ONE_TIME_LINKS,
+  JC,
+  JMIN,
+  JMAX,
+  S1,
+  S2,
+  H1,
+  H2,
+  H3,
+  H4,
 } = require('../config');
 
 module.exports = class WireGuard {
@@ -51,6 +63,15 @@ module.exports = class WireGuard {
             privateKey,
             publicKey,
             address,
+            jc: JC,
+            jmin: JMIN,
+            jmax: JMAX,
+            s1: S1,
+            s2: S2,
+            h1: H1,
+            h2: H2,
+            h3: H3,
+            h4: H4,
           },
           clients: {},
         };
@@ -106,6 +127,15 @@ PreUp = ${WG_PRE_UP}
 PostUp = ${WG_POST_UP}
 PreDown = ${WG_PRE_DOWN}
 PostDown = ${WG_POST_DOWN}
+Jc = ${config.server.jc}
+Jmin = ${config.server.jmin}
+Jmax = ${config.server.jmax}
+S1 = ${config.server.s1}
+S2 = ${config.server.s2}
+H1 = ${config.server.h1}
+H2 = ${config.server.h2}
+H3 = ${config.server.h3}
+H4 = ${config.server.h4}
 `;
 
     for (const [clientId, client] of Object.entries(config.clients)) {
@@ -146,16 +176,22 @@ ${client.preSharedKey ? `PresharedKey = ${client.preSharedKey}\n` : ''
       publicKey: client.publicKey,
       createdAt: new Date(client.createdAt),
       updatedAt: new Date(client.updatedAt),
+      expiredAt: client.expiredAt !== null
+        ? new Date(client.expiredAt)
+        : null,
       allowedIPs: client.allowedIPs,
+      oneTimeLink: client.oneTimeLink ?? null,
+      oneTimeLinkExpiresAt: client.oneTimeLinkExpiresAt ?? null,
       downloadableConfig: 'privateKey' in client,
       persistentKeepalive: null,
       latestHandshakeAt: null,
       transferRx: null,
       transferTx: null,
+      endpoint: null,
     }));
 
     // Loop WireGuard status
-    const dump = await Util.exec('wg show wg0 dump', {
+    const dump = await Util.exec('awg show wg0 dump', {
       log: false,
     });
     dump
@@ -180,6 +216,7 @@ ${client.preSharedKey ? `PresharedKey = ${client.preSharedKey}\n` : ''
         client.latestHandshakeAt = latestHandshakeAt === '0'
           ? null
           : new Date(Number(`${latestHandshakeAt}000`));
+        client.endpoint = endpoint === '(none)' ? null : endpoint;
         client.transferRx = Number(transferRx);
         client.transferTx = Number(transferTx);
         client.persistentKeepalive = persistentKeepalive;
@@ -208,6 +245,15 @@ PrivateKey = ${client.privateKey ? `${client.privateKey}` : 'REPLACE_ME'}
 Address = ${client.address}/24
 ${WG_DEFAULT_DNS ? `DNS = ${WG_DEFAULT_DNS}\n` : ''}\
 ${WG_MTU ? `MTU = ${WG_MTU}\n` : ''}\
+Jc = ${config.server.jc}
+Jmin = ${config.server.jmin}
+Jmax = ${config.server.jmax}
+S1 = ${config.server.s1}
+S2 = ${config.server.s2}
+H1 = ${config.server.h1}
+H2 = ${config.server.h2}
+H3 = ${config.server.h3}
+H4 = ${config.server.h4}
 
 [Peer]
 PublicKey = ${config.server.publicKey}
@@ -225,7 +271,7 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
     });
   }
 
-  async createClient({ name }) {
+  async createClient({ name, expiredDate }) {
     if (!name) {
       throw new Error('Missing: Name');
     }
@@ -254,7 +300,6 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
     if (!address) {
       throw new Error('Maximum number of clients reached.');
     }
-
     // Create Client
     const id = crypto.randomUUID();
     const client = {
@@ -267,10 +312,15 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
 
       createdAt: new Date(),
       updatedAt: new Date(),
-
+      expiredAt: null,
       enabled: true,
     };
-
+    if (expiredDate) {
+      client.expiredAt = new Date(expiredDate);
+      client.expiredAt.setHours(23);
+      client.expiredAt.setMinutes(59);
+      client.expiredAt.setSeconds(59);
+    }
     config.clients[id] = client;
 
     await this.saveConfig();
@@ -296,6 +346,23 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
     await this.saveConfig();
   }
 
+  async generateOneTimeLink({ clientId }) {
+    const client = await this.getClient({ clientId });
+    const key = `${clientId}-${Math.floor(Math.random() * 1000)}`;
+    client.oneTimeLink = Math.abs(CRC32.str(key)).toString(16);
+    client.oneTimeLinkExpiresAt = new Date(Date.now() + 5 * 60 * 1000);
+    client.updatedAt = new Date();
+    await this.saveConfig();
+  }
+
+  async eraseOneTimeLink({ clientId }) {
+    const client = await this.getClient({ clientId });
+    // client.oneTimeLink = null;
+    client.oneTimeLinkExpiresAt = new Date(Date.now() + 10 * 1000);
+    client.updatedAt = new Date();
+    await this.saveConfig();
+  }
+
   async disableClient({ clientId }) {
     const client = await this.getClient({ clientId });
 
@@ -327,6 +394,22 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
     await this.saveConfig();
   }
 
+  async updateClientExpireDate({ clientId, expireDate }) {
+    const client = await this.getClient({ clientId });
+
+    if (expireDate) {
+      client.expiredAt = new Date(expireDate);
+      client.expiredAt.setHours(23);
+      client.expiredAt.setMinutes(59);
+      client.expiredAt.setSeconds(59);
+    } else {
+      client.expiredAt = null;
+    }
+    client.updatedAt = new Date();
+
+    await this.saveConfig();
+  }
+
   async __reloadConfig() {
     await this.__buildConfig();
     await this.__syncConfig();
@@ -353,4 +436,107 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
     await Util.exec('wg-quick down wg0').catch(() => {});
   }
 
+  async cronJobEveryMinute() {
+    const config = await this.getConfig();
+    let needSaveConfig = false;
+    // Expires Feature
+    if (WG_ENABLE_EXPIRES_TIME === 'true') {
+      for (const client of Object.values(config.clients)) {
+        if (client.enabled !== true) continue;
+        if (client.expiredAt !== null && new Date() > new Date(client.expiredAt)) {
+          debug(`Client ${client.id} expired.`);
+          needSaveConfig = true;
+          client.enabled = false;
+          client.updatedAt = new Date();
+        }
+      }
+    }
+    // One Time Link Feature
+    if (WG_ENABLE_ONE_TIME_LINKS === 'true') {
+      for (const client of Object.values(config.clients)) {
+        if (client.oneTimeLink !== null && new Date() > new Date(client.oneTimeLinkExpiresAt)) {
+          debug(`Client ${client.id} One Time Link expired.`);
+          needSaveConfig = true;
+          client.oneTimeLink = null;
+          client.oneTimeLinkExpiresAt = null;
+          client.updatedAt = new Date();
+        }
+      }
+    }
+    if (needSaveConfig) {
+      await this.saveConfig();
+    }
+  }
+
+  async getMetrics() {
+    const clients = await this.getClients();
+    let wireguardPeerCount = 0;
+    let wireguardEnabledPeersCount = 0;
+    let wireguardConnectedPeersCount = 0;
+    let wireguardSentBytes = '';
+    let wireguardReceivedBytes = '';
+    let wireguardLatestHandshakeSeconds = '';
+    for (const client of Object.values(clients)) {
+      wireguardPeerCount++;
+      if (client.enabled === true) {
+        wireguardEnabledPeersCount++;
+      }
+      if (client.endpoint !== null) {
+        wireguardConnectedPeersCount++;
+      }
+      wireguardSentBytes += `wireguard_sent_bytes{interface="wg0",enabled="${client.enabled}",address="${client.address}",name="${client.name}"} ${Number(client.transferTx)}\n`;
+      wireguardReceivedBytes += `wireguard_received_bytes{interface="wg0",enabled="${client.enabled}",address="${client.address}",name="${client.name}"} ${Number(client.transferRx)}\n`;
+      wireguardLatestHandshakeSeconds += `wireguard_latest_handshake_seconds{interface="wg0",enabled="${client.enabled}",address="${client.address}",name="${client.name}"} ${client.latestHandshakeAt ? (new Date().getTime() - new Date(client.latestHandshakeAt).getTime()) / 1000 : 0}\n`;
+    }
+
+    let returnText = '# HELP awg-easy and wireguard metrics\n';
+
+    returnText += '\n# HELP wireguard_configured_peers\n';
+    returnText += '# TYPE wireguard_configured_peers gauge\n';
+    returnText += `wireguard_configured_peers{interface="wg0"} ${Number(wireguardPeerCount)}\n`;
+
+    returnText += '\n# HELP wireguard_enabled_peers\n';
+    returnText += '# TYPE wireguard_enabled_peers gauge\n';
+    returnText += `wireguard_enabled_peers{interface="wg0"} ${Number(wireguardEnabledPeersCount)}\n`;
+
+    returnText += '\n# HELP wireguard_connected_peers\n';
+    returnText += '# TYPE wireguard_connected_peers gauge\n';
+    returnText += `wireguard_connected_peers{interface="wg0"} ${Number(wireguardConnectedPeersCount)}\n`;
+
+    returnText += '\n# HELP wireguard_sent_bytes Bytes sent to the peer\n';
+    returnText += '# TYPE wireguard_sent_bytes counter\n';
+    returnText += `${wireguardSentBytes}`;
+
+    returnText += '\n# HELP wireguard_received_bytes Bytes received from the peer\n';
+    returnText += '# TYPE wireguard_received_bytes counter\n';
+    returnText += `${wireguardReceivedBytes}`;
+
+    returnText += '\n# HELP wireguard_latest_handshake_seconds UNIX timestamp seconds of the last handshake\n';
+    returnText += '# TYPE wireguard_latest_handshake_seconds gauge\n';
+    returnText += `${wireguardLatestHandshakeSeconds}`;
+
+    return returnText;
+  }
+
+  async getMetricsJSON() {
+    const clients = await this.getClients();
+    let wireguardPeerCount = 0;
+    let wireguardEnabledPeersCount = 0;
+    let wireguardConnectedPeersCount = 0;
+    for (const client of Object.values(clients)) {
+      wireguardPeerCount++;
+      if (client.enabled === true) {
+        wireguardEnabledPeersCount++;
+      }
+      if (client.endpoint !== null) {
+        wireguardConnectedPeersCount++;
+      }
+    }
+    return {
+      wireguard_configured_peers: Number(wireguardPeerCount),
+      wireguard_enabled_peers: Number(wireguardEnabledPeersCount),
+      wireguard_connected_peers: Number(wireguardConnectedPeersCount),
+    };
+  }
+
 };
diff --git a/src/package-lock.json b/src/package-lock.json
index a07c2bbd..1afccd0e 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,24 +1,27 @@
 {
-  "name": "wg-easy",
-  "version": "1.0.1",
+  "name": "awg-easy",
+  "version": "14.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "wg-easy",
-      "version": "1.0.1",
+      "name": "awg-easy",
+      "version": "14.0.0",
       "license": "CC BY-NC-SA 4.0",
       "dependencies": {
+        "basic-auth": "^2.0.1",
         "bcryptjs": "^2.4.3",
-        "debug": "^4.3.6",
+        "crc-32": "^1.2.2",
+        "debug": "^4.3.7",
         "express-session": "^1.18.0",
         "h3": "^1.12.0",
         "qrcode": "^1.5.4"
       },
       "devDependencies": {
+        "@tailwindcss/forms": "^0.5.9",
         "eslint-config-athom": "^3.1.3",
         "nodemon": "^3.1.4",
-        "tailwindcss": "^3.4.9"
+        "tailwindcss": "^3.4.10"
       },
       "engines": {
         "node": ">=18"
@@ -451,6 +454,26 @@
         "node": ">=14"
       }
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tailwindcss/forms": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz",
+      "integrity": "sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mini-svg-data-uri": "^1.2.3"
+      },
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -977,6 +1000,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/bcryptjs": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
@@ -1209,6 +1244,18 @@
       "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
       "license": "MIT"
     },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1306,12 +1353,11 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-      "license": "MIT",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1749,9 +1795,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
-      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.9.0.tgz",
+      "integrity": "sha512-McVbYmwA3NEKwRQY5g4aWMdcZE5xZxV8i8l7CqJSrameuGSQJtSWaL/LxTEzSKKaCcOhlpDR8XEfYXWPrdo/ZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1810,27 +1856,28 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
+      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
         "array.prototype.flat": "^1.3.2",
         "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
+        "eslint-module-utils": "^2.9.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.15.0"
       },
@@ -2159,6 +2206,26 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/express-session/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2658,9 +2725,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2822,9 +2889,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3223,9 +3290,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3248,6 +3315,16 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/mini-svg-data-uri": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
+      "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mini-svg-data-uri": "cli.js"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -3282,10 +3359,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "license": "MIT"
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/mz": {
       "version": "2.7.0",
@@ -3704,9 +3780,9 @@
       "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
       "dev": true,
       "license": "ISC"
     },
@@ -3763,9 +3839,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "version": "8.4.45",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
       "dev": true,
       "funding": [
         {
@@ -3905,9 +3981,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-      "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4208,23 +4284,9 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "license": "MIT"
     },
     "node_modules/safe-regex-test": {
@@ -4687,9 +4749,9 @@
       "peer": true
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.9.tgz",
-      "integrity": "sha512-1SEOvRr6sSdV5IDf9iC+NU4dhwdqzF4zKKq3sAbasUWHEM6lsMhX+eNN5gkPx1BvLFEnZQEUFbXnGj8Qlp83Pg==",
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz",
+      "integrity": "sha512-KWZkVPm7yJRhdu4SRSl9d4AK2wM3a50UsvgHZO7xY77NQr2V+fIrEuoDGQcbvswWvFGbS2f6e+jC/6WJm1Dl0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5134,9 +5196,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
-      "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
       "dev": true,
       "license": "ISC",
       "bin": {
diff --git a/src/package.json b/src/package.json
index 92582e97..942e0aae 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,9 +2,9 @@
   "release": {
     "version": "14"
   },
-  "name": "wg-easy",
-  "version": "1.0.1",
-  "description": "The easiest way to run WireGuard VPN + Web-based Admin UI.",
+  "name": "awg-easy",
+  "version": "14.0.0",
+  "description": "The easiest way to run AmeziaWG VPN + Web-based Admin UI.",
   "main": "server.js",
   "scripts": {
     "serve": "DEBUG=Server,WireGuard npx nodemon server.js",
@@ -15,16 +15,19 @@
   "author": "Emile Nijssen",
   "license": "CC BY-NC-SA 4.0",
   "dependencies": {
+    "basic-auth": "^2.0.1",
     "bcryptjs": "^2.4.3",
-    "debug": "^4.3.6",
+    "crc-32": "^1.2.2",
+    "debug": "^4.3.7",
     "express-session": "^1.18.0",
     "h3": "^1.12.0",
     "qrcode": "^1.5.4"
   },
   "devDependencies": {
+    "@tailwindcss/forms": "^0.5.9",
     "eslint-config-athom": "^3.1.3",
     "nodemon": "^3.1.4",
-    "tailwindcss": "^3.4.9"
+    "tailwindcss": "^3.4.10"
   },
   "nodemonConfig": {
     "ignore": [
diff --git a/src/wgpw.mjs b/src/wgpw.mjs
index 4062a73e..6ad6aede 100644
--- a/src/wgpw.mjs
+++ b/src/wgpw.mjs
@@ -2,6 +2,8 @@
 
 // Import needed libraries
 import bcrypt from 'bcryptjs';
+import { Writable } from 'stream';
+import readline from 'readline';
 
 // Function to generate hash
 const generateHash = async (password) => {
@@ -31,12 +33,35 @@ const comparePassword = async (password, hash) => {
   }
 };
 
+const readStdinPassword = () => {
+  return new Promise((resolve) => {
+    process.stdout.write('Enter your password: ');
+
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: new Writable({
+        write(_chunk, _encoding, callback) {
+          callback();
+        },
+      }),
+      terminal: true,
+    });
+
+    rl.question('', (answer) => {
+      rl.close();
+      // Print a new line after password prompt
+      process.stdout.write('\n');
+      resolve(answer);
+    });
+  });
+};
+
 (async () => {
   try {
     // Retrieve command line arguments
     const args = process.argv.slice(2); // Ignore the first two arguments
     if (args.length > 2) {
-      throw new Error('Usage : wgpw YOUR_PASSWORD [HASH]');
+      throw new Error('Usage : wgpw [YOUR_PASSWORD] [HASH]');
     }
 
     const [password, hash] = args;
@@ -44,6 +69,9 @@ const comparePassword = async (password, hash) => {
       await comparePassword(password, hash);
     } else if (password) {
       await generateHash(password);
+    } else {
+      const password = await readStdinPassword();
+      await generateHash(password);
     }
   } catch (error) {
     // eslint-disable-next-line no-console
diff --git a/src/www/css/app.css b/src/www/css/app.css
index 92bb7040..1b5515a9 100644
--- a/src/www/css/app.css
+++ b/src/www/css/app.css
@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.9 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.10 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -714,6 +714,10 @@ video {
   margin-bottom: 2.5rem;
 }
 
+.mb-2 {
+  margin-bottom: 0.5rem;
+}
+
 .mb-4 {
   margin-bottom: 1rem;
 }
@@ -1160,6 +1164,10 @@ video {
   fill: #4b5563;
 }
 
+.p-0 {
+  padding: 0px;
+}
+
 .p-1 {
   padding: 0.25rem;
 }
@@ -1465,6 +1473,10 @@ video {
   cursor: default;
 }
 
+.p-0 {
+  padding: 0;
+}
+
 .last\:border-b-0:last-child {
   border-bottom-width: 0px;
 }
diff --git a/src/www/img/apple-touch-icon.png b/src/www/img/apple-touch-icon.png
index 2ebeee55..7703fcd0 100644
Binary files a/src/www/img/apple-touch-icon.png and b/src/www/img/apple-touch-icon.png differ
diff --git a/src/www/img/favicon.ico b/src/www/img/favicon.ico
new file mode 100644
index 00000000..1b607c0e
Binary files /dev/null and b/src/www/img/favicon.ico differ
diff --git a/src/www/img/favicon.png b/src/www/img/favicon.png
deleted file mode 100644
index 470e2e9b..00000000
Binary files a/src/www/img/favicon.png and /dev/null differ
diff --git a/src/www/img/logo.png b/src/www/img/logo.png
index 582b1312..592daafd 100644
Binary files a/src/www/img/logo.png and b/src/www/img/logo.png differ
diff --git a/src/www/img/logo.svg b/src/www/img/logo.svg
new file mode 100644
index 00000000..e2bad2b6
--- /dev/null
+++ b/src/www/img/logo.svg
@@ -0,0 +1,33 @@
+<svg width="400" height="400" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2489_28625" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="17" y="8" width="367" height="353">
+<path d="M383.092 134.87C383.281 134.991 383.265 135.271 383.065 135.371C381.496 136.152 379.946 136.973 378.34 137.685C366.014 143.158 354.218 149.532 344.195 158.69C340.769 161.82 337.671 165.373 334.77 169.01C332.018 172.457 331.098 176.678 331.14 181.06C331.148 181.736 331.246 182.412 331.358 183.154C331.472 183.908 332.119 184.476 332.882 184.476H346.209C347.045 184.476 347.727 185.156 347.678 185.99C347.37 191.322 345.48 195.92 342.237 199.776C337.844 204.992 336.053 211.193 333.982 217.418C330.961 226.492 330.758 235.847 331.474 245.13C332.221 254.807 328.639 262.522 322.861 269.719C318.324 275.371 313.93 281.142 309.417 286.818C304.791 292.637 303.066 299.208 303.562 306.595C304.2 316.063 306.421 325.191 308.492 334.409C310.182 341.933 310.737 349.708 311.758 357.376C311.787 357.592 311.79 357.811 311.778 358.061C311.726 359.121 310.558 359.797 309.573 359.403C308.087 358.809 306.734 358.279 305.585 357.459C299.825 353.351 296.279 347.496 293.378 341.206C291.979 338.17 290.622 335.114 289.263 332.095C289.1 331.733 288.797 331.449 288.427 331.303C284.532 329.76 283.38 328.775 282.269 326.142C282.029 325.573 281.488 325.181 280.87 325.175C274.797 325.112 268.756 325.722 262.94 327.737C252.517 331.344 242.077 334.916 231.803 338.904C220.354 343.352 208.505 344.253 196.578 342.816C185.158 341.438 173.87 338.958 162.516 337.032C158.708 336.388 154.852 336.007 151.025 335.428C150.076 335.285 149.133 334.916 148.261 334.492C141.385 331.142 134.591 327.612 127.649 324.404C120.122 320.928 114.307 323.409 111.52 331.124C110.374 334.296 109.693 337.629 108.583 340.812C106.887 345.672 105.114 350.519 103.162 355.277C101.818 358.559 99.2952 360.285 95.5903 360.844C94.6768 360.982 93.9229 360.191 93.9984 359.27C94.2483 356.224 94.4161 353.28 94.9127 350.394C95.9753 344.235 97.7661 338.177 98.4168 331.982C99.0615 325.794 98.7451 319.497 98.6735 313.255C98.6615 312.349 97.8258 311.299 97.1154 310.572C92.0235 305.397 86.9316 300.221 81.7144 295.177C76.1927 289.835 70.8262 284.314 67.1371 277.565C63.7823 271.43 58.5411 270.553 52.7329 271.686C43.3848 273.511 34.1501 275.884 24.8677 278.042C22.5478 278.582 20.2436 279.185 17.9356 279.763C17.6492 279.834 17.3511 279.701 17.2136 279.439V279.439C17.0859 279.196 17.1268 278.899 17.3149 278.7C18.4226 277.525 19.4571 276.418 20.701 275.383C27.727 269.54 34.9142 263.882 41.8566 257.943C45.9994 254.396 49.8616 250.508 53.694 246.621C54.464 245.84 54.9475 244.343 54.8699 243.222C52.9478 215.45 59.4067 189.389 70.9515 164.378C75.8045 153.86 80.8437 143.427 85.9319 132.69C86.1939 132.137 86.7673 131.815 87.3763 131.758C91.5415 131.369 92.2182 127.046 93.9159 123.882C95.0275 121.81 95.8551 119.586 96.7642 117.26C97.1499 116.273 98.407 116.002 99.1754 116.732C99.7264 117.255 100.264 117.766 100.829 118.304C101.421 118.867 102.354 118.859 102.957 118.309C104.394 116.997 105.862 115.771 106.917 114.259C111.239 108.082 115.489 101.846 119.423 95.4244C121.238 92.4611 123.256 90.6009 126.73 89.6291C138.306 86.3909 149.772 82.7775 161.192 79.3229C161.552 79.2138 161.911 79.0039 162.073 78.6638C162.093 78.6218 162.106 78.5809 162.11 78.5393C162.958 71.7066 163.513 71.1342 170.426 70.0014C177.786 68.797 182.424 64.8619 183.666 57.421C184.902 49.998 185.266 42.426 185.988 34.9136C186.591 28.5876 187.039 22.2438 187.785 15.9357C188.229 12.1729 189.241 10.3068 191.645 8.76379C192.359 8.30562 193.293 8.62945 193.68 9.38411C194.967 11.8897 196.382 14.3509 197.234 16.9911C199.64 24.4498 201.55 32.0636 203.89 39.5462C205.902 45.9735 208.021 52.3829 210.457 58.6612C213.716 67.0739 220.384 70.6393 229.135 70.7884C232.52 70.848 235.904 70.9672 239.283 70.8182C243.42 70.6393 247.264 71.5456 250.577 73.9186C259.537 80.3459 268.581 86.6718 277.201 93.5343C283.662 98.6819 289.568 104.529 295.994 110.371C296.379 110.721 296.916 110.835 297.428 110.749C300.534 110.232 303.294 111.812 306.077 113.715C306.691 114.134 306.898 114.942 306.572 115.609C305.713 117.373 304.86 119.12 303.967 120.954C303.579 121.752 303.962 122.708 304.77 123.075C311.172 125.98 315.693 131.059 320.712 135.497C322.497 137.071 324.413 138.508 326.305 139.956C329.869 142.687 333.814 143.253 338.148 142.162C346.529 140.052 354.904 137.911 363.345 136.081C369.892 134.66 376.089 133.875 382.977 134.827C383.018 134.833 383.058 134.847 383.092 134.87V134.87ZM205.994 316.949C205.996 316.947 205.999 316.946 206.002 316.946C212.859 316.946 219.717 317.023 226.574 316.898C228.407 316.862 230.424 316.594 232.03 315.783C240.626 311.448 249.276 307.197 257.591 302.368C266.169 297.389 266.891 294.915 264.348 285.214C262.056 276.48 257.824 268.58 253.347 260.853C248.052 251.707 243.921 242.34 243.659 231.513C243.521 225.831 241.886 220.381 239.181 215.283C236.788 210.77 233.081 208.635 228.084 208.57C214.265 208.391 200.732 210.043 187.57 214.496C153.544 226.021 132.818 254.008 132.245 288.953C132.108 297.383 135.761 303.107 143.134 306.446C148.273 308.777 153.628 310.715 159.024 312.373C174.334 317.076 190.14 317.512 205.987 316.952C205.99 316.952 205.993 316.95 205.994 316.949V316.949ZM84.579 226.941C84.5794 226.94 84.5803 226.939 84.5812 226.939C85.9713 226.826 86.9499 226.82 87.8987 226.665C99.9808 224.692 111.239 220.274 122.115 214.872C125.56 213.161 128.783 210.943 131.911 208.683C133.105 207.819 134.114 206.31 134.568 204.891C143.683 176.565 152.709 148.208 161.74 119.858C161.834 119.562 161.907 119.261 161.974 118.95C162.148 118.14 161.621 117.324 160.798 117.237C157.521 116.891 154.672 117.972 151.944 119.583C141.385 125.826 131.559 133.076 122.623 141.465C109.526 153.753 98.4526 167.508 91.8863 184.482C86.6584 197.995 84.7478 212.044 84.5739 226.94C84.5738 226.942 84.5777 226.943 84.579 226.941V226.941ZM305.815 180.455C305.816 180.456 305.816 180.458 305.814 180.458C304.855 180.458 303.966 180.327 303.126 180.482C298.834 181.245 294.506 181.883 290.28 182.938C281.194 185.21 272.455 188.447 264.307 193.14C259.746 195.769 258.928 197.498 259.842 202.631C260.17 204.486 260.504 206.358 261.095 208.141C264.754 219.248 268.139 230.463 272.3 241.38C275.929 250.902 280.394 260.113 284.65 269.385C285.189 270.554 286.085 271.558 287.081 272.683C287.792 273.486 289.113 273.371 289.628 272.43C294.273 263.941 297.755 255.771 299.95 247.056C305.358 225.598 306.224 203.723 306.033 181.746C306.033 181.377 305.914 181.003 305.813 180.457C305.813 180.455 305.814 180.454 305.815 180.455V180.455ZM164.468 194.088C164.468 194.091 164.471 194.094 164.474 194.094C165.098 194.178 165.568 194.296 166.038 194.296C175.697 194.302 185.29 193.634 194.685 191.196C201.073 189.538 207.132 187.136 212.63 183.415C216.916 180.512 218.891 176.529 218.133 171.425C217.638 168.104 217.059 164.729 215.978 161.569C210.666 146.086 202.261 132.116 194.106 118.033C192.859 115.875 190.698 115.94 189.361 118.033C188.674 119.112 188.113 120.305 187.689 121.515C185.684 127.221 183.636 132.915 181.798 138.674C176.115 156.525 170.521 174.412 164.904 192.281C164.731 192.823 164.636 193.396 164.468 194.087C164.468 194.087 164.468 194.088 164.468 194.088V194.088ZM224.377 112.862C224.377 112.861 224.375 112.86 224.374 112.861L223.669 113.599C223.565 113.708 223.529 113.866 223.576 114.01C227.709 126.739 231.663 139.533 236.065 152.173C237.713 156.907 240.25 161.367 242.691 165.779C244.918 169.809 248.458 171.288 253.204 170.859C264.929 169.805 274.521 163.688 284.428 158.75C284.88 158.525 285.196 158.091 285.241 157.589C285.615 153.382 284.421 149.924 282 146.873C280.335 144.78 278.657 142.633 276.669 140.869C263.537 129.189 248.655 120.382 232.114 114.45C229.661 113.568 226.963 113.377 224.379 112.864C224.378 112.864 224.377 112.863 224.377 112.862V112.862ZM105.935 281.417C106.307 281.253 106.568 280.916 106.679 280.526C109.284 271.391 111.892 262.362 114.397 253.299C114.719 252.137 114.812 250.913 114.928 249.561C115.008 248.62 114.237 247.806 113.295 247.879C105.503 248.486 98.4147 249.975 92.4951 255.046C90.2387 256.977 88.3643 259.511 88.9195 262.546C90.2745 269.987 93.4562 276.486 100.094 280.767C101.889 281.924 103.781 282.365 105.935 281.417Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2489_28625)">
+<path d="M153.917 295.637C153.584 300.236 152.365 305.002 153.085 309.379C154.914 320.462 146.657 319.575 140.507 320.185C133.802 320.85 128.205 327.555 120.78 323.731C121.112 323.288 121.389 322.9 121.722 322.457C130.422 316.472 135.132 305.611 146.657 302.675C148.874 302.176 148.763 295.526 153.917 295.637Z" fill="#F3AC49"/>
+<path d="M13.5596 187.469C13.5596 125.344 13.5596 63.2195 13.5068 1.09485C13.5068 -0.698222 13.876 -1.06738 15.6691 -1.06738C140.077 -1.01465 264.537 -1.01465 388.944 -1.06738C390.737 -1.06738 391.107 -0.698222 391.107 1.09485C391.054 125.502 391.054 249.963 391.107 374.37C391.107 376.163 390.737 376.532 388.944 376.532C264.537 376.48 140.077 376.48 15.6691 376.532C13.876 376.532 13.5068 376.163 13.5068 374.37C13.5596 312.035 13.5596 249.752 13.5596 187.469ZM16.9875 204.608C16.9875 258.664 16.9348 312.72 16.9348 366.723C17.9895 368.78 14.1397 373.157 19.2025 373.157C129.74 373.263 240.278 373.263 350.815 373.21C351.765 373.21 353.61 371.892 353.505 371.575C351.554 362.979 356.933 363.559 362.576 363.823C368.693 364.139 374.864 363.77 381.034 363.928C383.249 363.981 383.776 363.348 383.776 361.133C383.671 336.136 383.723 311.191 383.723 286.193C383.671 192.532 383.671 98.87 383.618 5.20837C383.196 4.83921 382.827 4.20636 382.405 4.20636C371.066 4.20636 359.781 4.20636 348.442 4.36457C347.862 4.36457 346.754 6.15764 346.754 7.05418C346.649 38.8548 346.755 70.6027 347.176 102.351C347.282 109.945 343.116 112.951 337.156 114.744C335.152 115.271 333.359 115.535 331.355 116.062C323.708 116.062 315.798 113.689 312.581 125.08C310.524 132.2 303.879 138.001 299.291 144.382C297.129 145.965 295.177 147.969 292.804 149.076C281.887 154.35 271.551 146.123 259.896 147.758C247.028 149.551 238.574 153.084 238.152 166.637C238.152 167.27 244.701 180.276 232.577 172.82C232.05 172.504 231.312 172.808 230.627 172.808C221.82 166.954 211.272 172.966 202.254 168.536C201.885 167.851 201.516 167.165 201.094 166.479C201.147 162.946 201.463 159.413 201.147 155.932C200.672 151.027 201.357 148.232 207.475 149.287C211.114 149.92 217.02 151.133 218.339 147.125C223.138 132.622 230.363 119.385 236.586 105.62C240.172 97.657 231.892 90.0101 230.89 81.8885C229.888 74.0834 223.454 67.4385 225.933 59.106C229.414 47.6092 237.694 38.9603 244.391 29.3621C245.077 28.6765 245.762 27.9909 246.501 27.2526C252.249 18.7091 258.947 11.3259 269.283 8.26714C270.865 7.42334 274.346 8.95272 273.819 5.63027C273.397 2.78245 270.391 4.25909 268.703 4.25909C187.909 4.31183 107.116 4.47004 26.2693 3.99541C16.8293 3.94267 15.3526 7.21239 16.882 14.8593C16.882 75.982 16.882 137.157 16.882 198.28C16.9348 200.389 16.9875 202.499 16.9875 204.608ZM296.548 50.2461C296.443 50.2461 296.338 50.2461 296.179 50.2461C296.179 36.3762 296.179 22.5062 296.179 8.6363C296.179 7.10692 296.865 5.15563 293.964 5.20837C291.064 5.26111 291.908 7.31786 291.908 8.74177C291.697 35.7961 291.538 62.8503 291.327 89.9046C291.327 92.9107 292.593 94.8619 295.336 95.9167C295.546 96.0222 296.496 95.1256 296.496 94.7565C296.548 79.8845 296.548 65.0653 296.548 50.2461Z" fill="#F4ACBA"/>
+<path d="M383.522 5.31348C383.575 98.9751 383.575 192.637 383.627 286.298C383.627 311.296 383.627 336.241 383.68 361.238C383.68 363.4 383.153 364.086 380.938 364.033C374.767 363.875 368.65 364.191 362.48 363.928C356.784 363.664 351.405 363.084 353.409 371.68C353.514 372.049 351.668 373.315 350.719 373.315C240.182 373.368 129.644 373.368 19.1065 373.262C14.0437 373.262 17.8408 368.885 16.8387 366.828C17.4189 366.248 17.999 365.668 18.5263 365.088C24.2747 358.707 30.0231 352.326 35.7187 345.944C56.1281 345.628 76.5902 345.522 96.9996 344.573C99.3728 344.468 99.9001 352.115 102.801 345.681C103.803 343.466 105.649 341.673 107.072 339.669C106.756 341.145 105.701 343.044 106.229 344.046C107.811 346.946 109.024 343.677 109.815 343.096C114.93 338.983 119.308 343.624 123.579 344.679C126.374 345.364 128.22 350.216 130.33 353.275C132.175 355.964 133.758 358.865 135.445 361.66C135.551 359.34 135.762 357.019 135.814 354.751C135.867 352.642 135.603 350.532 135.867 348.423C136.711 341.778 135.287 335.555 143.778 330.545C150.581 326.537 160.759 321.263 158.913 309.081C158.122 303.913 158.913 298.533 159.019 293.207C164.293 289.41 169.619 285.56 174.893 281.763C182.329 275.382 190.925 271.268 200.207 268.42C200.47 268.42 200.734 268.42 200.998 268.42C201.42 268.262 201.894 268.051 202.316 267.893C212.758 268.948 211.545 260.351 213.391 254.392C226.839 249.277 242.133 259.139 255.054 249.118C258.64 246.323 263.439 244.847 266.339 241.63C271.191 236.25 276.254 232.19 283.69 230.924C287.803 230.238 294.448 232.928 295.609 227.654C296.822 222.17 294.659 215.999 293.974 210.093C296.505 206.929 298.984 203.817 301.515 200.653C303.625 194.113 307.896 199.123 311.061 199.018C321.661 198.543 323.348 188.84 328.306 182.722C337.429 171.436 342.914 157.988 347.397 144.487C351.668 131.778 347.66 118.33 347.66 105.145C347.713 72.8173 347.66 40.5421 347.713 8.21403C347.713 7.37023 348.135 6.4737 348.346 5.6299C348.979 5.94632 349.612 6.21001 350.192 6.52644C349.77 6.68465 349.295 6.84286 348.873 7.00107C349.032 7.15928 349.137 7.3175 349.295 7.52845C349.559 7.21202 349.875 6.8956 350.139 6.52644C361.372 5.99906 372.447 5.6299 383.522 5.31348Z" fill="#F18928" stroke="#F18928" stroke-width="0.755388"/>
+<path d="M16.7871 198.279C16.7871 137.157 16.7871 75.9814 16.7871 14.8588C17.0508 14.8588 17.3672 14.8061 17.6309 14.8061C49.6952 14.8061 81.7596 15.1225 113.824 14.5951C122.578 14.4369 128.643 16.8628 134.497 23.244C140.087 29.2561 147.154 33.897 153.588 39.118C159.284 44.1281 156.647 51.5113 156.488 56.8378C156.067 72.1843 156.067 87.7946 151.109 102.772C149.896 106.516 150.055 110.788 148.789 114.532C146.152 122.443 150.898 131.25 144.834 138.95C139.982 145.12 136.554 152.451 132.493 159.254C128.907 165.002 123.686 169.854 123 177.132C122.631 177.237 122.262 177.29 121.893 177.395C114.088 175.866 104.753 184.357 98.3719 173.651C98.3719 173.651 97.95 173.809 97.8972 173.915C95.9987 179.874 89.7757 180.085 85.7149 181.14C67.7842 185.833 49.2206 185.622 30.9207 184.304C19.1076 183.46 15.3632 187.152 17.5254 198.227C17.3145 198.279 17.0508 198.279 16.7871 198.279Z" fill="#66BCB2" stroke="#66BCB2" stroke-width="0.755388"/>
+<path d="M132.545 159.202C136.606 152.399 140.034 145.068 144.886 138.898C150.951 131.198 146.204 122.391 148.841 114.48C150.107 110.736 149.896 106.517 151.162 102.72C156.066 87.7953 156.066 72.1323 156.541 56.7857C156.699 51.4065 159.283 44.076 153.64 39.0659C161.34 42.5993 171.677 38.2221 177.319 48.8223C182.066 57.7349 189.027 46.5546 195.092 48.6641C196.199 45.078 199.258 42.5993 199.364 38.1166C199.469 34.5832 200.471 26.8308 204.743 27.9383C217.98 31.419 231.217 27.1473 244.243 29.5204C237.546 39.1186 229.213 47.7676 225.785 59.2643C223.306 67.5441 229.74 74.2417 230.742 82.0469C231.744 90.1684 240.024 97.8154 236.438 105.779C230.215 119.543 222.99 132.833 218.191 147.283C216.873 151.291 210.966 150.078 207.327 149.445C201.157 148.391 200.524 151.133 200.999 156.09C201.315 159.571 200.999 163.104 200.946 166.638C193.51 166.268 186.074 166.11 178.691 165.425C176.476 165.214 174.366 163.737 172.204 162.841C173.259 160.731 172.257 157.409 175.843 156.723C176.212 156.67 176.845 155.352 176.687 155.088C174.63 152.24 172.468 149.498 170.253 146.808C170.2 146.756 168.934 147.441 168.46 147.969C158.861 159.043 147.892 166.163 132.545 159.202Z" fill="#7EBAD2" stroke="#7EBAD2" stroke-width="0.755388"/>
+<path d="M244.296 29.5207C231.27 27.2003 218.032 31.4193 204.795 27.9386C200.471 26.8311 199.522 34.5835 199.416 38.1169C199.258 42.5996 196.252 45.0783 195.144 48.6644C189.08 46.5549 182.118 57.7352 177.372 48.8226C171.729 38.2224 161.392 42.5996 153.693 39.0662C147.259 33.8452 140.139 29.2043 134.602 23.1923C128.748 16.811 122.63 14.3851 113.929 14.5433C81.759 15.1234 49.6947 14.807 17.6303 14.807C19.3179 11.8537 13.9387 5.47248 20.7418 5.41975C100.323 5.15606 179.956 5.2088 259.537 5.41975C262.754 5.41975 265.918 7.37103 269.135 8.42578C258.798 11.4318 252.101 18.8678 246.352 27.4112C245.667 28.0968 244.981 28.7824 244.296 29.5207Z" fill="#6E9ACA" stroke="#87ADD4" stroke-width="0.755388"/>
+<path d="M234.697 227.707C235.224 222.275 237.861 219.586 243.609 219.164C249.621 218.742 245.824 213.046 247.406 209.988C251.045 202.868 253.524 195.01 253.155 186.678C255.475 185.834 257.954 185.306 260.011 184.041C267.183 179.611 272.299 172.913 281.528 170.382C286.59 168.958 291.759 169.327 296.505 167.692C305.207 164.686 304.785 155.246 308.635 148.759C313.381 144.962 315.543 139.741 318.286 134.468C320.817 129.669 316.967 120.492 326.618 120.018C329.466 119.859 330.521 118.435 330.995 116.01C332.999 115.482 335.047 114.995 337.051 114.468C341.797 137.778 331.945 156.776 314.858 169.802C303.044 178.767 303.414 189.262 301.515 200.548C298.984 203.712 296.505 206.823 293.974 209.988C291.284 215.103 286.485 212.519 282.582 212.994C279.102 213.415 275.621 212.413 272.404 215.103C261.593 224.227 249.041 228.815 234.697 227.707Z" fill="#F3AC49" stroke="#F3AC49" stroke-width="0.755388"/>
+<path d="M308.796 148.672C304.946 155.159 305.293 164.631 296.591 167.69C291.845 169.325 286.655 168.942 281.592 170.366C272.363 172.898 267.234 179.613 260.061 184.043C258.004 185.309 255.432 185.846 253.164 186.69C245.623 182.102 238.085 177.374 230.491 172.786C231.176 172.786 232.073 172.469 232.547 172.786C244.255 180.011 237.979 167.248 237.979 166.616C238.401 153.062 246.945 149.529 259.76 147.736C271.415 146.101 281.699 154.328 292.668 149.054C295.041 147.894 296.993 145.942 299.155 144.36C302.372 145.784 305.631 147.248 308.796 148.672Z" fill="#FBCF67" stroke="#FBCF67" stroke-width="0.755388" stroke-linejoin="bevel"/>
+<path d="M213.373 254.262C211.471 260.285 212.739 268.843 202.279 267.787C202.053 267.166 201.101 267.83 200.958 268.368C200.694 268.368 200.296 268.18 200.032 268.18C198.447 238.014 199.743 207.826 194.777 177.871C195.199 173.17 198.158 170.422 202.173 168.468C211.207 172.958 221.773 166.936 230.595 172.747C238.15 177.343 245.553 182.078 253.16 186.674C253.53 195.021 251.198 202.701 247.553 209.886C245.968 212.95 249.772 218.655 243.75 219.078C237.991 219.448 235.35 222.195 234.821 227.636C227.584 236.512 220.452 245.387 213.373 254.262Z" fill="#8D888C" stroke="#8D888C" stroke-width="0.755388"/>
+<path d="M16.7871 198.28C17.0508 198.28 17.3145 198.228 17.5782 198.228C49.9589 199.388 82.3397 200.917 114.668 197.226C105.28 209.197 95.9987 219.164 77.8043 217.582C58.1332 215.895 38.093 218.215 18.2638 218.848C17.7891 214.102 17.3672 209.355 16.8926 204.609C16.8398 202.499 16.7871 200.39 16.7871 198.28Z" fill="#5E5F97" stroke="#5E5F97" stroke-width="0.755388"/>
+<path d="M301.515 200.547C303.414 189.262 303.045 178.767 314.858 169.801C331.945 156.775 341.806 137.79 337.007 114.48C342.967 112.687 346.869 110.103 346.764 102.509C346.342 70.7606 346.606 38.96 346.658 7.21208C346.658 6.2628 347.713 4.52247 348.346 4.52247C359.684 4.31152 370.97 4.31152 382.309 4.36426C382.731 4.36426 383.1 4.99711 383.522 5.36627C372.447 5.68269 361.372 6.05186 350.297 6.36828C349.664 6.05186 349.032 5.78817 348.451 5.47175C348.24 6.31554 347.819 7.21208 347.819 8.05588C347.766 40.3839 347.819 72.6592 347.766 104.987C347.713 118.119 351.774 131.62 347.502 144.329C342.967 157.83 337.535 171.278 328.411 182.564C323.454 188.681 321.766 198.438 311.166 198.86C307.896 199.018 303.625 194.008 301.515 200.547Z" fill="#F6A453"/>
+<path d="M202.329 168.41C198.373 170.361 195.249 173.335 194.774 178.029C192.665 179.453 190.502 180.93 188.393 182.354C177.845 182.037 167.351 181.668 156.803 181.352C154.694 181.035 152.584 180.666 150.475 180.35C141.773 175.339 132.228 177.818 123.051 177.08C123.737 169.802 128.958 164.95 132.544 159.202C147.891 166.11 158.807 158.991 168.511 147.916C168.986 147.389 170.251 146.703 170.304 146.756C172.519 149.445 174.681 152.188 176.738 155.036C176.896 155.299 176.316 156.565 175.894 156.67C172.308 157.356 173.363 160.678 172.255 162.788C174.417 163.684 176.527 165.161 178.742 165.372C186.125 166.005 193.771 166.104 201.207 166.473C201.576 167.159 201.96 167.724 202.329 168.41Z" fill="#87ADD4"/>
+<path d="M296.646 50.1839C296.646 65.0648 296.567 80.3541 296.514 95.2349C296.514 95.6586 295.561 96.5059 295.349 96.4C292.649 95.3409 291.325 93.4344 291.325 90.3629C291.537 63.1962 291.626 36.0037 291.838 8.8369C291.838 7.40708 291.039 5.23168 293.952 5.17873C296.811 5.12577 296.264 7.09306 296.317 8.6288C296.317 22.5564 296.275 36.2034 296.275 50.131C296.381 50.1839 296.487 50.1839 296.646 50.1839Z" fill="#DDC4E0"/>
+<path d="M308.636 148.812C305.471 147.388 302.202 145.701 299.038 144.277C303.626 137.896 310.165 132.147 312.222 125.028C315.492 113.689 323.849 115.946 331.443 115.893C330.969 118.319 329.573 119.912 326.725 120.018C317.074 120.492 321.082 129.721 318.55 134.52C315.861 139.847 313.382 145.015 308.636 148.812Z" fill="#F8C9D1" stroke="#F8C9D1" stroke-width="0.755388"/>
+<path d="M269.135 8.42493C265.918 7.37018 262.753 5.4189 259.536 5.4189C179.956 5.26069 100.322 5.15521 20.7414 5.4189C13.9383 5.4189 19.2648 11.8001 17.6299 14.8062C17.3662 14.8062 17.0498 14.8589 16.7861 14.8589C15.204 7.21197 16.6807 3.94225 26.1206 3.99499C106.914 4.46963 187.761 4.25868 268.554 4.36415C270.295 4.36415 273.248 2.88751 273.67 5.73533C274.25 9.11052 270.769 7.58113 269.135 8.42493Z" fill="#7EBAD2" stroke="#7EBAD2" stroke-width="0.755388"/>
+<path d="M16.8398 204.608C17.3145 209.355 17.7364 214.101 18.211 218.847C18.0001 222.064 17.5782 225.281 17.5782 228.498C17.5254 273.009 17.5254 317.519 17.5782 362.03C17.5782 363.032 18.1583 364.034 18.4747 365.036C17.8946 365.616 17.3145 366.196 16.7871 366.776C16.7871 312.72 16.8398 258.664 16.8398 204.608Z" fill="#9B8BC1"/>
+<path d="M244.296 29.5206C244.982 28.835 245.668 28.1495 246.406 27.4111C245.668 28.0967 244.982 28.7823 244.296 29.5206Z" fill="#7EBAD2"/>
+<path d="M18.4737 365.035C18.1573 364.033 17.5772 363.031 17.5772 362.029C17.5244 317.519 17.5244 273.009 17.5772 228.498C17.5772 225.281 17.9991 222.064 18.21 218.847C38.092 218.267 58.0795 215.894 77.7505 217.582C95.9449 219.164 105.227 209.196 114.614 197.225C114.878 197.172 115.194 197.119 115.458 197.014C119.149 195.643 120.89 197.752 124.107 199.651C136.605 206.929 150.212 203.184 162.183 197.383C170.199 193.533 175.684 195.801 178.479 201.76C185.757 217.529 182.592 234.879 184.491 251.492C186.653 270.161 175.367 265.678 165.717 265.731C159.283 265.784 152.901 265.836 146.467 265.678C145.096 265.625 143.514 265.045 142.459 264.149C135.34 258.453 126.955 265.362 119.677 261.776C111.872 257.926 106.651 267.629 99.4783 265.52C97.2634 264.887 95.6285 260.615 93.73 260.668C82.3387 260.879 70.8419 260.932 61.191 268.842C57.0247 272.27 50.0107 273.009 49.6942 279.864C49.1669 290.465 49.2723 301.118 49.3251 311.718C49.3778 321.474 49.4833 321.474 55.0734 323.478C55.3899 323.584 55.4688 324.384 55.627 324.859C48.9821 331.873 42.3637 338.878 35.7188 345.839C29.9704 352.273 24.2221 358.654 18.4737 365.035Z" fill="#513F92" stroke="#513F92" stroke-width="0.755388"/>
+<path d="M55.6001 324.902C55.4419 324.428 55.3892 323.637 55.0727 323.531C49.4826 321.527 49.3771 321.58 49.3244 311.771C49.2716 301.171 49.2189 290.518 49.6935 279.917C50.01 273.062 57.024 272.323 61.1903 268.895C70.8412 260.985 82.338 260.879 93.7293 260.721C95.5751 260.668 97.2627 264.94 99.4776 265.573C106.65 267.682 111.871 257.979 119.676 261.829C126.901 265.415 135.339 258.506 142.459 264.202C143.513 265.046 145.095 265.678 146.467 265.731C152.901 265.889 159.282 265.837 165.716 265.784C175.367 265.731 186.6 270.214 184.49 251.545C182.592 234.932 185.756 217.582 178.478 201.813C175.736 195.854 170.198 193.586 162.182 197.436C150.211 203.237 136.605 206.982 124.106 199.704C120.889 197.805 119.149 195.696 115.457 197.067C117.619 190.528 119.775 183.888 121.937 177.349C122.306 177.243 122.687 177.185 123.056 177.079C132.232 177.817 141.769 175.326 150.471 180.336C152.581 180.652 154.705 181.027 156.814 181.343C158.238 183.769 185.77 184.583 188.364 182.365C190.473 180.941 192.671 179.416 194.781 177.992C199.738 207.894 198.518 238.308 200.101 268.421C190.819 271.216 182.17 275.329 174.787 281.763C165.927 281.394 156.856 281.921 148.207 280.392C135.866 278.23 126.374 283.556 116.828 289.621C112.873 292.1 108.548 292.733 104.382 291.52C90.0904 287.459 77.0642 296.161 77.8026 310.611C78.3299 320.314 77.0642 326.063 65.462 322.793C63.0888 322.107 60.1883 323.215 57.5514 323.479C56.9186 323.9 56.233 324.375 55.6001 324.902Z" fill="#5E5F97" stroke="#5E5F97" stroke-width="0.755388"/>
+<path d="M57.6045 323.426C60.2414 323.162 63.1419 322.054 65.5151 322.74C77.1701 326.01 78.383 320.314 77.8557 310.558C77.1173 296.108 90.0907 287.406 104.435 291.467C108.602 292.68 112.926 292.047 116.881 289.568C126.427 283.556 135.92 278.177 148.26 280.339C156.909 281.869 165.98 281.341 174.84 281.71C169.566 285.507 164.24 289.357 158.966 293.154C157.12 294.262 155.327 295.369 153.481 296.424C148.629 296.319 148.682 302.647 146.52 303.174C135.55 305.97 131.068 316.306 122.788 322.002C121.944 320.472 121.364 320.05 119.36 321.158C116.248 322.846 112.662 324.375 109.182 324.533C93.255 325.219 77.381 325.43 61.4543 325.588C60.1359 325.641 58.8702 324.164 57.6045 323.426Z" fill="#8D888C" stroke="#8D888C" stroke-width="0.755388"/>
+<path d="M234.698 227.707C249.043 228.867 261.594 224.226 272.458 215.103C275.675 212.413 279.156 213.415 282.636 212.993C286.539 212.519 291.338 215.103 294.028 209.987C294.713 215.894 296.823 222.064 295.662 227.549C294.502 232.875 287.857 230.133 283.744 230.819C276.308 232.084 271.245 236.092 266.393 241.524C263.44 244.794 258.641 246.271 255.107 249.013C242.187 259.086 226.893 249.171 213.445 254.287C220.459 245.427 227.578 236.567 234.698 227.707Z" fill="#F6A453"/>
+<path d="M57.6046 323.426C58.9001 324.192 60.1827 325.633 61.4484 325.58C77.3751 325.369 93.3018 325.163 109.176 324.53C112.656 324.372 116.233 322.859 119.344 321.118C121.348 320.011 122.007 320.442 122.851 321.971C122.535 322.393 122.208 322.846 121.891 323.268C116.934 328.7 112.03 334.184 107.072 339.616C105.596 341.62 103.803 343.413 102.801 345.628C99.9 352.062 99.4254 344.415 96.9994 344.521C76.5901 345.523 56.0886 345.558 35.6792 345.874C42.3241 338.86 48.9365 331.858 55.5814 324.896C56.2142 324.369 56.919 323.901 57.6046 323.426Z" fill="#B59259" stroke="#B59259" stroke-width="0.755388"/>
+<path d="M107.072 339.563C112.03 334.131 116.934 328.647 121.892 323.215C128.958 326.853 134.285 320.472 140.666 319.839C146.52 319.259 154.378 320.103 152.637 309.556C151.952 305.337 153.112 300.854 153.429 296.477C155.274 295.369 157.067 294.262 158.913 293.207C158.86 298.481 158.017 303.913 158.808 309.081C160.654 321.263 150.475 326.537 143.672 330.545C135.181 335.555 136.605 341.778 135.762 348.423C135.498 350.48 135.762 352.642 135.709 354.752C135.656 357.072 135.445 359.392 135.34 361.66C133.652 358.865 132.07 355.965 130.224 353.275C128.115 350.163 126.269 345.364 123.474 344.679C119.202 343.624 114.825 339.036 109.709 343.097C108.971 343.677 107.758 346.946 106.123 344.046C105.701 342.991 106.756 341.093 107.072 339.563Z" fill="#F8B570"/>
+<path d="M121.944 177.343C119.782 183.882 117.673 190.475 115.51 197.014C115.247 197.067 114.93 197.119 114.666 197.225C82.3385 200.969 49.9577 199.387 17.5769 198.227C15.4147 187.205 19.2118 183.513 30.9722 184.304C49.2721 185.57 67.8357 185.781 85.7664 181.14C89.8272 180.085 96.0502 179.822 97.9487 173.915C98.0015 173.757 98.4234 173.651 98.4234 173.651C104.805 184.304 114.192 175.866 121.944 177.343Z" fill="#8D888C" stroke="#8D888C" stroke-width="0.755388"/>
+<path d="M188.393 182.353C186.125 184.673 158.28 183.777 156.803 181.351C167.351 181.667 177.898 182.036 188.393 182.353Z" fill="#7D89C1" stroke="#7D89C1" stroke-width="0.755388"/>
+<path d="M156.802 181.352C154.692 181.035 152.583 180.666 150.473 180.35C152.583 180.666 154.692 181.035 156.802 181.352Z" fill="#7D89C1"/>
+</g>
+</svg>
diff --git a/src/www/index.html b/src/www/index.html
index 236a8f3d..490ac9be 100644
--- a/src/www/index.html
+++ b/src/www/index.html
@@ -2,11 +2,11 @@
 <html>
 
 <head>
-  <title>WireGuard</title>
+  <title>AmneziaWG</title>
   <meta charset="utf-8"/>
   <link href="./css/app.css" rel="stylesheet">
   <link rel="manifest" href="./manifest.json">
-  <link rel="icon" type="image/png" href="./img/favicon.png">
+  <link rel="icon" href="./img/favicon.ico" sizes="any">
   <link rel="apple-touch-icon" href="./img/apple-touch-icon.png">
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
   <meta name="apple-mobile-web-app-capable" content="yes">
@@ -27,7 +27,7 @@
       <div v-if="authenticated === true">
         <div class="flex flex-col-reverse xxs:flex-row flex-auto items-center items-end gap-3">
           <h1 class="text-4xl dark:text-neutral-200 font-medium flex-grow self-start mb-4">
-            <img src="./img/logo.png" width="32" class="inline align-middle dark:bg mr-2" /><span class="align-middle">WireGuard</span>
+            <img src="./img/logo.svg" width="60" class="inline align-middle dark:bg mr-2" /><span class="align-middle">AmneziaWG</span>
           </h1>
           <div class="flex items-center grow-0 gap-3 items-end self-end xxs:self-center">
             <!-- Dark / light theme -->
@@ -82,7 +82,7 @@
               <p>{{latestRelease.changelog}}</p>
             </div>
 
-            <a href="https://github.com/wg-easy/wg-easy#updating" target="_blank"
+            <a href="https://github.com/evoll/awg-easy-14#updating" target="_blank"
               class="p-3 rounded-md bg-white dark:bg-red-100 float-right font-sm font-semibold text-red-800 dark:text-red-600 flex-shrink-0 border-2 border-red-800 dark:border-red-600 hover:border-white dark:hover:border-red-600 hover:text-white dark:hover:text-red-100 hover:bg-red-800 dark:hover:bg-red-600 transition-all">
               {{$t("update")}} →
             </a>
@@ -112,8 +112,22 @@
                 </svg>
                 <span class="max-md:hidden text-sm">{{$t("backup")}}</span>
               </a>
+              <!-- Sort client -->
+              <button v-if="enableSortClient" @click="sortClient = !sortClient;"
+                      class="hover:bg-red-800 hover:border-red-800 hover:text-white text-gray-700 dark:text-neutral-200 max-md:border-x-0 border-2 border-gray-100 dark:border-neutral-600 py-2 px-4 md:rounded inline-flex items-center transition">
+                  <svg v-if="sortClient === true" inline class="w-4 md:mr-2" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+                    <path d="M12 19.75C11.9015 19.7504 11.8038 19.7312 11.7128 19.6934C11.6218 19.6557 11.5392 19.6001 11.47 19.53L5.47 13.53C5.33752 13.3878 5.2654 13.1997 5.26882 13.0054C5.27225 12.8111 5.35096 12.6258 5.48838 12.4883C5.62579 12.3509 5.81118 12.2722 6.00548 12.2688C6.19978 12.2654 6.38782 12.3375 6.53 12.47L12 17.94L17.47 12.47C17.6122 12.3375 17.8002 12.2654 17.9945 12.2688C18.1888 12.2722 18.3742 12.3509 18.5116 12.4883C18.649 12.6258 18.7277 12.8111 18.7312 13.0054C18.7346 13.1997 18.6625 13.3878 18.53 13.53L12.53 19.53C12.4608 19.6001 12.3782 19.6557 12.2872 19.6934C12.1962 19.7312 12.0985 19.7504 12 19.75Z" fill="#000000"/>
+                    <path d="M12 19.75C11.8019 19.7474 11.6126 19.6676 11.4725 19.5275C11.3324 19.3874 11.2526 19.1981 11.25 19V5C11.25 4.80109 11.329 4.61032 11.4697 4.46967C11.6103 4.32902 11.8011 4.25 12 4.25C12.1989 4.25 12.3897 4.32902 12.5303 4.46967C12.671 4.61032 12.75 4.80109 12.75 5V19C12.7474 19.1981 12.6676 19.3874 12.5275 19.5275C12.3874 19.6676 12.1981 19.7474 12 19.75Z" fill="#000000"/>
+                  </svg>
+                  <svg v-if="sortClient === false" inline class="w-4 md:mr-2" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+                    <path d="M18 11.75C17.9015 11.7505 17.8038 11.7313 17.7128 11.6935C17.6218 11.6557 17.5392 11.6001 17.47 11.53L12 6.06001L6.53 11.53C6.38782 11.6625 6.19978 11.7346 6.00548 11.7312C5.81118 11.7278 5.62579 11.649 5.48838 11.5116C5.35096 11.3742 5.27225 11.1888 5.26882 10.9945C5.2654 10.8002 5.33752 10.6122 5.47 10.47L11.47 4.47001C11.6106 4.32956 11.8012 4.25067 12 4.25067C12.1987 4.25067 12.3894 4.32956 12.53 4.47001L18.53 10.47C18.6705 10.6106 18.7493 10.8013 18.7493 11C18.7493 11.1988 18.6705 11.3894 18.53 11.53C18.4608 11.6001 18.3782 11.6557 18.2872 11.6935C18.1962 11.7313 18.0985 11.7505 18 11.75Z" fill="#000000"/>
+                    <path d="M12 19.75C11.8019 19.7474 11.6126 19.6676 11.4725 19.5275C11.3324 19.3874 11.2526 19.1981 11.25 19V5C11.25 4.80109 11.329 4.61032 11.4697 4.46967C11.6103 4.32902 11.8011 4.25 12 4.25C12.1989 4.25 12.3897 4.32902 12.5303 4.46967C12.671 4.61032 12.75 4.80109 12.75 5V19C12.7474 19.1981 12.6676 19.3874 12.5275 19.5275C12.3874 19.6676 12.1981 19.7474 12 19.75Z" fill="#000000"/>
+                  </svg>
+                  <span class="max-md:hidden text-sm">{{$t("sort")}}</span>
+              </button>
+
               <!-- New client -->
-              <button @click="clientCreate = true; clientCreateName = '';"
+              <button @click="clientCreate = true; clientCreateName = ''; clientExpiredDate = '';"
                 class="hover:bg-red-800 hover:border-red-800 hover:text-white text-gray-700 dark:text-neutral-200 max-md:border-l-0 border-2 border-gray-100 dark:border-neutral-600 py-2 px-4 rounded-r-full md:rounded inline-flex items-center transition">
                 <svg class="w-4 md:mr-2" inline xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                   stroke="currentColor">
@@ -242,6 +256,35 @@
                           {{!uiTrafficStats ? " · " : ""}}{{new Date(client.latestHandshakeAt) | timeago}}
                         </span>
                       </div>
+                      <div v-if="enableOneTimeLinks && client.oneTimeLink !== null && client.oneTimeLink !== ''" :ref="'client-' + client.id + '-link'" class="text-gray-400 text-xs">
+                        <a :href="'./cnf/' + client.oneTimeLink + ''">{{document.location.protocol}}//{{document.location.host}}/cnf/{{client.oneTimeLink}}</a>
+                      </div>
+                      <!-- Expire Date -->
+                      <div v-show="enableExpireTime" class=" block md:inline-block pb-1 md:pb-0 text-gray-500 dark:text-neutral-400 text-xs">
+                        <span class="group">
+                          <!-- Show -->
+                          <input v-show="clientEditExpireDateId === client.id" v-model="clientEditExpireDate"
+                            v-on:keyup.enter="updateClientExpireDate(client, clientEditExpireDate); clientEditExpireDate = null; clientEditExpireDateId = null;"
+                            v-on:keyup.escape="clientEditExpireDate = null; clientEditExpireDateId = null;"
+                            :ref="'client-' + client.id + '-expire'"
+                            type="text"
+                            class="rounded border-2 dark:bg-neutral-700 border-gray-100 dark:border-neutral-600 focus:border-gray-200 dark:focus:border-neutral-500 outline-none w-70 text-black dark:text-neutral-300 dark:placeholder:text-neutral-500 text-xs p-0" />
+                          <span v-show="clientEditExpireDateId !== client.id"
+                            class="inline-block ">{{client.expiredAt  | expiredDateFormat}}</span>
+
+                          <!-- Edit -->
+                          <span v-show="clientEditExpireDateId !== client.id"
+                            @click="clientEditExpireDate = client.expiredAt ? client.expiredAt.toISOString().slice(0, 10) : 'yyyy-mm-dd'; clientEditExpireDateId = client.id; setTimeout(() => $refs['client-' + client.id + '-expire'][0].select(), 1);"
+                            class="cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity">
+                            <svg xmlns="http://www.w3.org/2000/svg"
+                              class="h-4 w-4 inline align-middle opacity-25 hover:opacity-100" fill="none"
+                              viewBox="0 0 24 24" stroke="currentColor">
+                              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                            </svg>
+                          </span>
+                        </span>
+                      </div>
                     </div>
 
                     <!-- Info -->
@@ -341,6 +384,22 @@
                       </svg>
                     </a>
 
+                    <!-- Short OneTime Link -->
+                    <button v-if="enableOneTimeLinks" :disabled="!client.downloadableConfig"
+                      class="align-middle inline-block bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded transition"
+                      :class="{
+                        'hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white': client.downloadableConfig,
+                        'is-disabled': !client.downloadableConfig
+                      }"
+                      :title="!client.downloadableConfig ? $t('noPrivKey') : $t('OneTimeLink')"
+                      @click="if(client.downloadableConfig) { showOneTimeLink(client); }">
+                      <svg class="w-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                        stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                          d="M13.213 9.787a3.391 3.391 0 0 0-4.795 0l-3.425 3.426a3.39 3.39 0 0 0 4.795 4.794l.321-.304m-.321-4.49a3.39 3.39 0 0 0 4.795 0l3.424-3.426a3.39 3.39 0 0 0-4.794-4.795l-1.028.961"/>
+                      </svg>
+                    </button>
+
                     <!-- Delete -->
 
                     <button
@@ -361,7 +420,7 @@
             <div v-if="clients && clients.length === 0">
               <p class="text-center m-10 text-gray-400 dark:text-neutral-400 text-sm">
                 {{$t("noClients")}}<br /><br />
-                <button @click="clientCreate = true; clientCreateName = '';"
+                <button @click="clientCreate = true; clientCreateName = ''; clientExpiredDate = '';"
                   class="bg-red-800 hover:bg-red-700 text-white border-2 border-none py-2 px-4 rounded inline-flex items-center transition">
                   <svg class="w-4 mr-2" inline xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                     stroke="currentColor">
@@ -453,6 +512,16 @@
                           type="text" v-model.trim="clientCreateName" :placeholder="$t('name')" />
                       </p>
                     </div>
+                    <div class="mt-2" v-show="enableExpireTime">
+                      <p class="text-sm text-gray-500">
+                        <label class="block text-gray-900 dark:text-neutral-200 text-sm font-bold mb-2" for="expireDate">
+                            {{$t("ExpireDate")}}
+                        </label>
+                        <input
+                          class="rounded p-2 border-2 dark:bg-neutral-700 dark:text-neutral-200 border-gray-100 dark:border-neutral-600 focus:border-gray-200 focus:dark:border-neutral-500 dark:placeholder:text-neutral-400 outline-none w-full"
+                          type="date" v-model.trim="clientExpiredDate" :placeholder="$t('expireDate')" name="expireDate"/>
+                      </p>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -546,8 +615,8 @@
 
       <div v-if="authenticated === false">
         <h1 class="text-4xl font-medium my-16 text-gray-700 dark:text-neutral-200 text-center">
-          <img src="./img/logo.png" width="32" class="inline align-middle dark:bg" />
-          <span class="align-middle">WireGuard</span>
+          <img src="./img/logo.svg" width="60" class="inline align-middle dark:bg" />
+          <span class="align-middle">AmneziaWG</span>
         </h1>
 
         <form @submit="login"
@@ -563,6 +632,24 @@
           <input type="password" name="password" :placeholder="$t('password')" v-model="password" autocomplete="current-password"
             class="px-3 py-2 text-sm dark:bg-neutral-700 text-gray-500 dark:text-gray-500 mb-5 border-2 border-gray-100 dark:border-neutral-800 rounded-lg w-full focus:border-red-800 dark:focus:border-red-800 dark:placeholder:text-neutral-400 outline-none" />
 
+          <!-- Remember me -->
+          <label v-if="rememberMeEnabled"
+            class="inline-block mb-5 cursor-pointer whitespace-nowrap" :title="$t('titleRememberMe')">
+            <input type="checkbox" class="sr-only" v-model="remember">
+
+            <div v-if="remember"
+              class="inline-block align-middle rounded-full w-10 h-6 mr-1 bg-red-800 cursor-pointer hover:bg-red-700 transition-all">
+              <div class="rounded-full w-4 h-4 m-1 ml-5 bg-white"></div>
+            </div>
+
+            <div v-if="!remember"
+              class="inline-block align-middle rounded-full w-10 h-6 mr-1 bg-gray-200 dark:bg-neutral-400 cursor-pointer hover:bg-gray-300 dark:hover:bg-neutral-500 transition-all">
+              <div class="rounded-full w-4 h-4 m-1 bg-white"></div>
+            </div>
+
+            <span class="text-sm">{{$t("rememberMe")}}</span>
+          </label>
+
           <button v-if="authenticating"
             class="bg-red-800 dark:bg-red-800 w-full rounded shadow py-2 text-sm text-white dark:text-white cursor-not-allowed">
             <svg class="w-5 animate-spin mx-auto" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
@@ -596,12 +683,6 @@
 
     </div>
 
-    <p v-cloak class="text-center m-10 text-gray-300 dark:text-neutral-600 text-xs"> <a class="hover:underline" target="_blank"
-        href="https://github.com/wg-easy/wg-easy">WireGuard Easy</a> © 2021-2024 by <a class="hover:underline" target="_blank"
-        href="https://emilenijssen.nl/?ref=wg-easy">Emile Nijssen</a> is licensed under <a class="hover:underline" target="_blank"
-        href="http://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a> · <a class="hover:underline"
-        href="https://github.com/sponsors/WeeJeWel" target="_blank">{{$t("donate")}}</a></p>
-
   </div>
 
   <script src="./js/vendor/vue.min.js"></script>
diff --git a/src/www/js/api.js b/src/www/js/api.js
index 9006f5ab..183d6c98 100644
--- a/src/www/js/api.js
+++ b/src/www/js/api.js
@@ -43,6 +43,13 @@ class API {
     });
   }
 
+  async getRememberMeEnabled() {
+    return this.call({
+      method: 'get',
+      path: '/remember-me',
+    });
+  }
+
   async getuiTrafficStats() {
     return this.call({
       method: 'get',
@@ -57,6 +64,27 @@ class API {
     });
   }
 
+  async getWGEnableOneTimeLinks() {
+    return this.call({
+      method: 'get',
+      path: '/wg-enable-one-time-links',
+    });
+  }
+
+  async getWGEnableExpireTime() {
+    return this.call({
+      method: 'get',
+      path: '/wg-enable-expire-time',
+    });
+  }
+
+  async getAvatarSettings() {
+    return this.call({
+      method: 'get',
+      path: '/ui-avatar-settings',
+    });
+  }
+
   async getSession() {
     return this.call({
       method: 'get',
@@ -64,11 +92,11 @@ class API {
     });
   }
 
-  async createSession({ password }) {
+  async createSession({ password, remember }) {
     return this.call({
       method: 'post',
       path: '/session',
-      body: { password },
+      body: { password, remember },
     });
   }
 
@@ -87,17 +115,20 @@ class API {
       ...client,
       createdAt: new Date(client.createdAt),
       updatedAt: new Date(client.updatedAt),
+      expiredAt: client.expiredAt !== null
+        ? new Date(client.expiredAt)
+        : null,
       latestHandshakeAt: client.latestHandshakeAt !== null
         ? new Date(client.latestHandshakeAt)
         : null,
     })));
   }
 
-  async createClient({ name }) {
+  async createClient({ name, expiredDate }) {
     return this.call({
       method: 'post',
       path: '/wireguard/client',
-      body: { name },
+      body: { name, expiredDate },
     });
   }
 
@@ -108,6 +139,13 @@ class API {
     });
   }
 
+  async showOneTimeLink({ clientId }) {
+    return this.call({
+      method: 'post',
+      path: `/wireguard/client/${clientId}/generateOneTimeLink`,
+    });
+  }
+
   async enableClient({ clientId }) {
     return this.call({
       method: 'post',
@@ -138,6 +176,14 @@ class API {
     });
   }
 
+  async updateClientExpireDate({ clientId, expireDate }) {
+    return this.call({
+      method: 'put',
+      path: `/wireguard/client/${clientId}/expireDate/`,
+      body: { expireDate },
+    });
+  }
+
   async restoreConfiguration(file) {
     return this.call({
       method: 'put',
@@ -146,4 +192,11 @@ class API {
     });
   }
 
+  async getUiSortClients() {
+    return this.call({
+      method: 'get',
+      path: '/ui-sort-clients',
+    });
+  }
+
 }
diff --git a/src/www/js/app.js b/src/www/js/app.js
index 61bb7c03..df1a78a5 100644
--- a/src/www/js/app.js
+++ b/src/www/js/app.js
@@ -23,6 +23,22 @@ function bytes(bytes, decimals, kib, maxunit) {
   return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
 }
 
+/**
+ * Sorts an array of objects by a specified property in ascending or descending order.
+ *
+ * @param {Array} array - The array of objects to be sorted.
+ * @param {string} property - The property to sort the array by.
+ * @param {boolean} [sort=true] - Whether to sort the array in ascending (default) or descending order.
+ * @return {Array} - The sorted array of objects.
+ */
+function sortByProperty(array, property, sort = true) {
+  if (sort) {
+    return array.sort((a, b) => (typeof a[property] === 'string' ? a[property].localeCompare(b[property]) : a[property] - b[property]));
+  }
+
+  return array.sort((a, b) => (typeof a[property] === 'string' ? b[property].localeCompare(a[property]) : b[property] - a[property]));
+}
+
 const i18n = new VueI18n({
   locale: localStorage.getItem('lang') || 'en',
   fallbackLocale: 'en',
@@ -53,16 +69,21 @@ new Vue({
     authenticating: false,
     password: null,
     requiresPassword: null,
+    remember: false,
+    rememberMeEnabled: false,
 
     clients: null,
     clientsPersist: {},
     clientDelete: null,
     clientCreate: null,
     clientCreateName: '',
+    clientExpiredDate: '',
     clientEditName: null,
     clientEditNameId: null,
     clientEditAddress: null,
     clientEditAddressId: null,
+    clientEditExpireDate: null,
+    clientEditExpireDateId: null,
     qrcode: null,
 
     currentRelease: null,
@@ -71,6 +92,15 @@ new Vue({
     uiTrafficStats: false,
 
     uiChartType: 0,
+    avatarSettings: {
+      dicebear: null,
+      gravatar: false,
+    },
+    enableOneTimeLinks: false,
+    enableSortClient: false,
+    sortClient: true, // Sort clients by name, true = asc, false = desc
+    enableExpireTime: false,
+
     uiShowCharts: localStorage.getItem('uiShowCharts') === '1',
     uiTheme: localStorage.theme || 'auto',
     prefersDarkScheme: window.matchMedia('(prefers-color-scheme: dark)'),
@@ -155,6 +185,7 @@ new Vue({
         },
       },
     },
+
   },
   methods: {
     dateTime: (value) => {
@@ -173,8 +204,10 @@ new Vue({
 
       const clients = await this.api.getClients();
       this.clients = clients.map((client) => {
-        if (client.name.includes('@') && client.name.includes('.')) {
+        if (client.name.includes('@') && client.name.includes('.') && this.avatarSettings.gravatar) {
           client.avatar = `https://gravatar.com/avatar/${sha256(client.name.toLowerCase().trim())}.jpg`;
+        } else if (this.avatarSettings.dicebear) {
+          client.avatar = `https://api.dicebear.com/9.x/${this.avatarSettings.dicebear}/svg?seed=${sha256(client.name.toLowerCase().trim())}`;
         }
 
         if (!this.clientsPersist[client.id]) {
@@ -229,6 +262,10 @@ new Vue({
 
         return client;
       });
+
+      if (this.enableSortClient) {
+        this.clients = sortByProperty(this.clients, 'name', this.sortClient);
+      }
     },
     login(e) {
       e.preventDefault();
@@ -239,6 +276,7 @@ new Vue({
       this.authenticating = true;
       this.api.createSession({
         password: this.password,
+        remember: this.remember,
       })
         .then(async () => {
           const session = await this.api.getSession();
@@ -268,9 +306,10 @@ new Vue({
     },
     createClient() {
       const name = this.clientCreateName;
+      const expiredDate = this.clientExpiredDate;
       if (!name) return;
 
-      this.api.createClient({ name })
+      this.api.createClient({ name, expiredDate })
         .catch((err) => alert(err.message || err.toString()))
         .finally(() => this.refresh().catch(console.error));
     },
@@ -279,6 +318,11 @@ new Vue({
         .catch((err) => alert(err.message || err.toString()))
         .finally(() => this.refresh().catch(console.error));
     },
+    showOneTimeLink(client) {
+      this.api.showOneTimeLink({ clientId: client.id })
+        .catch((err) => alert(err.message || err.toString()))
+        .finally(() => this.refresh().catch(console.error));
+    },
     enableClient(client) {
       this.api.enableClient({ clientId: client.id })
         .catch((err) => alert(err.message || err.toString()))
@@ -299,6 +343,11 @@ new Vue({
         .catch((err) => alert(err.message || err.toString()))
         .finally(() => this.refresh().catch(console.error));
     },
+    updateClientExpireDate(client, expireDate) {
+      this.api.updateClientExpireDate({ clientId: client.id, expireDate })
+        .catch((err) => alert(err.message || err.toString()))
+        .finally(() => this.refresh().catch(console.error));
+    },
     restoreConfig(e) {
       e.preventDefault();
       const file = e.currentTarget.files.item(0);
@@ -342,6 +391,15 @@ new Vue({
     timeago: (value) => {
       return timeago.format(value, i18n.locale);
     },
+    expiredDateFormat: (value) => {
+      if (value === null) return i18n.t('Permanent');
+      const dateTime = new Date(value);
+      const options = { year: 'numeric', month: 'long', day: 'numeric' };
+      return dateTime.toLocaleDateString(i18n.locale, options);
+    },
+    expiredDateEditFormat: (value) => {
+      if (value === null) return 'yyyy-MM-dd';
+    },
   },
   mounted() {
     this.prefersDarkScheme.addListener(this.handlePrefersChange);
@@ -362,6 +420,11 @@ new Vue({
         alert(err.message || err.toString());
       });
 
+    this.api.getRememberMeEnabled()
+      .then((rememberMeEnabled) => {
+        this.rememberMeEnabled = rememberMeEnabled;
+      });
+
     setInterval(() => {
       this.refresh({
         updateCharts: this.updateCharts,
@@ -384,6 +447,41 @@ new Vue({
         this.uiChartType = 0;
       });
 
+    this.api.getWGEnableOneTimeLinks()
+      .then((res) => {
+        this.enableOneTimeLinks = res;
+      })
+      .catch(() => {
+        this.enableOneTimeLinks = false;
+      });
+
+    this.api.getUiSortClients()
+      .then((res) => {
+        this.enableSortClient = res;
+      })
+      .catch(() => {
+        this.enableSortClient = false;
+      });
+
+    this.api.getWGEnableExpireTime()
+      .then((res) => {
+        this.enableExpireTime = res;
+      })
+      .catch(() => {
+        this.enableExpireTime = false;
+      });
+
+    this.api.getAvatarSettings()
+      .then((res) => {
+        this.avatarSettings = res;
+      })
+      .catch(() => {
+        this.avatarSettings = {
+          dicebear: null,
+          gravatar: false,
+        };
+      });
+
     Promise.resolve().then(async () => {
       const lang = await this.api.getLang();
       if (lang !== localStorage.getItem('lang') && i18n.availableLocales.includes(lang)) {
@@ -392,7 +490,7 @@ new Vue({
       }
 
       const currentRelease = await this.api.getRelease();
-      const latestRelease = await fetch('https://wg-easy.github.io/wg-easy/changelog.json')
+      const latestRelease = await fetch('https://evoll.github.io/awg-easy-14/changelog.json')
         .then((res) => res.json())
         .then((releases) => {
           const releasesArray = Object.entries(releases).map(([version, changelog]) => ({
diff --git a/src/www/js/i18n.js b/src/www/js/i18n.js
index 26669610..b74c30a6 100644
--- a/src/www/js/i18n.js
+++ b/src/www/js/i18n.js
@@ -34,6 +34,12 @@ const messages = { // eslint-disable-line no-unused-vars
     backup: 'Backup',
     titleRestoreConfig: 'Restore your configuration',
     titleBackupConfig: 'Backup your configuration',
+    rememberMe: 'Remember me',
+    titleRememberMe: 'Stay logged after closing the browser',
+    sort: 'Sort',
+    ExpireDate: 'Expire Date',
+    Permanent: 'Permanent',
+    OneTimeLink: 'Generate short one time link',
   },
   ua: {
     name: 'Ім`я',
@@ -102,6 +108,12 @@ const messages = { // eslint-disable-line no-unused-vars
     backup: 'Резервная копия',
     titleRestoreConfig: 'Восстановить конфигурацию',
     titleBackupConfig: 'Создать резервную копию конфигурации',
+    rememberMe: 'Запомнить меня',
+    titleRememberMe: 'Оставаться в системе после закрытия браузера',
+    sort: 'Сортировка',
+    ExpireDate: 'Дата истечения срока',
+    Permanent: 'Бессрочно',
+    OneTimeLink: 'Создать короткую одноразовую ссылку',
   },
   tr: { // Müslüm Barış Korkmazer @babico
     name: 'İsim',
@@ -340,8 +352,14 @@ const messages = { // eslint-disable-line no-unused-vars
     downloadConfig: '구성 다운로드',
     madeBy: '만든 사람',
     donate: '기부',
+    toggleCharts: '차트 표시/숨기기',
+    theme: { dark: '어두운 테마', light: '밝은 테마', auto: '자동 테마' },
+    restore: '복원',
+    backup: '백업',
+    titleRestoreConfig: '구성 파일 복원',
+    titleBackupConfig: '구성 파일 백업',
   },
-  vi: {
+  vi: { // https://github.com/hoangneeee
     name: 'Tên',
     password: 'Mật khẩu',
     signIn: 'Đăng nhập',
@@ -367,6 +385,13 @@ const messages = { // eslint-disable-line no-unused-vars
     downloadConfig: 'Tải xuống cấu hình',
     madeBy: 'Được tạo bởi',
     donate: 'Ủng hộ',
+    toggleCharts: 'Mở/Ẩn Biểu đồ',
+    theme: { dark: 'Dark theme', light: 'Light theme', auto: 'Auto theme' },
+    restore: 'Khôi phục',
+    backup: 'Sao lưu',
+    titleRestoreConfig: 'Khôi phục cấu hình của bạn',
+    titleBackupConfig: 'Sao lưu cấu hình của bạn',
+    sort: 'Sắp xếp',
   },
   nl: {
     name: 'Naam',
@@ -471,10 +496,23 @@ const messages = { // eslint-disable-line no-unused-vars
     disableClient: '禁用客户端',
     enableClient: '启用客户端',
     noClients: '目前没有客户端。',
+    noPrivKey: '此客户端没有已知的私钥。无法创建配置。',
     showQR: '显示二维码',
     downloadConfig: '下载配置',
     madeBy: '由',
     donate: '捐赠',
+    toggleCharts: '显示/隐藏图表',
+    theme: { dark: '暗黑主题', light: '明亮主题', auto: '自动主题' },
+    restore: '恢复',
+    backup: '备份',
+    titleRestoreConfig: '恢复您的配置',
+    titleBackupConfig: '备份您的配置',
+    rememberMe: '记住我',
+    titleRememberMe: '关闭浏览器后保持登录',
+    sort: '排序',
+    ExpireDate: '到期日期',
+    Permanent: '永久',
+    OneTimeLink: '生成一次性短链接',
   },
   cht: {
     name: '名字',
@@ -498,10 +536,23 @@ const messages = { // eslint-disable-line no-unused-vars
     disableClient: '停用使用者',
     enableClient: '啟用使用者',
     noClients: '目前沒有使用者。',
+    noPrivKey: '此使用者沒有已知的私鑰。無法創建配置。',
     showQR: '顯示 QR Code',
     downloadConfig: '下載 Config 檔',
     madeBy: '由',
     donate: '抖內',
+    toggleCharts: '顯示/隱藏圖表',
+    theme: { dark: '暗黑主題', light: '明亮主題', auto: '自動主題' },
+    restore: '恢復',
+    backup: '備份',
+    titleRestoreConfig: '恢復您的配置',
+    titleBackupConfig: '備份您的配置',
+    rememberMe: '記住我',
+    titleRememberMe: '關閉瀏覽器後保持登錄',
+    sort: '排序',
+    ExpireDate: '到期日期',
+    Permanent: '永久',
+    OneTimeLink: '生成一次性短鏈接',
   },
   it: {
     name: 'Nome',
diff --git a/src/www/manifest.json b/src/www/manifest.json
index e0834f74..bbb7635b 100644
--- a/src/www/manifest.json
+++ b/src/www/manifest.json
@@ -1,11 +1,11 @@
 {
-  "name": "WireGuard",
+  "name": "AmneziaWG",
   "display": "standalone",
   "background_color": "#fff",
   "icons": [
     {
-      "src": "img/favicon.png",
-      "type": "image/png"
+      "src": "img/favicon.ico",
+      "type": "image/x-icon"
     }
   ]
 }
diff --git a/src/www/src/css/app.css b/src/www/src/css/app.css
index b5c61c95..46f825ac 100644
--- a/src/www/src/css/app.css
+++ b/src/www/src/css/app.css
@@ -1,3 +1,7 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+.p-0 {
+  padding: 0;
+}