diff --git a/.dockerignore b/.dockerignore
index 539e9328..62925caa 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -27,7 +27,7 @@ CNAME
 install.sh
 SECURITY.md
 tsconfig.json
-
+.env
 
 ### .gitignore content (commented rules are duplicated)
 
diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index 83d887e4..b5240d77 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -10,11 +10,12 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  auto-test:
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
         node-version: [14.x, 15.x, 16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
diff --git a/.gitignore b/.gitignore
index 0863015d..cd654d90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ dist-ssr
 /private
 /out
 /tmp
+.env
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 562b8cd3..93b03ac6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,6 +38,7 @@ If you are not sure, feel free to create an empty pull request draft first.
 - Add a new notification
 - Add a chart
 - Fix a bug
+- Translations
 
 ### *️⃣ Requires one more reviewer
 
@@ -172,3 +173,7 @@ npm install
 Since previously updating vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only. 
 
 Patch release = the third digit
+
+# Translations
+
+Please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
diff --git a/README.md b/README.md
index 4ad1c555..be5494b5 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 It is a self-hosted monitoring tool like "Uptime Robot".
 
-<img src="https://louislam.net/uptimekuma/1.jpg" width="512" alt="" />
+<img src="https://uptime.kuma.pet/img/dark.jpg" width="700" alt="" />
 
 ## 🥔 Live Demo
 
@@ -86,9 +86,13 @@ https://github.com/louislam/uptime-kuma/projects/1
 
 ## 🖼 More Screenshots
 
-Dark Mode:
+Light Mode:
 
-<img src="https://user-images.githubusercontent.com/1336778/128710166-908f8d88-9256-43f3-9c49-bfc2c56011d2.png" width="400" alt="" />
+<img src="https://uptime.kuma.pet/img/light.jpg" width="512" alt="" />
+
+Status Page:
+
+<img src="https://user-images.githubusercontent.com/1336778/133384019-962e1120-6c3a-481f-9d07-d7df765e9ba4.png" width="512" alt="" />
 
 Settings Page:
 
diff --git a/SECURITY.md b/SECURITY.md
index 1271565a..d2f000ed 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,7 +7,8 @@ currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.x.x  | :white_check_mark: |
+| 1.7.X  | :white_check_mark: |
+| < 1.7  | ❌ |
 
 ## Reporting a Vulnerability
 Please report security issues to uptime@kuma.pet.
diff --git a/dockerfile b/dockerfile
index 969d5ff3..b6c48b28 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,6 +1,8 @@
 FROM louislam/uptime-kuma:base-debian AS build
 WORKDIR /app
 
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
+
 COPY . .
 RUN npm install --legacy-peer-deps && \
     npm run build && \
diff --git a/dockerfile-alpine b/dockerfile-alpine
index 178afcab..7604c40c 100644
--- a/dockerfile-alpine
+++ b/dockerfile-alpine
@@ -1,6 +1,8 @@
 FROM louislam/uptime-kuma:base-alpine AS build
 WORKDIR /app
 
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
+
 COPY . .
 RUN npm install --legacy-peer-deps && \
     npm run build && \
diff --git a/extra/update-version.js b/extra/update-version.js
index ca810a40..2e3b42da 100644
--- a/extra/update-version.js
+++ b/extra/update-version.js
@@ -19,6 +19,7 @@ if (! newVersion) {
 const exists = tagExists(newVersion);
 
 if (! exists) {
+
     // Process package.json
     pkg.version = newVersion;
     pkg.scripts.setup = pkg.scripts.setup.replaceAll(oldVersion, newVersion);
@@ -29,8 +30,11 @@ if (! exists) {
 
     commit(newVersion);
     tag(newVersion);
+
+    updateWiki(oldVersion, newVersion);
+
 } else {
-    console.log("version exists")
+    console.log("version exists");
 }
 
 function commit(version) {
@@ -38,16 +42,16 @@ function commit(version) {
 
     let res = child_process.spawnSync("git", ["commit", "-m", msg, "-a"]);
     let stdout = res.stdout.toString().trim();
-    console.log(stdout)
+    console.log(stdout);
 
     if (stdout.includes("no changes added to commit")) {
-        throw new Error("commit error")
+        throw new Error("commit error");
     }
 }
 
 function tag(version) {
     let res = child_process.spawnSync("git", ["tag", version]);
-    console.log(res.stdout.toString().trim())
+    console.log(res.stdout.toString().trim());
 }
 
 function tagExists(version) {
@@ -59,3 +63,38 @@ function tagExists(version) {
 
     return res.stdout.toString().trim() === version;
 }
+
+function updateWiki(oldVersion, newVersion) {
+    const wikiDir = "./tmp/wiki";
+    const howToUpdateFilename = "./tmp/wiki/🆙-How-to-Update.md";
+
+    safeDelete(wikiDir);
+
+    child_process.spawnSync("git", ["clone", "https://github.com/louislam/uptime-kuma.wiki.git", wikiDir]);
+    let content = fs.readFileSync(howToUpdateFilename).toString();
+    content = content.replaceAll(`git checkout ${oldVersion}`, `git checkout ${newVersion}`);
+    fs.writeFileSync(howToUpdateFilename, content);
+
+    child_process.spawnSync("git", ["add", "-A"], {
+        cwd: wikiDir,
+    });
+
+    child_process.spawnSync("git", ["commit", "-m", `Update to ${newVersion} from ${oldVersion}`], {
+        cwd: wikiDir,
+    });
+
+    console.log("Pushing to Github");
+    child_process.spawnSync("git", ["push"], {
+        cwd: wikiDir,
+    });
+
+    safeDelete(wikiDir);
+}
+
+function safeDelete(dir) {
+    if (fs.existsSync(dir)) {
+        fs.rmdirSync(dir, {
+            recursive: true,
+        });
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index 628ccd3a..762cfd98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
                 "@fortawesome/free-regular-svg-icons": "~5.15.4",
                 "@fortawesome/free-solid-svg-icons": "~5.15.4",
                 "@fortawesome/vue-fontawesome": "~3.0.0-4",
-                "@louislam/sqlite3": "~5.0.6",
+                "@louislam/sqlite3": "~6.0.0",
                 "@popperjs/core": "~2.10.2",
                 "args-parser": "~1.3.0",
                 "axios": "~0.21.4",
@@ -48,7 +48,7 @@
                 "vue-chart-3": "~0.5.8",
                 "vue-confirm-dialog": "~1.0.2",
                 "vue-contenteditable": "~3.0.4",
-                "vue-i18n": "~9.1.8",
+                "vue-i18n": "~9.1.9",
                 "vue-image-crop-upload": "~3.0.3",
                 "vue-multiselect": "~3.0.0-alpha.2",
                 "vue-qrcode": "~1.0.0",
@@ -59,7 +59,7 @@
             "devDependencies": {
                 "@babel/eslint-parser": "~7.15.7",
                 "@types/bootstrap": "~5.1.6",
-                "@vitejs/plugin-legacy": "~1.5.3",
+                "@vitejs/plugin-legacy": "~1.6.1",
                 "@vitejs/plugin-vue": "~1.9.2",
                 "@vue/compiler-sfc": "~3.2.19",
                 "core-js": "~3.18.1",
@@ -74,7 +74,7 @@
                 "stylelint": "~13.13.1",
                 "stylelint-config-standard": "~22.0.0",
                 "typescript": "~4.4.3",
-                "vite": "~2.5.10"
+                "vite": "~2.6.4"
             },
             "engines": {
                 "node": "14.*"
@@ -844,39 +844,39 @@
             "dev": true
         },
         "node_modules/@intlify/core-base": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.8.tgz",
-            "integrity": "sha512-k+q6nUOD9HPTMr8AKEn4d/EgoNSCMVuc/dG97tFXrifT4+QbxoLNRjXovyC60rb4q+7D/cGF+5R6Tjby4t5gng==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.9.tgz",
+            "integrity": "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==",
             "dependencies": {
-                "@intlify/devtools-if": "9.1.8",
-                "@intlify/message-compiler": "9.1.8",
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/runtime": "9.1.8",
-                "@intlify/shared": "9.1.8",
-                "@intlify/vue-devtools": "9.1.8"
+                "@intlify/devtools-if": "9.1.9",
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9"
             },
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/@intlify/devtools-if": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.8.tgz",
-            "integrity": "sha512-17REiNoQ5dWnYECbKgkMHtX8GnNCkMNxfImXrJNnUhSH3GitheNkYn0o14AZmZWk7Fw/1IOdV5v7K0QVnYx5fw==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.9.tgz",
+            "integrity": "sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==",
             "dependencies": {
-                "@intlify/shared": "9.1.8"
+                "@intlify/shared": "9.1.9"
             },
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/@intlify/message-compiler": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.8.tgz",
-            "integrity": "sha512-x/vfvHqz2v/ngE0slaD/QnJORHzrlKt6p6TdoY+/1zBQ/TOH+6BlkdtrSIrSfwJfP+3Qe6C8uw6yJknQ6cpabA==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.9.tgz",
+            "integrity": "sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==",
             "dependencies": {
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/shared": "9.1.8",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9",
                 "source-map": "0.6.1"
             },
             "engines": {
@@ -884,42 +884,42 @@
             }
         },
         "node_modules/@intlify/message-resolver": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.8.tgz",
-            "integrity": "sha512-4tHBo5U2/oDG85tNv9z8bS/5ThMw+wADPLyBVOLplUqw8Q+N5tkrTL23Pa8hg5Ekd2crvyIxFHFwt1gbT8TT6w==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.9.tgz",
+            "integrity": "sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/@intlify/runtime": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.8.tgz",
-            "integrity": "sha512-Q9WvSjRFhxxCen5cj3jOZEKAYlXjYZ+wZbTEfBQhDtcBwrS7xd9tyFos4ZRNNvF7G0H0sNDzXmSdZkoCpoU0iA==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.9.tgz",
+            "integrity": "sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==",
             "dependencies": {
-                "@intlify/message-compiler": "9.1.8",
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/shared": "9.1.8"
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9"
             },
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/@intlify/shared": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.8.tgz",
-            "integrity": "sha512-o9nksOx3yIMDNvYzcPv87NR+U62ka775/Ufjl3U2g4NsMORN8+VacbVJ/oAF6CYfzZALpArBBZdk5jafzcLkvw==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.9.tgz",
+            "integrity": "sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/@intlify/vue-devtools": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.8.tgz",
-            "integrity": "sha512-SypF7tpWFxIQzKrqv6O8JIk5xrU53E0/xNVR5LFCHLIDIKe62uMTrzXvjW5zoYcJjRTZ87BZLXEM1n2CaLSBsg==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.9.tgz",
+            "integrity": "sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==",
             "dependencies": {
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/runtime": "9.1.8",
-                "@intlify/shared": "9.1.8"
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9"
             },
             "engines": {
                 "node": ">= 10"
@@ -1199,9 +1199,9 @@
             }
         },
         "node_modules/@louislam/sqlite3": {
-            "version": "5.0.6",
-            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-5.0.6.tgz",
-            "integrity": "sha512-uitL0jdbki5XSrmGKGgvHVMHEe00O6GAMoPrVOnh4KTcFOJ1T8SWypbnyqSxBr7PrjAVfgnIGu3kzYCCqIxd4g==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-6.0.0.tgz",
+            "integrity": "sha512-jKNkg7olyL4vM0yqVBiyPrtHALfWkCLAASASDJpghBE5Ri6qOh9bXmzaKyTrYH5cSsFB7R39XGC4O9XdAmTe4Q==",
             "hasInstallScript": true,
             "dependencies": {
                 "@mapbox/node-pre-gyp": "^1.0.0",
@@ -1685,16 +1685,16 @@
             }
         },
         "node_modules/@vitejs/plugin-legacy": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.5.3.tgz",
-            "integrity": "sha512-/b2x6dU+BbdW7C7KWxh9kMrVzv1JlUi1ucPQpSzWUUUVJjihbG+GRlpqcvfQ0p/TnAKl2d/VecbTLByVJJHORg==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.6.1.tgz",
+            "integrity": "sha512-isBi2ti+AlCZUpfA1P6L8gseltBy/qi6Rsi92aDzeL2elpwXgN4Hv/xLS2UUSSj9F0mFmxXCYPWlBPaJnlYamQ==",
             "dev": true,
             "dependencies": {
-                "@babel/standalone": "^7.14.9",
-                "core-js": "^3.16.0",
+                "@babel/standalone": "^7.15.7",
+                "core-js": "^3.18.1",
                 "magic-string": "^0.25.7",
                 "regenerator-runtime": "^0.13.9",
-                "systemjs": "^6.10.2"
+                "systemjs": "^6.10.3"
             },
             "engines": {
                 "node": ">=12.0.0"
@@ -3512,15 +3512,241 @@
             }
         },
         "node_modules/esbuild": {
-            "version": "0.12.29",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
-            "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.4.tgz",
+            "integrity": "sha512-wMA5eUwpavTBiNl+It6j8OQuKVh69l6z4DKDLzoTIqC+gChnPpcmqdA8WNHptUHRnfyML+mKEQPlW7Mybj8gHg==",
             "dev": true,
             "hasInstallScript": true,
             "bin": {
                 "esbuild": "bin/esbuild"
+            },
+            "optionalDependencies": {
+                "esbuild-android-arm64": "0.13.4",
+                "esbuild-darwin-64": "0.13.4",
+                "esbuild-darwin-arm64": "0.13.4",
+                "esbuild-freebsd-64": "0.13.4",
+                "esbuild-freebsd-arm64": "0.13.4",
+                "esbuild-linux-32": "0.13.4",
+                "esbuild-linux-64": "0.13.4",
+                "esbuild-linux-arm": "0.13.4",
+                "esbuild-linux-arm64": "0.13.4",
+                "esbuild-linux-mips64le": "0.13.4",
+                "esbuild-linux-ppc64le": "0.13.4",
+                "esbuild-openbsd-64": "0.13.4",
+                "esbuild-sunos-64": "0.13.4",
+                "esbuild-windows-32": "0.13.4",
+                "esbuild-windows-64": "0.13.4",
+                "esbuild-windows-arm64": "0.13.4"
             }
         },
+        "node_modules/esbuild-android-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.4.tgz",
+            "integrity": "sha512-elDJt+jNyoHFId0/dKsuVYUPke3EcquIyUwzJCH17a3ERglN3A9aMBI5zbz+xNZ+FbaDNdpn0RaJHCFLbZX+fA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/esbuild-darwin-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.4.tgz",
+            "integrity": "sha512-zJQGyHRAdZUXlRzbN7W+7ykmEiGC+bq3Gc4GxKYjjWTgDRSEly98ym+vRNkDjXwXYD3gGzSwvH35+MiHAtWvLA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/esbuild-darwin-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.4.tgz",
+            "integrity": "sha512-r8oYvAtqSGq8HNTZCAx4TdLE7jZiGhX9ooGi5AQAey37MA6XNaP8ZNlw9OCpcgpx3ryU2WctXwIqPzkHO7a8dg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/esbuild-freebsd-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.4.tgz",
+            "integrity": "sha512-u9DRGkn09EN8+lCh6z7FKle7awi17PJRBuAKdRNgSo5ZrH/3m+mYaJK2PR2URHMpAfXiwJX341z231tSdVe3Yw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/esbuild-freebsd-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.4.tgz",
+            "integrity": "sha512-q3B2k68Uf6gfjATjcK16DqxvjqRQkHL8aPoOfj4op+lSqegdXvBacB1d8jw8PxbWJ8JHpdTLdAVUYU80kotQXA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/esbuild-linux-32": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.4.tgz",
+            "integrity": "sha512-UUYJPHSiKAO8KoN3Ls/iZtgDLZvK5HarES96aolDPWZnq9FLx4dIHM/x2z4Rxv9IYqQ/DxlPoE2Co1UPBIYYeA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/esbuild-linux-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.4.tgz",
+            "integrity": "sha512-+RnohAKiiUW4UHLGRkNR1AnENW1gCuDWuygEtd4jxTNPIoeC7lbXGor7rtgjj9AdUzFgOEvAXyNNX01kJ8NueQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/esbuild-linux-arm": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.4.tgz",
+            "integrity": "sha512-BH5gKve4jglS7UPSsfwHSX79I5agC/lm4eKoRUEyo8lwQs89frQSRp2Xup+6SFQnxt3md5EsKcd2Dbkqeb3gPA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/esbuild-linux-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.4.tgz",
+            "integrity": "sha512-+A188cAdd6QuSRxMIwRrWLjgphQA0LDAQ/ECVlrPVJwnx+1i64NjDZivoqPYLOTkSPIKntiWwMhhf0U5/RrPHQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/esbuild-linux-mips64le": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.4.tgz",
+            "integrity": "sha512-0xkwtPaUkG5xMTFGaQPe1AadSe5QAiQuD4Gix1O9k5Xo/U8xGIkw9UFUTvfEUeu71vFb6ZgsIacfP1NLoFjWNw==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/esbuild-linux-ppc64le": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.4.tgz",
+            "integrity": "sha512-E1+oJPP7A+j23GPo3CEpBhGwG1bni4B8IbTA3/3rvzjURwUMZdcN3Fhrz24rnjzdLSHmULtOE4VsbT42h1Om4Q==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/esbuild-openbsd-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.4.tgz",
+            "integrity": "sha512-xEkI1o5HYxDzbv9jSox0EsDxpwraG09SRiKKv0W8pH6O3bt+zPSlnoK7+I7Q69tkvONkpIq5n2o+c55uq0X7cw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "openbsd"
+            ]
+        },
+        "node_modules/esbuild-sunos-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.4.tgz",
+            "integrity": "sha512-bjXUMcODMnB6hQicLBBmmnBl7OMDyVpFahKvHGXJfDChIi5udiIRKCmFUFIRn+AUAKVlfrofRKdyPC7kBsbvGQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "sunos"
+            ]
+        },
+        "node_modules/esbuild-windows-32": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.4.tgz",
+            "integrity": "sha512-z4CH07pfyVY0XF98TCsGmLxKCl0kyvshKDbdpTekW9f2d+dJqn5mmoUyWhpSVJ0SfYWJg86FoD9nMbbaMVyGdg==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/esbuild-windows-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.4.tgz",
+            "integrity": "sha512-uVL11vORRPjocGLYam67rwFLd0LvkrHEs+JG+1oJN4UD9MQmNGZPa4gBHo6hDpF+kqRJ9kXgQSeDqUyRy0tj/Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/esbuild-windows-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.4.tgz",
+            "integrity": "sha512-vA6GLvptgftRcDcWngD5cMlL4f4LbL8JjU2UMT9yJ0MT5ra6hdZNFWnOeOoEtY4GtJ6OjZ0i+81sTqhAB0fMkg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
         "node_modules/escalade": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -10066,15 +10292,15 @@
             }
         },
         "node_modules/vite": {
-            "version": "2.5.10",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-2.5.10.tgz",
-            "integrity": "sha512-0ObiHTi5AHyXdJcvZ67HMsDgVpjT5RehvVKv6+Q0jFZ7zDI28PF5zK9mYz2avxdA+4iJMdwCz6wnGNnn4WX5Gg==",
+            "version": "2.6.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-2.6.4.tgz",
+            "integrity": "sha512-zNGZgjKGprdLKJ1g1taAvNt51JbGAdrAUU9hpLzgtlks+cXBxTZUsEAGEtLbF3UvlYOVAPXS8r9E9gxYAv6z+A==",
             "dev": true,
             "dependencies": {
-                "esbuild": "^0.12.17",
-                "postcss": "^8.3.6",
+                "esbuild": "^0.13.2",
+                "postcss": "^8.3.8",
                 "resolve": "^1.20.0",
-                "rollup": "^2.38.5"
+                "rollup": "^2.57.0"
             },
             "bin": {
                 "vite": "bin/vite.js"
@@ -10084,6 +10310,22 @@
             },
             "optionalDependencies": {
                 "fsevents": "~2.3.2"
+            },
+            "peerDependencies": {
+                "less": "*",
+                "sass": "*",
+                "stylus": "*"
+            },
+            "peerDependenciesMeta": {
+                "less": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                }
             }
         },
         "node_modules/vue": {
@@ -10207,13 +10449,13 @@
             }
         },
         "node_modules/vue-i18n": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.8.tgz",
-            "integrity": "sha512-Gmjkt/4ZQtKyCLTjJNGVp+w/dhMpuwuPtgW/Xm9DY0ppSwHRgqMRR6GspnCIYWBxQjzsTT8tIWLPc3SUfKifLA==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.9.tgz",
+            "integrity": "sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==",
             "dependencies": {
-                "@intlify/core-base": "9.1.8",
-                "@intlify/shared": "9.1.8",
-                "@intlify/vue-devtools": "9.1.8",
+                "@intlify/core-base": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9",
                 "@vue/devtools-api": "^6.0.0-beta.7"
             },
             "engines": {
@@ -11229,64 +11471,64 @@
             "dev": true
         },
         "@intlify/core-base": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.8.tgz",
-            "integrity": "sha512-k+q6nUOD9HPTMr8AKEn4d/EgoNSCMVuc/dG97tFXrifT4+QbxoLNRjXovyC60rb4q+7D/cGF+5R6Tjby4t5gng==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.9.tgz",
+            "integrity": "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==",
             "requires": {
-                "@intlify/devtools-if": "9.1.8",
-                "@intlify/message-compiler": "9.1.8",
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/runtime": "9.1.8",
-                "@intlify/shared": "9.1.8",
-                "@intlify/vue-devtools": "9.1.8"
+                "@intlify/devtools-if": "9.1.9",
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9"
             }
         },
         "@intlify/devtools-if": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.8.tgz",
-            "integrity": "sha512-17REiNoQ5dWnYECbKgkMHtX8GnNCkMNxfImXrJNnUhSH3GitheNkYn0o14AZmZWk7Fw/1IOdV5v7K0QVnYx5fw==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.9.tgz",
+            "integrity": "sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==",
             "requires": {
-                "@intlify/shared": "9.1.8"
+                "@intlify/shared": "9.1.9"
             }
         },
         "@intlify/message-compiler": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.8.tgz",
-            "integrity": "sha512-x/vfvHqz2v/ngE0slaD/QnJORHzrlKt6p6TdoY+/1zBQ/TOH+6BlkdtrSIrSfwJfP+3Qe6C8uw6yJknQ6cpabA==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.9.tgz",
+            "integrity": "sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==",
             "requires": {
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/shared": "9.1.8",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9",
                 "source-map": "0.6.1"
             }
         },
         "@intlify/message-resolver": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.8.tgz",
-            "integrity": "sha512-4tHBo5U2/oDG85tNv9z8bS/5ThMw+wADPLyBVOLplUqw8Q+N5tkrTL23Pa8hg5Ekd2crvyIxFHFwt1gbT8TT6w=="
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.9.tgz",
+            "integrity": "sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA=="
         },
         "@intlify/runtime": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.8.tgz",
-            "integrity": "sha512-Q9WvSjRFhxxCen5cj3jOZEKAYlXjYZ+wZbTEfBQhDtcBwrS7xd9tyFos4ZRNNvF7G0H0sNDzXmSdZkoCpoU0iA==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.9.tgz",
+            "integrity": "sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==",
             "requires": {
-                "@intlify/message-compiler": "9.1.8",
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/shared": "9.1.8"
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9"
             }
         },
         "@intlify/shared": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.8.tgz",
-            "integrity": "sha512-o9nksOx3yIMDNvYzcPv87NR+U62ka775/Ufjl3U2g4NsMORN8+VacbVJ/oAF6CYfzZALpArBBZdk5jafzcLkvw=="
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.9.tgz",
+            "integrity": "sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw=="
         },
         "@intlify/vue-devtools": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.8.tgz",
-            "integrity": "sha512-SypF7tpWFxIQzKrqv6O8JIk5xrU53E0/xNVR5LFCHLIDIKe62uMTrzXvjW5zoYcJjRTZ87BZLXEM1n2CaLSBsg==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.9.tgz",
+            "integrity": "sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==",
             "requires": {
-                "@intlify/message-resolver": "9.1.8",
-                "@intlify/runtime": "9.1.8",
-                "@intlify/shared": "9.1.8"
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9"
             }
         },
         "@istanbuljs/load-nyc-config": {
@@ -11507,9 +11749,9 @@
             }
         },
         "@louislam/sqlite3": {
-            "version": "5.0.6",
-            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-5.0.6.tgz",
-            "integrity": "sha512-uitL0jdbki5XSrmGKGgvHVMHEe00O6GAMoPrVOnh4KTcFOJ1T8SWypbnyqSxBr7PrjAVfgnIGu3kzYCCqIxd4g==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-6.0.0.tgz",
+            "integrity": "sha512-jKNkg7olyL4vM0yqVBiyPrtHALfWkCLAASASDJpghBE5Ri6qOh9bXmzaKyTrYH5cSsFB7R39XGC4O9XdAmTe4Q==",
             "requires": {
                 "@mapbox/node-pre-gyp": "^1.0.0",
                 "node-addon-api": "^3.0.0",
@@ -11951,16 +12193,16 @@
             }
         },
         "@vitejs/plugin-legacy": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.5.3.tgz",
-            "integrity": "sha512-/b2x6dU+BbdW7C7KWxh9kMrVzv1JlUi1ucPQpSzWUUUVJjihbG+GRlpqcvfQ0p/TnAKl2d/VecbTLByVJJHORg==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.6.1.tgz",
+            "integrity": "sha512-isBi2ti+AlCZUpfA1P6L8gseltBy/qi6Rsi92aDzeL2elpwXgN4Hv/xLS2UUSSj9F0mFmxXCYPWlBPaJnlYamQ==",
             "dev": true,
             "requires": {
-                "@babel/standalone": "^7.14.9",
-                "core-js": "^3.16.0",
+                "@babel/standalone": "^7.15.7",
+                "core-js": "^3.18.1",
                 "magic-string": "^0.25.7",
                 "regenerator-runtime": "^0.13.9",
-                "systemjs": "^6.10.2"
+                "systemjs": "^6.10.3"
             }
         },
         "@vitejs/plugin-vue": {
@@ -13373,10 +13615,140 @@
             }
         },
         "esbuild": {
-            "version": "0.12.29",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
-            "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
-            "dev": true
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.4.tgz",
+            "integrity": "sha512-wMA5eUwpavTBiNl+It6j8OQuKVh69l6z4DKDLzoTIqC+gChnPpcmqdA8WNHptUHRnfyML+mKEQPlW7Mybj8gHg==",
+            "dev": true,
+            "requires": {
+                "esbuild-android-arm64": "0.13.4",
+                "esbuild-darwin-64": "0.13.4",
+                "esbuild-darwin-arm64": "0.13.4",
+                "esbuild-freebsd-64": "0.13.4",
+                "esbuild-freebsd-arm64": "0.13.4",
+                "esbuild-linux-32": "0.13.4",
+                "esbuild-linux-64": "0.13.4",
+                "esbuild-linux-arm": "0.13.4",
+                "esbuild-linux-arm64": "0.13.4",
+                "esbuild-linux-mips64le": "0.13.4",
+                "esbuild-linux-ppc64le": "0.13.4",
+                "esbuild-openbsd-64": "0.13.4",
+                "esbuild-sunos-64": "0.13.4",
+                "esbuild-windows-32": "0.13.4",
+                "esbuild-windows-64": "0.13.4",
+                "esbuild-windows-arm64": "0.13.4"
+            }
+        },
+        "esbuild-android-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.4.tgz",
+            "integrity": "sha512-elDJt+jNyoHFId0/dKsuVYUPke3EcquIyUwzJCH17a3ERglN3A9aMBI5zbz+xNZ+FbaDNdpn0RaJHCFLbZX+fA==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-darwin-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.4.tgz",
+            "integrity": "sha512-zJQGyHRAdZUXlRzbN7W+7ykmEiGC+bq3Gc4GxKYjjWTgDRSEly98ym+vRNkDjXwXYD3gGzSwvH35+MiHAtWvLA==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-darwin-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.4.tgz",
+            "integrity": "sha512-r8oYvAtqSGq8HNTZCAx4TdLE7jZiGhX9ooGi5AQAey37MA6XNaP8ZNlw9OCpcgpx3ryU2WctXwIqPzkHO7a8dg==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-freebsd-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.4.tgz",
+            "integrity": "sha512-u9DRGkn09EN8+lCh6z7FKle7awi17PJRBuAKdRNgSo5ZrH/3m+mYaJK2PR2URHMpAfXiwJX341z231tSdVe3Yw==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-freebsd-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.4.tgz",
+            "integrity": "sha512-q3B2k68Uf6gfjATjcK16DqxvjqRQkHL8aPoOfj4op+lSqegdXvBacB1d8jw8PxbWJ8JHpdTLdAVUYU80kotQXA==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-linux-32": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.4.tgz",
+            "integrity": "sha512-UUYJPHSiKAO8KoN3Ls/iZtgDLZvK5HarES96aolDPWZnq9FLx4dIHM/x2z4Rxv9IYqQ/DxlPoE2Co1UPBIYYeA==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-linux-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.4.tgz",
+            "integrity": "sha512-+RnohAKiiUW4UHLGRkNR1AnENW1gCuDWuygEtd4jxTNPIoeC7lbXGor7rtgjj9AdUzFgOEvAXyNNX01kJ8NueQ==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-linux-arm": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.4.tgz",
+            "integrity": "sha512-BH5gKve4jglS7UPSsfwHSX79I5agC/lm4eKoRUEyo8lwQs89frQSRp2Xup+6SFQnxt3md5EsKcd2Dbkqeb3gPA==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-linux-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.4.tgz",
+            "integrity": "sha512-+A188cAdd6QuSRxMIwRrWLjgphQA0LDAQ/ECVlrPVJwnx+1i64NjDZivoqPYLOTkSPIKntiWwMhhf0U5/RrPHQ==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-linux-mips64le": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.4.tgz",
+            "integrity": "sha512-0xkwtPaUkG5xMTFGaQPe1AadSe5QAiQuD4Gix1O9k5Xo/U8xGIkw9UFUTvfEUeu71vFb6ZgsIacfP1NLoFjWNw==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-linux-ppc64le": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.4.tgz",
+            "integrity": "sha512-E1+oJPP7A+j23GPo3CEpBhGwG1bni4B8IbTA3/3rvzjURwUMZdcN3Fhrz24rnjzdLSHmULtOE4VsbT42h1Om4Q==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-openbsd-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.4.tgz",
+            "integrity": "sha512-xEkI1o5HYxDzbv9jSox0EsDxpwraG09SRiKKv0W8pH6O3bt+zPSlnoK7+I7Q69tkvONkpIq5n2o+c55uq0X7cw==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-sunos-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.4.tgz",
+            "integrity": "sha512-bjXUMcODMnB6hQicLBBmmnBl7OMDyVpFahKvHGXJfDChIi5udiIRKCmFUFIRn+AUAKVlfrofRKdyPC7kBsbvGQ==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-windows-32": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.4.tgz",
+            "integrity": "sha512-z4CH07pfyVY0XF98TCsGmLxKCl0kyvshKDbdpTekW9f2d+dJqn5mmoUyWhpSVJ0SfYWJg86FoD9nMbbaMVyGdg==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-windows-64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.4.tgz",
+            "integrity": "sha512-uVL11vORRPjocGLYam67rwFLd0LvkrHEs+JG+1oJN4UD9MQmNGZPa4gBHo6hDpF+kqRJ9kXgQSeDqUyRy0tj/Q==",
+            "dev": true,
+            "optional": true
+        },
+        "esbuild-windows-arm64": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.4.tgz",
+            "integrity": "sha512-vA6GLvptgftRcDcWngD5cMlL4f4LbL8JjU2UMT9yJ0MT5ra6hdZNFWnOeOoEtY4GtJ6OjZ0i+81sTqhAB0fMkg==",
+            "dev": true,
+            "optional": true
         },
         "escalade": {
             "version": "3.1.1",
@@ -18379,16 +18751,16 @@
             }
         },
         "vite": {
-            "version": "2.5.10",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-2.5.10.tgz",
-            "integrity": "sha512-0ObiHTi5AHyXdJcvZ67HMsDgVpjT5RehvVKv6+Q0jFZ7zDI28PF5zK9mYz2avxdA+4iJMdwCz6wnGNnn4WX5Gg==",
+            "version": "2.6.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-2.6.4.tgz",
+            "integrity": "sha512-zNGZgjKGprdLKJ1g1taAvNt51JbGAdrAUU9hpLzgtlks+cXBxTZUsEAGEtLbF3UvlYOVAPXS8r9E9gxYAv6z+A==",
             "dev": true,
             "requires": {
-                "esbuild": "^0.12.17",
+                "esbuild": "^0.13.2",
                 "fsevents": "~2.3.2",
-                "postcss": "^8.3.6",
+                "postcss": "^8.3.8",
                 "resolve": "^1.20.0",
-                "rollup": "^2.38.5"
+                "rollup": "^2.57.0"
             }
         },
         "vue": {
@@ -18469,13 +18841,13 @@
             }
         },
         "vue-i18n": {
-            "version": "9.1.8",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.8.tgz",
-            "integrity": "sha512-Gmjkt/4ZQtKyCLTjJNGVp+w/dhMpuwuPtgW/Xm9DY0ppSwHRgqMRR6GspnCIYWBxQjzsTT8tIWLPc3SUfKifLA==",
+            "version": "9.1.9",
+            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.9.tgz",
+            "integrity": "sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==",
             "requires": {
-                "@intlify/core-base": "9.1.8",
-                "@intlify/shared": "9.1.8",
-                "@intlify/vue-devtools": "9.1.8",
+                "@intlify/core-base": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9",
                 "@vue/devtools-api": "^6.0.0-beta.7"
             }
         },
diff --git a/package.json b/package.json
index 7202f20d..7511e93d 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
         "build": "vite build",
         "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
+        "test-with-build": "npm run build && npm test",
         "jest": "node test/prepare-jest.js && jest",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host",
@@ -52,7 +53,7 @@
         "@fortawesome/free-regular-svg-icons": "~5.15.4",
         "@fortawesome/free-solid-svg-icons": "~5.15.4",
         "@fortawesome/vue-fontawesome": "~3.0.0-4",
-        "@louislam/sqlite3": "~5.0.6",
+        "@louislam/sqlite3": "~6.0.0",
         "@popperjs/core": "~2.10.2",
         "args-parser": "~1.3.0",
         "axios": "~0.21.4",
@@ -87,7 +88,7 @@
         "vue-chart-3": "~0.5.8",
         "vue-confirm-dialog": "~1.0.2",
         "vue-contenteditable": "~3.0.4",
-        "vue-i18n": "~9.1.8",
+        "vue-i18n": "~9.1.9",
         "vue-image-crop-upload": "~3.0.3",
         "vue-multiselect": "~3.0.0-alpha.2",
         "vue-qrcode": "~1.0.0",
@@ -98,7 +99,7 @@
     "devDependencies": {
         "@babel/eslint-parser": "~7.15.7",
         "@types/bootstrap": "~5.1.6",
-        "@vitejs/plugin-legacy": "~1.5.3",
+        "@vitejs/plugin-legacy": "~1.6.1",
         "@vitejs/plugin-vue": "~1.9.2",
         "@vue/compiler-sfc": "~3.2.19",
         "core-js": "~3.18.1",
@@ -113,7 +114,7 @@
         "stylelint": "~13.13.1",
         "stylelint-config-standard": "~22.0.0",
         "typescript": "~4.4.3",
-        "vite": "~2.5.10"
+        "vite": "~2.6.4"
     },
     "jest": {
         "verbose": true,
@@ -123,6 +124,6 @@
         },
         "testRegex": "./test/*.spec.js",
         "rootDir": ".",
-        "testTimeout": 15000
+        "testTimeout": 30000
     }
 }
diff --git a/server/model/monitor.js b/server/model/monitor.js
index c551fa7d..0e2d84ed 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -166,7 +166,9 @@ class Monitor extends BeanModel {
                         }
                     }
 
-                    debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
+                    if (process.env.TIMELOGGER === "1") {
+                        debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
+                    }
 
                     if (this.type === "http") {
                         bean.status = UP;
@@ -530,6 +532,7 @@ class Monitor extends BeanModel {
         const uptime = await this.calcUptime(duration, monitorID);
         io.to(userID).emit("uptime", monitorID, duration, uptime);
     }
+
 }
 
 module.exports = Monitor;
diff --git a/server/notification-providers/rocket-chat.js b/server/notification-providers/rocket-chat.js
index 14918965..a9bd4009 100644
--- a/server/notification-providers/rocket-chat.js
+++ b/server/notification-providers/rocket-chat.js
@@ -1,5 +1,8 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
+const Slack = require("./slack");
+const { setting } = require("../util-server");
+const { getMonitorRelativeURL, UP, DOWN } = require("../../src/util");
 
 class RocketChat extends NotificationProvider {
 
@@ -10,16 +13,17 @@ class RocketChat extends NotificationProvider {
         try {
             if (heartbeatJSON == null) {
                 let data = {
-                    "text": "Uptime Kuma Rocket.chat testing successful.",
+                    "text": msg,
                     "channel": notification.rocketchannel,
                     "username": notification.rocketusername,
                     "icon_emoji": notification.rocketiconemo,
-                }
-                await axios.post(notification.rocketwebhookURL, data)
+                };
+                await axios.post(notification.rocketwebhookURL, data);
                 return okMsg;
             }
 
             const time = heartbeatJSON["time"];
+
             let data = {
                 "text": "Uptime Kuma Alert",
                 "channel": notification.rocketchannel,
@@ -28,16 +32,32 @@ class RocketChat extends NotificationProvider {
                 "attachments": [
                     {
                         "title": "Uptime Kuma Alert *Time (UTC)*\n" + time,
-                        "title_link": notification.rocketbutton,
                         "text": "*Message*\n" + msg,
-                        "color": "#32cd32"
                     }
                 ]
+            };
+
+            // Color
+            if (heartbeatJSON.status === DOWN) {
+                data.attachments[0].color = "#ff0000";
+            } else {
+                data.attachments[0].color = "#32cd32";
             }
-            await axios.post(notification.rocketwebhookURL, data)
+
+            if (notification.rocketbutton) {
+                await Slack.deprecateURL(notification.rocketbutton);
+            }
+
+            const baseURL = await setting("primaryBaseURL");
+
+            if (baseURL) {
+                data.attachments[0].title_link = baseURL + getMonitorRelativeURL(monitorJSON.id);
+            }
+
+            await axios.post(notification.rocketwebhookURL, data);
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }
diff --git a/server/notification-providers/slack.js b/server/notification-providers/slack.js
index 661df5a0..271ee3dc 100644
--- a/server/notification-providers/slack.js
+++ b/server/notification-providers/slack.js
@@ -1,21 +1,40 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
+const { setSettings, setting } = require("../util-server");
+const { getMonitorRelativeURL } = require("../../src/util");
 
 class Slack extends NotificationProvider {
 
     name = "slack";
 
+    /**
+     * Deprecated property notification.slackbutton
+     * Set it as primary base url if this is not yet set.
+     */
+    static async deprecateURL(url) {
+        let currentPrimaryBaseURL = await setting("primaryBaseURL");
+
+        if (!currentPrimaryBaseURL) {
+            console.log("Move the url to be the primary base URL");
+            await setSettings("general", {
+                primaryBaseURL: url,
+            });
+        } else {
+            console.log("Already there, no need to move the primary base URL");
+        }
+    }
+
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully. ";
         try {
             if (heartbeatJSON == null) {
                 let data = {
-                    "text": "Uptime Kuma Slack testing successful.",
+                    "text": msg,
                     "channel": notification.slackchannel,
                     "username": notification.slackusername,
                     "icon_emoji": notification.slackiconemo,
-                }
-                await axios.post(notification.slackwebhookURL, data)
+                };
+                await axios.post(notification.slackwebhookURL, data);
                 return okMsg;
             }
 
@@ -42,26 +61,35 @@ class Slack extends NotificationProvider {
                         "type": "mrkdwn",
                         "text": "*Time (UTC)*\n" + time,
                     }],
-                },
-                {
-                    "type": "actions",
-                    "elements": [
-                        {
-                            "type": "button",
-                            "text": {
-                                "type": "plain_text",
-                                "text": "Visit Uptime Kuma",
-                            },
-                            "value": "Uptime-Kuma",
-                            "url": notification.slackbutton || "https://github.com/louislam/uptime-kuma",
-                        },
-                    ],
                 }],
+            };
+
+            if (notification.slackbutton) {
+                await Slack.deprecateURL(notification.slackbutton);
             }
-            await axios.post(notification.slackwebhookURL, data)
+
+            const baseURL = await setting("primaryBaseURL");
+
+            // Button
+            if (baseURL) {
+                data.blocks.push({
+                    "type": "actions",
+                    "elements": [{
+                        "type": "button",
+                        "text": {
+                            "type": "plain_text",
+                            "text": "Visit Uptime Kuma",
+                        },
+                        "value": "Uptime-Kuma",
+                        "url": baseURL + getMonitorRelativeURL(monitorJSON.id),
+                    }],
+                });
+            }
+
+            await axios.post(notification.slackwebhookURL, data);
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }
diff --git a/src/assets/app.scss b/src/assets/app.scss
index 7e4fc07e..3072e37c 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -321,7 +321,7 @@ h2 {
     .item {
         display: block;
         text-decoration: none;
-        padding: 14px 15px;
+        padding: 13px 15px 10px 15px;
         border-radius: 10px;
         transition: all ease-in-out 0.15s;
 
diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue
index 459a4ad6..4dc2c712 100644
--- a/src/components/HeartbeatBar.vue
+++ b/src/components/HeartbeatBar.vue
@@ -38,7 +38,7 @@ export default {
             beatMargin: 4,
             move: false,
             maxBeat: -1,
-        };
+        }
     },
     computed: {
 
@@ -69,12 +69,12 @@ export default {
             if (start < 0) {
                 // Add empty placeholder
                 for (let i = start; i < 0; i++) {
-                    placeholders.push(0);
+                    placeholders.push(0)
                 }
                 start = 0;
             }
 
-            return placeholders.concat(this.beatList.slice(start));
+            return placeholders.concat(this.beatList.slice(start))
         },
 
         wrapStyle() {
@@ -84,7 +84,7 @@ export default {
             return {
                 padding: `${topBottom}px ${leftRight}px`,
                 width: "100%",
-            };
+            }
         },
 
         barStyle() {
@@ -94,12 +94,12 @@ export default {
                 return {
                     transition: "all ease-in-out 0.25s",
                     transform: `translateX(${width}px)`,
-                };
+                }
 
             }
             return {
                 transform: "translateX(0)",
-            };
+            }
 
         },
 
@@ -109,7 +109,7 @@ export default {
                 height: this.beatHeight + "px",
                 margin: this.beatMargin + "px",
                 "--hover-scale": this.hoverScale,
-            };
+            }
         },
 
     },
@@ -120,7 +120,7 @@ export default {
 
                 setTimeout(() => {
                     this.move = false;
-                }, 300);
+                }, 300)
             },
             deep: true,
         },
@@ -162,7 +162,7 @@ export default {
     methods: {
         resize() {
             if (this.$refs.wrap) {
-                this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatMargin * 2));
+                this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatMargin * 2))
             }
         },
 
@@ -170,7 +170,7 @@ export default {
             return `${this.$root.datetime(beat.time)} - ${beat.msg}`;
         }
     },
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -183,9 +183,6 @@ export default {
 }
 
 .hp-bar-big {
-    display: flex;
-    justify-content: flex-end;
-
     .beat {
         display: inline-block;
         background-color: $primary;
diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue
index 54c5873e..bd771f8f 100644
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@@ -3,10 +3,10 @@
         <div class="list-header">
             <div class="placeholder"></div>
             <div class="search-wrapper">
-                <a v-if="!searchText" class="search-icon">
+                <a v-if="searchText == ''" class="search-icon">
                     <font-awesome-icon icon="search" />
                 </a>
-                <a v-if="searchText" class="search-icon" @click="clearSearchText">
+                <a v-if="searchText != ''" class="search-icon" @click="clearSearchText">
                     <font-awesome-icon icon="times" />
                 </a>
                 <input v-model="searchText" class="form-control search-input" :placeholder="$t('Search...')" />
@@ -19,21 +19,21 @@
 
             <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }">
                 <div class="row">
-                    <div class="col-6 col-md-8 small-padding" :class="{ 'monitorItem': $root.userHeartbeatBar === 'bottom' || $root.userHeartbeatBar === 'none' }">
+                    <div class="col-9 col-md-8 small-padding" :class="{ 'monitorItem': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
                         <div class="info">
                             <Uptime :monitor="item" type="24" :pill="true" />
-                            <span class="ms-1">{{ item.name }}</span>
+                            {{ item.name }}
                         </div>
                         <div class="tags">
                             <Tag v-for="tag in item.tags" :key="tag" :item="tag" :size="'sm'" />
                         </div>
                     </div>
-                    <div v-show="$root.userHeartbeatBar === 'normal'" :key="$root.userHeartbeatBar" class="col-6 col-md-4 small-padding">
+                    <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-3 col-md-4">
                         <HeartbeatBar size="small" :monitor-id="item.id" />
                     </div>
                 </div>
 
-                <div v-if="$root.userHeartbeatBar === 'bottom'" class="row">
+                <div v-if="$root.userHeartbeatBar == 'bottom'" class="row">
                     <div class="col-12">
                         <HeartbeatBar size="small" :monitor-id="item.id" />
                     </div>
@@ -47,6 +47,7 @@
 import HeartbeatBar from "../components/HeartbeatBar.vue";
 import Uptime from "../components/Uptime.vue";
 import Tag from "../components/Tag.vue";
+import { getMonitorRelativeURL } from "../util.ts";
 
 export default {
     components: {
@@ -95,7 +96,7 @@ export default {
 
             // Simple filter by search text
             // finds monitor name, tag name or tag value
-            if (this.searchText) {
+            if (this.searchText != "") {
                 const loweredSearchText = this.searchText.toLowerCase();
                 result = result.filter(monitor => {
                     return monitor.name.toLowerCase().includes(loweredSearchText)
@@ -109,7 +110,7 @@ export default {
     },
     methods: {
         monitorURL(id) {
-            return "/dashboard/" + id;
+            return getMonitorRelativeURL(id);
         },
         clearSearchText() {
             this.searchText = "";
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 78d89091..659f5726 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -68,11 +68,11 @@
 </template>
 
 <script lang="ts">
-import { Modal } from "bootstrap"
-import { ucfirst } from "../util.ts"
+import { Modal } from "bootstrap";
+import { ucfirst } from "../util.ts";
 
 import Confirm from "./Confirm.vue";
-import NotificationFormList from "./notifications"
+import NotificationFormList from "./notifications";
 
 export default {
     components: {
@@ -93,41 +93,40 @@ export default {
                 isDefault: false,
                 // Do not set default value here, please scroll to show()
             }
-        }
+        };
     },
 
     computed: {
         currentForm() {
             if (!this.notification.type) {
-                return null
+                return null;
             }
-            return NotificationFormList[this.notification.type]
+            return NotificationFormList[this.notification.type];
         }
     },
 
     watch: {
         "notification.type"(to, from) {
             let oldName;
-
             if (from) {
-                oldName = `My ${ucfirst(from)} Alert (1)`;
+                oldName = this.getUniqueDefaultName(from);
             } else {
                 oldName = "";
             }
 
             if (! this.notification.name || this.notification.name === oldName) {
-                this.notification.name = `My ${ucfirst(to)} Alert (1)`
+                this.notification.name = this.getUniqueDefaultName(to);
             }
         },
     },
     mounted() {
-        this.modal = new Modal(this.$refs.modal)
+        this.modal = new Modal(this.$refs.modal);
     },
     methods: {
 
         deleteConfirm() {
             this.modal.hide();
-            this.$refs.confirmDelete.show()
+            this.$refs.confirmDelete.show();
         },
 
         show(notificationID) {
@@ -146,19 +145,19 @@ export default {
                     name: "",
                     type: null,
                     isDefault: false,
-                }
+                };
 
                 // Set Default value here
                 this.notification.type = this.notificationTypes[0];
             }
 
-            this.modal.show()
+            this.modal.show();
         },
 
         submit() {
             this.processing = true;
             this.$root.getSocket().emit("addNotification", this.notification, this.id, (res) => {
-                this.$root.toastRes(res)
+                this.$root.toastRes(res);
                 this.processing = false;
 
                 if (res.ok) {
@@ -170,30 +169,45 @@ export default {
                     }
 
                 }
-            })
+            });
         },
 
         test() {
             this.processing = true;
             this.$root.getSocket().emit("testNotification", this.notification, (res) => {
-                this.$root.toastRes(res)
+                this.$root.toastRes(res);
                 this.processing = false;
-            })
+            });
         },
 
         deleteNotification() {
             this.processing = true;
             this.$root.getSocket().emit("deleteNotification", this.id, (res) => {
-                this.$root.toastRes(res)
+                this.$root.toastRes(res);
                 this.processing = false;
 
                 if (res.ok) {
-                    this.modal.hide()
+                    this.modal.hide();
                 }
-            })
+            });
         },
+        /**
+         * @param {keyof NotificationFormList} notificationKey
+         * @return {string}
+         */
+        getUniqueDefaultName(notificationKey) {
+            let index = 1;
+            let name = "";
+            do {
+                name = this.$t("defaultNotificationName", {
+                    notification: this.$t(notificationKey).replace(/\(.+\)/, "").trim(),
+                    number: index++
+                });
+            } while (this.$root.notificationList.find(it => it.name === name));
+            return name;
+        }
     },
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/TagsManager.vue b/src/components/TagsManager.vue
index 7fc78a34..2412f7e8 100644
--- a/src/components/TagsManager.vue
+++ b/src/components/TagsManager.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <h4 class="mb-3">{{ $t("Tags") }}</h4>
-        <div class="mb-3 p-1">
+        <h4 class="mt-5 mb-3">{{ $t("Tags") }}</h4>
+        <div v-if="selectedTags.length > 0" class="mb-2 p-1">
             <tag
                 v-for="item in selectedTags"
                 :key="item.id"
@@ -124,8 +124,8 @@
 import { Modal } from "bootstrap";
 import VueMultiselect from "vue-multiselect";
 import Tag from "../components/Tag.vue";
-import { useToast } from "vue-toastification"
-const toast = useToast()
+import { useToast } from "vue-toastification";
+const toast = useToast();
 
 export default {
     components: {
@@ -186,7 +186,7 @@ export default {
                     color: "#7C3AED" },
                 { name: this.$t("Pink"),
                     color: "#DB2777" },
-            ]
+            ];
         },
         validateDraftTag() {
             let nameInvalid = false;
@@ -227,7 +227,7 @@ export default {
                 invalid,
                 nameInvalid,
                 valueInvalid,
-            }
+            };
         },
     },
     mounted() {
@@ -243,7 +243,7 @@ export default {
                 if (res.ok) {
                     this.existingTags = res.tags;
                 } else {
-                    toast.error(res.msg)
+                    toast.error(res.msg);
                 }
             });
         },
@@ -277,7 +277,7 @@ export default {
                         name: this.newDraftTag.select.name,
                         value: this.newDraftTag.value,
                         new: true,
-                    })
+                    });
                 }
             } else {
                 // Add new Tag
@@ -286,7 +286,7 @@ export default {
                     name: this.newDraftTag.name.trim(),
                     value: this.newDraftTag.value,
                     new: true,
-                })
+                });
             }
             this.clearDraftTag();
         },
@@ -348,7 +348,7 @@ export default {
                         if (tag.name == newTag.name && tag.color == newTag.color) {
                             tag.id = newTagResult.id;
                         }
-                    })
+                    });
                 } else {
                     tagId = newTag.id;
                 }
diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index a7931c1b..a4bf22f6 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -22,33 +22,33 @@ export default {
                 return Math.round(this.$root.uptimeList[key] * 10000) / 100 + "%";
             }
 
-            return this.$t("notAvailableShort");
+            return this.$t("notAvailableShort")
         },
 
         color() {
             if (this.lastHeartBeat.status === 0) {
-                return "danger";
+                return "danger"
             }
 
             if (this.lastHeartBeat.status === 1) {
-                return "primary";
+                return "primary"
             }
 
             if (this.lastHeartBeat.status === 2) {
-                return "warning";
+                return "warning"
             }
 
-            return "secondary";
+            return "secondary"
         },
 
         lastHeartBeat() {
             if (this.monitor.id in this.$root.lastHeartbeatList && this.$root.lastHeartbeatList[this.monitor.id]) {
-                return this.$root.lastHeartbeatList[this.monitor.id];
+                return this.$root.lastHeartbeatList[this.monitor.id]
             }
 
             return {
                 status: -1,
-            };
+            }
         },
 
         className() {
@@ -59,7 +59,7 @@ export default {
             return "";
         },
     },
-};
+}
 </script>
 
 <style>
diff --git a/src/components/notifications/Apprise.vue b/src/components/notifications/Apprise.vue
index de3fe52b..c10e23cf 100644
--- a/src/components/notifications/Apprise.vue
+++ b/src/components/notifications/Apprise.vue
@@ -1,20 +1,21 @@
 <template>
     <div class="mb-3">
-        <label for="apprise-url" class="form-label">Apprise URL</label>
+        <label for="apprise-url" class="form-label">{{ $t("Apprise URL") }}</label>
         <input id="apprise-url" v-model="$parent.notification.appriseURL" type="text" class="form-control" required>
         <div class="form-text">
-            <p>Example: twilio://AccountSid:AuthToken@FromPhoneNo</p>
-            <p>
-                Read more: <a href="https://github.com/caronc/apprise/wiki#notification-services" target="_blank">https://github.com/caronc/apprise/wiki#notification-services</a>
-            </p>
+            <p>{{ $t("Example:", ["twilio://AccountSid:AuthToken@FromPhoneNo"]) }}</p>
+            <i18n-t tag="p" keypath="Read more:">
+                <a href="https://github.com/caronc/apprise/wiki#notification-services" target="_blank">https://github.com/caronc/apprise/wiki#notification-services</a>
+            </i18n-t>
         </div>
     </div>
     <div class="mb-3">
-        <p>
-            Status:
-            <span v-if="appriseInstalled" class="text-primary">Apprise is installed</span>
-            <span v-else class="text-danger">Apprise is not installed. <a href="https://github.com/caronc/apprise" target="_blank">Read more</a></span>
-        </p>
+        <i18n-t tag="p" keypath="Status:">
+            <span v-if="appriseInstalled" class="text-primary">{{ $t("appriseInstalled") }}</span>
+            <i18n-t v-else tag="span" keypath="appriseNotInstalled" class="text-danger">
+                <a href="https://github.com/caronc/apprise" target="_blank">{{ $t("Read more") }}</a>
+            </i18n-t>
+        </i18n-t>
     </div>
 </template>
 
@@ -23,12 +24,12 @@ export default {
     data() {
         return {
             appriseInstalled: false
-        }
+        };
     },
     mounted() {
         this.$root.getSocket().emit("checkApprise", (installed) => {
             this.appriseInstalled = installed;
-        })
+        });
     },
-}
+};
 </script>
diff --git a/src/components/notifications/Discord.vue b/src/components/notifications/Discord.vue
index c45a5262..99389d29 100644
--- a/src/components/notifications/Discord.vue
+++ b/src/components/notifications/Discord.vue
@@ -1,20 +1,19 @@
 <template>
     <div class="mb-3">
-        <label for="discord-webhook-url" class="form-label">Discord Webhook URL</label>
+        <label for="discord-webhook-url" class="form-label">{{ $t("Discord Webhook URL") }}</label>
         <input id="discord-webhook-url" v-model="$parent.notification.discordWebhookUrl" type="text" class="form-control" required autocomplete="false">
         <div class="form-text">
-            You can get this by going to Server Settings -> Integrations -> Create Webhook
+            {{ $t("wayToGetDiscordURL") }}
         </div>
     </div>
 
     <div class="mb-3">
-        <label for="discord-username" class="form-label">Bot Display Name</label>
+        <label for="discord-username" class="form-label">{{ $t("Bot Display Name") }}</label>
         <input id="discord-username" v-model="$parent.notification.discordUsername" type="text" class="form-control" autocomplete="false" :placeholder="$root.appName">
     </div>
 
-
     <div class="mb-3">
-        <label for="discord-prefix-message" class="form-label">Prefix Custom Message</label>
-        <input id="discord-prefix-message" v-model="$parent.notification.discordPrefixMessage" type="text" class="form-control" autocomplete="false" placeholder="Hello @everyone is...">
+        <label for="discord-prefix-message" class="form-label">{{ $t("Prefix Custom Message") }}</label>
+        <input id="discord-prefix-message" v-model="$parent.notification.discordPrefixMessage" type="text" class="form-control" autocomplete="false" :placeholder="$t('Hello @everyone is...')">
     </div>
 </template>
diff --git a/src/components/notifications/Gotify.vue b/src/components/notifications/Gotify.vue
index f8039d58..9e16d4e4 100644
--- a/src/components/notifications/Gotify.vue
+++ b/src/components/notifications/Gotify.vue
@@ -1,17 +1,17 @@
 <template>
     <div class="mb-3">
-        <label for="gotify-application-token" class="form-label">Application Token</label>
+        <label for="gotify-application-token" class="form-label">{{ $t("Application Token") }}</label>
         <HiddenInput id="gotify-application-token" v-model="$parent.notification.gotifyapplicationToken" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="gotify-server-url" class="form-label">Server URL</label>
+        <label for="gotify-server-url" class="form-label">{{ $t("Server URL") }}</label>
         <div class="input-group mb-3">
             <input id="gotify-server-url" v-model="$parent.notification.gotifyserverurl" type="text" class="form-control" required>
         </div>
     </div>
 
     <div class="mb-3">
-        <label for="gotify-priority" class="form-label">Priority</label>
+        <label for="gotify-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="gotify-priority" v-model="$parent.notification.gotifyPriority" type="number" class="form-control" required min="0" max="10" step="1">
     </div>
 </template>
diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index 7d5312c3..cb52c0c1 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -1,21 +1,21 @@
 <template>
     <div class="mb-3">
-        <label for="line-channel-access-token" class="form-label">Channel access token</label>
+        <label for="line-channel-access-token" class="form-label">{{ $t("Channel access token") }}</label>
         <HiddenInput id="line-channel-access-token" v-model="$parent.notification.lineChannelAccessToken" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
-    <div class="form-text">
-        Line Developers Console - <b>Basic Settings</b>
-    </div>
+    <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
+        <b>{{ $t("Basic Settings") }}</b>
+    </i18n-t>
     <div class="mb-3" style="margin-top: 12px;">
         <label for="line-user-id" class="form-label">User ID</label>
         <input id="line-user-id" v-model="$parent.notification.lineUserID" type="text" class="form-control" required>
     </div>
-    <div class="form-text">
-        Line Developers Console - <b>Messaging API</b>
-    </div>
-    <div class="form-text" style="margin-top: 8px;">
-        First access the <a href="https://developers.line.biz/console/" target="_blank">Line Developers Console</a>, create a provider and channel (Messaging API), then you can get the channel access token and user id from the above mentioned menu items.
-    </div>
+    <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
+        <b>{{ $t("Messaging API") }}</b>
+    </i18n-t>
+    <i18n-t tag="div" keypath="wayToGetLineChannelToken" class="form-text" style="margin-top: 8px;">
+        <a href="https://developers.line.biz/console/" target="_blank">{{ $t("Line Developers Console") }}</a>
+    </i18n-t>
 </template>
 
 <script>
@@ -25,5 +25,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>
diff --git a/src/components/notifications/LunaSea.vue b/src/components/notifications/LunaSea.vue
index 1511f411..34a98688 100644
--- a/src/components/notifications/LunaSea.vue
+++ b/src/components/notifications/LunaSea.vue
@@ -1,9 +1,9 @@
 <template>
     <div class="mb-3">
-        <label for="lunasea-device" class="form-label">LunaSea Device ID<span style="color: red;"><sup>*</sup></span></label>
+        <label for="lunasea-device" class="form-label">{{ $t("LunaSea Device ID") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="lunasea-device" v-model="$parent.notification.lunaseaDevice" type="text" class="form-control" required>
         <div class="form-text">
-            <p><span style="color: red;"><sup>*</sup></span>Required</p>
+            <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
         </div>
     </div>
 </template>
diff --git a/src/components/notifications/Mattermost.vue b/src/components/notifications/Mattermost.vue
index 3e1a7bdc..2d174146 100644
--- a/src/components/notifications/Mattermost.vue
+++ b/src/components/notifications/Mattermost.vue
@@ -1,32 +1,32 @@
 <template>
     <div class="mb-3">
-        <label for="mattermost-webhook-url" class="form-label">Webhook URL<span style="color:red;"><sup>*</sup></span></label>
+        <label for="mattermost-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color:red;"><sup>*</sup></span></label>
         <input id="mattermost-webhook-url" v-model="$parent.notification.mattermostWebhookUrl" type="text" class="form-control" required>
-        <label for="mattermost-username" class="form-label">Username</label>
+        <label for="mattermost-username" class="form-label">{{ $t("Username") }}</label>
         <input id="mattermost-username" v-model="$parent.notification.mattermostusername" type="text" class="form-control">
-        <label for="mattermost-iconurl" class="form-label">Icon URL</label>
+        <label for="mattermost-iconurl" class="form-label">{{ $t("Icon URL") }}</label>
         <input id="mattermost-iconurl" v-model="$parent.notification.mattermosticonurl" type="text" class="form-control">
-        <label for="mattermost-iconemo" class="form-label">Icon Emoji</label>
+        <label for="mattermost-iconemo" class="form-label">{{ $t("Icon Emoji") }}</label>
         <input id="mattermost-iconemo" v-model="$parent.notification.mattermosticonemo" type="text" class="form-control">
-        <label for="mattermost-channel" class="form-label">Channel Name</label>
+        <label for="mattermost-channel" class="form-label">{{ $t("Channel Name") }}</label>
         <input id="mattermost-channel-name" v-model="$parent.notification.mattermostchannel" type="text" class="form-control">
         <div class="form-text">
-            <span style="color:red;"><sup>*</sup></span>Required
+            <span style="color:red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">https://docs.mattermost.com/developer/webhooks-incoming.html</a>
+            </i18n-t>
             <p style="margin-top: 8px;">
-                More info about webhooks on: <a href="https://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">https://docs.mattermost.com/developer/webhooks-incoming.html</a>
+                {{ $t("aboutMattermostChannelName") }}
             </p>
             <p style="margin-top: 8px;">
-                You can override the default channel that webhook posts to by entering the channel name into "Channel Name" field. This needs to be enabled in Mattermost webhook settings. Ex: #other-channel
+                {{ $t("aboutKumaURL") }}
             </p>
             <p style="margin-top: 8px;">
-                If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.
-            </p>
-            <p style="margin-top: 8px;">
-                You can provide a link to a picture in "Icon URL" to override the default profile picture. Will not be used if Icon Emoji is set.
-            </p>
-            <p style="margin-top: 8px;">
-                Emoji cheat sheet: <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a> Note: emoji takes preference over Icon URL.
+                {{ $t("aboutIconURL") }}
             </p>
+            <i18n-t tag="p" keypath="emojiCheatSheet" style="margin-top: 8px;">
+                <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
+            </i18n-t>
         </div>
     </div>
 </template>
diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue
index 8c0bd25f..c75e87d3 100644
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@@ -16,27 +16,27 @@
         <input id="octopush-login" v-model="$parent.notification.octopushLogin" type="text" class="form-control" required>
     </div>
     <div class="mb-3">
-        <label for="octopush-type-sms" class="form-label">SMS Type</label>
+        <label for="octopush-type-sms" class="form-label">{{ $t("SMS Type") }}</label>
         <select id="octopush-type-sms" v-model="$parent.notification.octopushSMSType" class="form-select">
-            <option value="sms_premium">Premium (Fast - recommended for alerting)</option>
-            <option value="sms_low_cost">Low Cost (Slow, sometimes blocked by operator)</option>
+            <option value="sms_premium">{{ $t("octopushTypePremium") }}</option>
+            <option value="sms_low_cost">{{ $t("octopushTypeLowCost") }}</option>
         </select>
-        <div class="form-text">
-            Check octopush prices <a href="https://octopush.com/tarifs-sms-international/" target="_blank">https://octopush.com/tarifs-sms-international/</a>.
-        </div>
+        <i18n-t tag="div" keypath="Check octopush prices" class="form-text">
+            <a href="https://octopush.com/tarifs-sms-international/" target="_blank">https://octopush.com/tarifs-sms-international/</a>
+        </i18n-t>
     </div>
     <div class="mb-3">
-        <label for="octopush-phone-number" class="form-label">Phone number (intl format, eg : +33612345678) </label>
+        <label for="octopush-phone-number" class="form-label">{{ $t("octopushPhoneNumber") }}</label>
         <input id="octopush-phone-number" v-model="$parent.notification.octopushPhoneNumber" type="text" class="form-control" required>
     </div>
     <div class="mb-3">
-        <label for="octopush-sender-name" class="form-label">SMS Sender Name : 3-11 alphanumeric characters and space (a-zA-Z0-9)</label>
+        <label for="octopush-sender-name" class="form-label">{{ $t("octopushSMSSender") }}</label>
         <input id="octopush-sender-name" v-model="$parent.notification.octopushSenderName" type="text" minlength="3" maxlength="11" class="form-control">
     </div>
 
-    <p style="margin-top: 8px;">
-        More info on: <a href="https://octopush.com/api-sms-documentation/envoi-de-sms/" target="_blank">https://octopush.com/api-sms-documentation/envoi-de-sms/</a>
-    </p>
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="https://octopush.com/api-sms-documentation/envoi-de-sms/" target="_blank">https://octopush.com/api-sms-documentation/envoi-de-sms/</a>
+    </i18n-t>
 </template>
 
 <script>
@@ -46,5 +46,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>
diff --git a/src/components/notifications/Pushbullet.vue b/src/components/notifications/Pushbullet.vue
index 2c805e0a..37a2e095 100644
--- a/src/components/notifications/Pushbullet.vue
+++ b/src/components/notifications/Pushbullet.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="mb-3">
-        <label for="pushbullet-access-token" class="form-label">Access Token</label>
+        <label for="pushbullet-access-token" class="form-label">{{ $t("Access Token") }}</label>
         <HiddenInput id="pushbullet-access-token" v-model="$parent.notification.pushbulletAccessToken" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
 
-    <p style="margin-top: 8px;">
-        More info on: <a href="https://docs.pushbullet.com" target="_blank">https://docs.pushbullet.com</a>
-    </p>
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="https://docs.pushbullet.com" target="_blank">https://docs.pushbullet.com</a>
+    </i18n-t>
 </template>
 
 <script>
@@ -16,5 +16,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>
diff --git a/src/components/notifications/Pushover.vue b/src/components/notifications/Pushover.vue
index ae836b5c..af6e9d83 100644
--- a/src/components/notifications/Pushover.vue
+++ b/src/components/notifications/Pushover.vue
@@ -1,14 +1,14 @@
 <template>
     <div class="mb-3">
-        <label for="pushover-user" class="form-label">User Key<span style="color: red;"><sup>*</sup></span></label>
+        <label for="pushover-user" class="form-label">{{ $t("User Key") }}<span style="color: red;"><sup>*</sup></span></label>
         <HiddenInput id="pushover-user" v-model="$parent.notification.pushoveruserkey" :required="true" autocomplete="one-time-code"></HiddenInput>
-        <label for="pushover-app-token" class="form-label">Application Token<span style="color: red;"><sup>*</sup></span></label>
+        <label for="pushover-app-token" class="form-label">{{ $t("Application Token") }}<span style="color: red;"><sup>*</sup></span></label>
         <HiddenInput id="pushover-app-token" v-model="$parent.notification.pushoverapptoken" :required="true" autocomplete="one-time-code"></HiddenInput>
-        <label for="pushover-device" class="form-label">Device</label>
+        <label for="pushover-device" class="form-label">{{ $t("Device") }}</label>
         <input id="pushover-device" v-model="$parent.notification.pushoverdevice" type="text" class="form-control">
-        <label for="pushover-device" class="form-label">Message Title</label>
+        <label for="pushover-device" class="form-label">{{ $t("Message Title") }}</label>
         <input id="pushover-title" v-model="$parent.notification.pushovertitle" type="text" class="form-control">
-        <label for="pushover-priority" class="form-label">Priority</label>
+        <label for="pushover-priority" class="form-label">{{ $t("Priority") }}</label>
         <select id="pushover-priority" v-model="$parent.notification.pushoverpriority" class="form-select">
             <option>-2</option>
             <option>-1</option>
@@ -16,7 +16,7 @@
             <option>1</option>
             <option>2</option>
         </select>
-        <label for="pushover-sound" class="form-label">Notification Sound</label>
+        <label for="pushover-sound" class="form-label">{{ $t("Notification Sound") }}</label>
         <select id="pushover-sound" v-model="$parent.notification.pushoversounds" class="form-select">
             <option>pushover</option>
             <option>bike</option>
@@ -42,15 +42,15 @@
             <option>none</option>
         </select>
         <div class="form-text">
-            <span style="color: red;"><sup>*</sup></span>Required
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+                <a href="https://pushover.net/api" target="_blank">https://pushover.net/api</a>
+            </i18n-t>
             <p style="margin-top: 8px;">
-                More info on: <a href="https://pushover.net/api" target="_blank">https://pushover.net/api</a>
+                {{ $t("pushoverDesc1") }}
             </p>
             <p style="margin-top: 8px;">
-                Emergency priority (2) has default 30 second timeout between retries and will expire after 1 hour.
-            </p>
-            <p style="margin-top: 8px;">
-                If you want to send notifications to different devices, fill out Device field.
+                {{ $t("pushoverDesc2") }}
             </p>
         </div>
     </div>
diff --git a/src/components/notifications/Pushy.vue b/src/components/notifications/Pushy.vue
index 64e4ef9c..26f404d2 100644
--- a/src/components/notifications/Pushy.vue
+++ b/src/components/notifications/Pushy.vue
@@ -10,9 +10,9 @@
             <HiddenInput id="pushy-user-key" v-model="$parent.notification.pushyToken" :required="true" autocomplete="one-time-code"></HiddenInput>
         </div>
     </div>
-    <p style="margin-top: 8px;">
-        More info on: <a href="https://pushy.me/docs/api/send-notifications" target="_blank">https://pushy.me/docs/api/send-notifications</a>
-    </p>
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="https://pushy.me/docs/api/send-notifications" target="_blank">https://pushy.me/docs/api/send-notifications</a>
+    </i18n-t>
 </template>
 
 <script>
@@ -22,5 +22,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>
diff --git a/src/components/notifications/RocketChat.vue b/src/components/notifications/RocketChat.vue
index 0776a154..ed90fb75 100644
--- a/src/components/notifications/RocketChat.vue
+++ b/src/components/notifications/RocketChat.vue
@@ -1,29 +1,27 @@
 <template>
     <div class="mb-3">
-        <label for="rocket-webhook-url" class="form-label">Webhook URL<span style="color: red;"><sup>*</sup></span></label>
+        <label for="rocket-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="rocket-webhook-url" v-model="$parent.notification.rocketwebhookURL" type="text" class="form-control" required>
-        <label for="rocket-username" class="form-label">Username</label>
+        <label for="rocket-username" class="form-label">{{ $t("Username") }}</label>
         <input id="rocket-username" v-model="$parent.notification.rocketusername" type="text" class="form-control">
-        <label for="rocket-iconemo" class="form-label">Icon Emoji</label>
+        <label for="rocket-iconemo" class="form-label">{{ $t("Icon Emoji") }}</label>
         <input id="rocket-iconemo" v-model="$parent.notification.rocketiconemo" type="text" class="form-control">
-        <label for="rocket-channel" class="form-label">Channel Name</label>
+        <label for="rocket-channel" class="form-label">{{ $t("Channel Name") }}</label>
         <input id="rocket-channel-name" v-model="$parent.notification.rocketchannel" type="text" class="form-control">
-        <label for="rocket-button-url" class="form-label">Uptime Kuma URL</label>
-        <input id="rocket-button" v-model="$parent.notification.rocketbutton" type="text" class="form-control">
         <div class="form-text">
-            <span style="color: red;"><sup>*</sup></span>Required
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://docs.rocket.chat/guides/administration/administration/integrations" target="_blank">https://api.slack.com/messaging/webhooks</a>
+            </i18n-t>
             <p style="margin-top: 8px;">
-                More info about webhooks on: <a href="https://docs.rocket.chat/guides/administration/administration/integrations" target="_blank">https://api.slack.com/messaging/webhooks</a>
+                {{ $t("aboutChannelName", [$t("rocket.chat")]) }}
             </p>
             <p style="margin-top: 8px;">
-                Enter the channel name on Rocket.chat Channel Name field if you want to bypass the webhook channel. Ex: #other-channel
-            </p>
-            <p style="margin-top: 8px;">
-                If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.
-            </p>
-            <p style="margin-top: 8px;">
-                Emoji cheat sheet: <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
+                {{ $t("aboutKumaURL") }}
             </p>
+            <i18n-t tag="p" keypath="emojiCheatSheet" style="margin-top: 8px;">
+                <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
+            </i18n-t>
         </div>
     </div>
 </template>
diff --git a/src/components/notifications/SMTP.vue b/src/components/notifications/SMTP.vue
index 0656b139..72934cda 100644
--- a/src/components/notifications/SMTP.vue
+++ b/src/components/notifications/SMTP.vue
@@ -12,8 +12,8 @@
     <div class="mb-3">
         <label for="secure" class="form-label">Secure</label>
         <select id="secure" v-model="$parent.notification.smtpSecure" class="form-select">
-            <option :value="false">None / STARTTLS (25, 587)</option>
-            <option :value="true">TLS (465)</option>
+            <option :value="false">{{ $t("secureOptionNone") }}</option>
+            <option :value="true">{{ $t("secureOptionTLS") }}</option>
         </select>
     </div>
 
@@ -21,7 +21,7 @@
         <div class="form-check">
             <input id="ignore-tls-error" v-model="$parent.notification.smtpIgnoreTLSError" class="form-check-input" type="checkbox" value="">
             <label class="form-check-label" for="ignore-tls-error">
-                Ignore TLS Error
+                {{ $t("Ignore TLS Error") }}
             </label>
         </div>
     </div>
@@ -37,24 +37,24 @@
     </div>
 
     <div class="mb-3">
-        <label for="from-email" class="form-label">From Email</label>
+        <label for="from-email" class="form-label">{{ $t("From Email") }}</label>
         <input id="from-email" v-model="$parent.notification.smtpFrom" type="text" class="form-control" required autocomplete="false" placeholder="&quot;Uptime Kuma&quot; &lt;example@kuma.pet&gt;">
         <div class="form-text">
         </div>
     </div>
 
     <div class="mb-3">
-        <label for="to-email" class="form-label">To Email</label>
+        <label for="to-email" class="form-label">{{ $t("To Email") }}</label>
         <input id="to-email" v-model="$parent.notification.smtpTo" type="text" class="form-control" autocomplete="false" placeholder="example2@kuma.pet, example3@kuma.pet" :required="!hasRecipient">
     </div>
 
     <div class="mb-3">
-        <label for="to-cc" class="form-label">CC</label>
+        <label for="to-cc" class="form-label">{{ $t("smtpCC") }}</label>
         <input id="to-cc" v-model="$parent.notification.smtpCC" type="text" class="form-control" autocomplete="false" :required="!hasRecipient">
     </div>
 
     <div class="mb-3">
-        <label for="to-bcc" class="form-label">BCC</label>
+        <label for="to-bcc" class="form-label">{{ $t("smtpBCC") }}</label>
         <input id="to-bcc" v-model="$parent.notification.smtpBCC" type="text" class="form-control" autocomplete="false" :required="!hasRecipient">
     </div>
 </template>
diff --git a/src/components/notifications/Signal.vue b/src/components/notifications/Signal.vue
index 8598d07f..e3c9e7aa 100644
--- a/src/components/notifications/Signal.vue
+++ b/src/components/notifications/Signal.vue
@@ -1,23 +1,25 @@
 <template>
     <div class="mb-3">
-        <label for="signal-url" class="form-label">Post URL</label>
+        <label for="signal-url" class="form-label">{{ $t("Post URL") }}</label>
         <input id="signal-url" v-model="$parent.notification.signalURL" type="url" pattern="https?://.+" class="form-control" required>
     </div>
 
     <div class="mb-3">
-        <label for="signal-number" class="form-label">Number</label>
+        <label for="signal-number" class="form-label">{{ $t("Number") }}</label>
         <input id="signal-number" v-model="$parent.notification.signalNumber" type="text" class="form-control" required>
     </div>
 
     <div class="mb-3">
-        <label for="signal-recipients" class="form-label">Recipients</label>
+        <label for="signal-recipients" class="form-label">{{ $t("Recipients") }}</label>
         <input id="signal-recipients" v-model="$parent.notification.signalRecipients" type="text" class="form-control" required>
 
         <div class="form-text">
-            You need to have a signal client with REST API.
+            <p style="margin-top: 8px;">
+                {{ $t("needSignalAPI") }}
+            </p>
 
             <p style="margin-top: 8px;">
-                You can check this url to view how to setup one:
+                {{ $t("wayToCheckSignalURL") }}
             </p>
 
             <p style="margin-top: 8px;">
@@ -25,7 +27,7 @@
             </p>
 
             <p style="margin-top: 8px;">
-                IMPORTANT: You cannot mix groups and numbers in recipients!
+                {{ $t("signalImportant") }}
             </p>
         </div>
     </div>
diff --git a/src/components/notifications/Slack.vue b/src/components/notifications/Slack.vue
index 1ec2cdfc..6d220caa 100644
--- a/src/components/notifications/Slack.vue
+++ b/src/components/notifications/Slack.vue
@@ -1,29 +1,28 @@
 <template>
     <div class="mb-3">
-        <label for="slack-webhook-url" class="form-label">Webhook URL<span style="color: red;"><sup>*</sup></span></label>
+        <label for="slack-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="slack-webhook-url" v-model="$parent.notification.slackwebhookURL" type="text" class="form-control" required>
-        <label for="slack-username" class="form-label">Username</label>
+        <label for="slack-username" class="form-label">{{ $t("Username") }}</label>
         <input id="slack-username" v-model="$parent.notification.slackusername" type="text" class="form-control">
-        <label for="slack-iconemo" class="form-label">Icon Emoji</label>
+        <label for="slack-iconemo" class="form-label">{{ $t("Icon Emoji") }}</label>
         <input id="slack-iconemo" v-model="$parent.notification.slackiconemo" type="text" class="form-control">
-        <label for="slack-channel" class="form-label">Channel Name</label>
+        <label for="slack-channel" class="form-label">{{ $t("Channel Name") }}</label>
         <input id="slack-channel-name" v-model="$parent.notification.slackchannel" type="text" class="form-control">
-        <label for="slack-button-url" class="form-label">Uptime Kuma URL</label>
-        <input id="slack-button" v-model="$parent.notification.slackbutton" type="text" class="form-control">
+
         <div class="form-text">
-            <span style="color: red;"><sup>*</sup></span>Required
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://api.slack.com/messaging/webhooks" target="_blank">https://api.slack.com/messaging/webhooks</a>
+            </i18n-t>
             <p style="margin-top: 8px;">
-                More info about webhooks on: <a href="https://api.slack.com/messaging/webhooks" target="_blank">https://api.slack.com/messaging/webhooks</a>
+                {{ $t("aboutChannelName", [$t("slack")]) }}
             </p>
             <p style="margin-top: 8px;">
-                Enter the channel name on Slack Channel Name field if you want to bypass the webhook channel. Ex: #other-channel
-            </p>
-            <p style="margin-top: 8px;">
-                If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.
-            </p>
-            <p style="margin-top: 8px;">
-                Emoji cheat sheet: <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
+                {{ $t("aboutKumaURL") }}
             </p>
+            <i18n-t tag="p" keypath="emojiCheatSheet" style="margin-top: 8px;">
+                <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
+            </i18n-t>
         </div>
     </div>
 </template>
diff --git a/src/components/notifications/Teams.vue b/src/components/notifications/Teams.vue
index 45ba26c8..2bc76486 100644
--- a/src/components/notifications/Teams.vue
+++ b/src/components/notifications/Teams.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mb-3">
-        <label for="teams-webhookurl" class="form-label">Webhook URL</label>
+        <label for="teams-webhookurl" class="form-label">{{ $t("Webhook URL") }}</label>
         <input
             id="teams-webhookurl"
             v-model="$parent.notification.webhookUrl"
@@ -8,12 +8,11 @@
             class="form-control"
             required
         />
-        <div class="form-text">
-            You can learn how to create a webhook url
+        <i18n-t tag="div" keypath="wayToGetTeamsURL" class="form-text">
             <a
                 href="https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook"
                 target="_blank"
-            >here</a>.
-        </div>
+            >{{ $t("here") }}</a>
+        </i18n-t>
     </div>
 </template>
diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index a59c804a..1581c027 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -1,14 +1,14 @@
 <template>
     <div class="mb-3">
-        <label for="telegram-bot-token" class="form-label">Bot Token</label>
+        <label for="telegram-bot-token" class="form-label">{{ $t("Bot Token") }}</label>
         <HiddenInput id="telegram-bot-token" v-model="$parent.notification.telegramBotToken" :required="true" autocomplete="one-time-code"></HiddenInput>
         <div class="form-text">
-            You can get a token from <a href="https://t.me/BotFather" target="_blank">https://t.me/BotFather</a>.
+            {{ $t("You can get a token from") }} <a href="https://t.me/BotFather" target="_blank">https://t.me/BotFather</a>.
         </div>
     </div>
 
     <div class="mb-3">
-        <label for="telegram-chat-id" class="form-label">Chat ID</label>
+        <label for="telegram-chat-id" class="form-label">{{ $t("Chat ID") }}</label>
 
         <div class="input-group mb-3">
             <input id="telegram-chat-id" v-model="$parent.notification.telegramChatID" type="text" class="form-control" required>
@@ -18,10 +18,10 @@
         </div>
 
         <div class="form-text">
-            Support Direct Chat / Group / Channel's Chat ID
+            {{ $t("supportTelegramChatID") }}
 
             <p style="margin-top: 8px;">
-                You can get your chat id by sending message to the bot and go to this url to view the chat_id:
+                {{ $t("wayToGetTelegramChatID") }}
             </p>
 
             <p style="margin-top: 8px;">
@@ -49,7 +49,7 @@ export default {
     },
     computed: {
         telegramGetUpdatesURL() {
-            let token = "<YOUR BOT TOKEN HERE>"
+            let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`
 
             if (this.$parent.notification.telegramBotToken) {
                 token = this.$parent.notification.telegramBotToken;
@@ -71,11 +71,11 @@ export default {
                     } else if (update.message) {
                         this.notification.telegramChatID = update.message.chat.id;
                     } else {
-                        throw new Error("Chat ID is not found, please send a message to this bot first")
+                        throw new Error(this.$t("chatIDNotFound"))
                     }
 
                 } else {
-                    throw new Error("Chat ID is not found, please send a message to this bot first")
+                    throw new Error(this.$t("chatIDNotFound"))
                 }
 
             } catch (error) {
diff --git a/src/components/notifications/Webhook.vue b/src/components/notifications/Webhook.vue
index 1554a83d..3cfc940e 100644
--- a/src/components/notifications/Webhook.vue
+++ b/src/components/notifications/Webhook.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="mb-3">
-        <label for="webhook-url" class="form-label">Post URL</label>
+        <label for="webhook-url" class="form-label">{{ $t("Post URL") }}</label>
         <input id="webhook-url" v-model="$parent.notification.webhookURL" type="url" pattern="https?://.+" class="form-control" required>
     </div>
 
     <div class="mb-3">
-        <label for="webhook-content-type" class="form-label">Content Type</label>
+        <label for="webhook-content-type" class="form-label">{{ $t("Content Type") }}</label>
         <select id="webhook-content-type" v-model="$parent.notification.webhookContentType" class="form-select" required>
             <option value="json">
                 application/json
@@ -17,7 +17,12 @@
 
         <div class="form-text">
             <p>"application/json" is good for any modern http servers such as express.js</p>
-            <p>"multipart/form-data" is good for PHP, you just need to parse the json by <strong>json_decode($_POST['data'])</strong></p>
+            <i18n-t tag="p" keypath="webhookFormDataDesc">
+                <template #multipart>"multipart/form-data"</template>
+                <template #decodeFunction>
+                    <strong>json_decode($_POST['data'])</strong>
+                </template>
+            </i18n-t>
         </div>
     </div>
 </template>
diff --git a/src/i18n.js b/src/i18n.js
index be66a12b..53a73124 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -1,12 +1,10 @@
-import { createI18n } from "vue-i18n";
-import bgBG from "./languages/bg-BG";
+import { createI18n } from "vue-i18n/index";
 import daDK from "./languages/da-DK";
 import deDE from "./languages/de-DE";
 import en from "./languages/en";
-import fa from "./languages/fa";
 import esEs from "./languages/es-ES";
-import ptBR from "./languages/pt-BR";
 import etEE from "./languages/et-EE";
+import fa from "./languages/fa";
 import frFR from "./languages/fr-FR";
 import hu from "./languages/hu";
 import itIT from "./languages/it-IT";
@@ -14,11 +12,13 @@ import ja from "./languages/ja";
 import koKR from "./languages/ko-KR";
 import nlNL from "./languages/nl-NL";
 import pl from "./languages/pl";
+import ptBR from "./languages/pt-BR";
+import bgBG from "./languages/bg-BG";
 import ruRU from "./languages/ru-RU";
 import sr from "./languages/sr";
 import srLatn from "./languages/sr-latn";
-import trTR from "./languages/tr-TR";
 import svSE from "./languages/sv-SE";
+import trTR from "./languages/tr-TR";
 import zhCN from "./languages/zh-CN";
 import zhHK from "./languages/zh-HK";
 
@@ -48,12 +48,13 @@ const languageList = {
 };
 
 const rtlLangs = ["fa"];
-    
+
 export const currentLocale = () => localStorage.locale || "en";
 
 export const localeDirection = () => {
-    return rtlLangs.includes(currentLocale()) ? "rtl" : "ltr"
-}
+    return rtlLangs.includes(currentLocale()) ? "rtl" : "ltr";
+};
+
 export const i18n = createI18n({
     locale: currentLocale(),
     fallbackLocale: "en",
diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index fcf26606..0e915255 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -1,6 +1,6 @@
 export default {
     languageName: "Български",
-    checkEverySecond: "Проверявай на всеки {0} секунди.",
+    checkEverySecond: "Ще се извършва на всеки {0} секунди.",
     retryCheckEverySecond: "Повторен опит на всеки {0} секунди.",
     retriesDescription: "Максимакен брой опити преди услугата да бъде маркирана като недостъпна и да бъде изпратено известие",
     ignoreTLSError: "Игнорирай TLS/SSL грешки за HTTPS уебсайтове",
@@ -9,19 +9,19 @@ export default {
     acceptedStatusCodesDescription: "Изберете статус кодове, които се считат за успешен отговор.",
     passwordNotMatchMsg: "Повторената парола не съвпада.",
     notificationDescription: "Моля, задайте известието към монитор(и), за да функционира.",
-    keywordDescription: "Търсете ключова дума в обикновен html или JSON отговор - чувствителна е към регистъра",
+    keywordDescription: "Търси ключова дума в чист html или JSON отговор - чувствителна е към регистъра",
     pauseDashboardHome: "Пауза",
     deleteMonitorMsg: "Наистина ли желаете да изтриете този монитор?",
-    deleteNotificationMsg: "Наистина ли желаете да изтриете известието за всички монитори?",
-    resoverserverDescription: "Cloudflare е сървърът по подразбиране, можете да промените сървъра по всяко време.",
+    deleteNotificationMsg: "Наистина ли желаете да изтриете това известяване за всички монитори?",
+    resoverserverDescription: "Cloudflare е сървърът по подразбиране, но можете да го промените по всяко време.",
     rrtypeDescription: "Изберете ресурсния запис, който желаете да наблюдавате",
     pauseMonitorMsg: "Наистина ли желаете да поставите в режим пауза?",
-    enableDefaultNotificationDescription: "За всеки нов монитор това известие ще бъде активирано по подразбиране. Можете да изключите известието за всеки отделен монитор.",
+    enableDefaultNotificationDescription: "За всеки нов монитор това известяване ще бъде активирано по подразбиране. Можете да го изключите за всеки отделен монитор.",
     clearEventsMsg: "Наистина ли желаете да изтриете всички събития за този монитор?",
     clearHeartbeatsMsg: "Наистина ли желаете да изтриете всички записи за честотни проверки на този монитор?",
     confirmClearStatisticsMsg: "Наистина ли желаете да изтриете всички статистически данни?",
-    importHandleDescription: "Изберете 'Пропусни съществуващите', ако искате да пропуснете всеки монитор или известие със същото име. 'Презапис' ще изтрие всеки съществуващ монитор и известие.",
-    confirmImportMsg: "Сигурни ли сте за импортирането на архива? Моля, уверете се, че сте избрали правилната опция за импортиране.",
+    importHandleDescription: "Изберете 'Пропусни съществуващите', ако желаете да пропуснете всеки монитор или известяване със същото име. 'Презапис' ще изтрие всеки съществуващ монитор и известяване.",
+    confirmImportMsg: "Сигурни ли сте, че желаете импортирането на архива? Моля, уверете се, че сте избрали правилната опция за импортиране.",
     twoFAVerifyLabel: "Моля, въведете вашия токен код, за да проверите дали 2FA работи",
     tokenValidSettingsMsg: "Токен кодът е валиден! Вече можете да запазите настройките за 2FA.",
     confirmEnableTwoFAMsg: "Сигурни ли сте, че желаете да активирате 2FA?",
@@ -34,32 +34,32 @@ export default {
     Theme: "Тема",
     General: "Общи",
     Version: "Версия",
-    "Check Update On GitHub": "Провери за актуализация в GitHub",
+    "Check Update On GitHub": "Проверка за актуализация в GitHub",
     List: "Списък",
     Add: "Добави",
     "Add New Monitor": "Добави монитор",
     "Quick Stats": "Кратка статистика",
-    Up: "Достъпни",
-    Down: "Недостъпни",
-    Pending: "В изчакване",
-    Unknown: "Неизвестни",
-    Pause: "В пауза",
+    Up: "Достъпен",
+    Down: "Недостъпен",
+    Pending: "Изчаква",
+    Unknown: "Неизвестен",
+    Pause: "Пауза",
     Name: "Име",
     Status: "Статус",
     DateTime: "Дата и час",
-    Message: "Съобщение",
+    Message: "Отговор",
     "No important events": "Няма важни събития",
     Resume: "Възобнови",
     Edit: "Редактирай",
     Delete: "Изтрий",
     Current: "Текущ",
-    Uptime: "Време на работа",
+    Uptime: "Достъпност",
     "Cert Exp.": "Вал. сертификат",
     days: "дни",
     day: "ден",
-    "-day": "-ден",
+    "-day": "-денa",
     hour: "час",
-    "-hour": "-час",
+    "-hour": "-часa",
     Response: "Отговор",
     Ping: "Пинг",
     "Monitor Type": "Монитор тип",
@@ -78,7 +78,7 @@ export default {
     Save: "Запази",
     Notifications: "Известявания",
     "Not available, please setup.": "Не е налично. Моля, настройте.",
-    "Setup Notification": "Настройка за известяване",
+    "Setup Notification": "Настройки за известявания",
     Light: "Светла",
     Dark: "Тъмна",
     Auto: "Автоматично",
@@ -98,9 +98,9 @@ export default {
     "Disable Auth": "Изключи удостоверяване",
     "Enable Auth": "Включи удостоверяване",
     Logout: "Изход от профила",
-    Leave: "Напускам",
+    Leave: "Отказ",
     "I understand, please disable": "Разбирам. Моля, изключи",
-    Confirm: "Потвърди",
+    Confirm: "Потвърдете",
     Yes: "Да",
     No: "Не",
     Username: "Потребител",
@@ -127,7 +127,7 @@ export default {
     "Default enabled": "Включен по подразбиране",
     "Apply on all existing monitors": "Приложи върху всички съществуващи монитори",
     Create: "Създай",
-    "Clear Data": "Изчисти данни",
+    "Clear Data": "Изтрий данни",
     Events: "Събития",
     Heartbeats: "Проверки",
     "Auto Get": "Автоматияно получаване",
@@ -136,7 +136,7 @@ export default {
     backupDescription3: "Чувствителни данни, като токен кодове за известяване, се съдържат в експортирания файл. Моля, бъдете внимателни с неговото съхранение.",
     alertNoFile: "Моля, изберете файл за импортиране.",
     alertWrongFileType: "Моля, изберете JSON файл.",
-    "Clear all statistics": "Изчисти всички статистики",
+    "Clear all statistics": "Изтрий цялата статистика",
     "Skip existing": "Пропусни съществуващите",
     Overwrite: "Презапиши",
     Options: "Опции",
@@ -152,7 +152,7 @@ export default {
     Token: "Токен код",
     "Show URI": "Покажи URI",
     Tags: "Етикети",
-    "Add New below or Select...": "Добави нов по-долу или избери...",
+    "Add New below or Select...": "Добавете нов по-долу или изберете...",
     "Tag with this name already exist.": "Етикет с това име вече съществува.",
     "Tag with this value already exist.": "Етикет с тази стойност вече съществува.",
     color: "цвят",
@@ -171,11 +171,29 @@ export default {
     "Entry Page": "Основна страница",
     statusPageNothing: "Все още няма нищо тук. Моля, добавете група или монитор.",
     "No Services": "Няма Услуги",
-    "All Systems Operational": "Всички системи функционират",
-    "Partially Degraded Service": "Частично влошена услуга",
-    "Degraded Service": "Влошена услуга",
+    "All Systems Operational": "Всички услуги са достъпни",
+    "Partially Degraded Service": "Част от услугите са недостъпни",
+    "Degraded Service": "Всички услуги са недостъпни",
     "Add Group": "Добави група",
     "Add a monitor": "Добави монитор",
-    "Edit Status Page": "Редактирай статус страница",
+    "Edit Status Page": "Редактиране Статус страница",
     "Go to Dashboard": "Към Таблото",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Поддържа 50+ услуги за инвестяване)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
+    "Status Page": "Статус страница",
 };
diff --git a/src/languages/da-DK.js b/src/languages/da-DK.js
index a4df8db8..ad156aef 100644
--- a/src/languages/da-DK.js
+++ b/src/languages/da-DK.js
@@ -1,5 +1,5 @@
 export default {
-    languageName: "Danish",
+    languageName: "Danish (Danmark)",
     Settings: "Indstillinger",
     Dashboard: "Dashboard",
     "New Update": "Opdatering tilgængelig",
@@ -170,7 +170,7 @@ export default {
     "Avg. Ping": "Gns. Ping",
     "Avg. Response": "Gns. Respons",
     "Entry Page": "Entry Side",
-    "statusPageNothing": "Intet her, tilføj venligst en Gruppe eller en Overvåger.",
+    statusPageNothing: "Intet her, tilføj venligst en Gruppe eller en Overvåger.",
     "No Services": "Ingen Tjenester",
     "All Systems Operational": "Alle Systemer i Drift",
     "Partially Degraded Service": "Delvist Forringet Service",
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Tilføj en Overvåger",
     "Edit Status Page": "Rediger Statusside",
     "Go to Dashboard": "Gå til Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index 8f763ddc..a6cc42b3 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -1,5 +1,5 @@
 export default {
-    languageName: "German",
+    languageName: "Deutsch (Deutschland)",
     Settings: "Einstellungen",
     Dashboard: "Dashboard",
     "New Update": "Update Verfügbar",
@@ -178,4 +178,22 @@ export default {
     "Add a monitor": "Monitor hinzufügen",
     "Edit Status Page": "Bearbeite Statusseite",
     "Go to Dashboard": "Gehe zum Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/en.js b/src/languages/en.js
index 46298b01..3395bb30 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -178,21 +178,67 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    // Start notification form
+    defaultNotificationName: "My {notification} Alert ({number})",
+    here: "here",
+    "Required": "Required",
     "telegram": "Telegram",
+    "Bot Token": "Bot Token",
+    "You can get a token from": "You can get a token from",
+    "Chat ID": "Chat ID",
+    supportTelegramChatID: "Support Direct Chat / Group / Channel's Chat ID",
+    wayToGetTelegramChatID: "You can get your chat id by sending message to the bot and go to this url to view the chat_id:",
+    "YOUR BOT TOKEN HERE": "YOUR BOT TOKEN HERE",
+    chatIDNotFound: "Chat ID is not found, please send a message to this bot first",
     "webhook": "Webhook",
+    "Post URL": "Post URL",
+    "Content Type": "Content Type",
+    webhookJsonDesc: "{0} is good for any modern http servers such as express.js",
+    webhookFormDataDesc: "{multipart} is good for PHP, you just need to parse the json by {decodeFunction}",
     "smtp": "Email (SMTP)",
+    secureOptionNone: "None / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "Ignore TLS Error",
+    "From Email": "From Email",
+    "To Email": "To Email",
+    smtpCC: "CC",
+    smtpBCC: "BCC",
     "discord": "Discord",
+    "Discord Webhook URL": "Discord Webhook URL",
+    wayToGetDiscordURL: "You can get this by going to Server Settings -> Integrations -> Create Webhook",
+    "Bot Display Name": "Bot Display Name",
+    "Prefix Custom Message": "Prefix Custom Message",
+    "Hello @everyone is...": "Hello {'@'}everyone is...",
     "teams": "Microsoft Teams",
+    "Webhook URL": "Webhook URL",
+    wayToGetTeamsURL: "You can learn how to create a webhook url {0}.",
     "signal": "Signal",
+    "Number": "Number",
+    "Recipients": "Recipients",
+    needSignalAPI: "You need to have a signal client with REST API.",
+    wayToCheckSignalURL: "You can check this url to view how to setup one:",
+    signalImportant: "IMPORTANT: You cannot mix groups and numbers in recipients!",
     "gotify": "Gotify",
+    "Application Token": "Application Token",
+    "Server URL": "Server URL",
+    "Priority": "Priority",
     "slack": "Slack",
+    "Icon Emoji": "Icon Emoji",
+    "Channel Name": "Channel Name",
+    "Uptime Kuma URL": "Uptime Kuma URL",
+    aboutWebhooks: "More info about webhooks on: {0}",
+    aboutChannelName: "Enter the channel name on {0} Channel Name field if you want to bypass the webhook channel. Ex: #other-channel",
+    aboutKumaURL: "If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.",
+    emojiCheatSheet: "Emoji cheat sheet: {0}",
     "rocket.chat": "Rocket.chat",
-    "pushover": "Pushover",
-    "pushy": "Pushy",
-    "octopush": "Octopush",
-    "lunasea": "LunaSea",
-    "apprise": "Apprise (Support 50+ Notification services)",
-    "pushbullet": "Pushbullet",
-    "line": "Line Messenger",
-    "mattermost": "Mattermost",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
+    // End notification form
 };
diff --git a/src/languages/es-ES.js b/src/languages/es-ES.js
index 8d73d2d6..2558a686 100644
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/et-EE.js b/src/languages/et-EE.js
index fe0c4f1b..a6be8232 100644
--- a/src/languages/et-EE.js
+++ b/src/languages/et-EE.js
@@ -16,7 +16,7 @@ export default {
     rrtypeDescription: "Vali kirje tüüp, mida soovid jälgida.",
     pauseMonitorMsg: "Kas soovid peatada seire?",
     Settings: "Seaded",
-    "Status Page": "Ülevaade", // hääletuse tulemus, teine: seisundileht, kolmas: Olukord/Olek
+    "Status Page": "Ülevaade",
     Dashboard: "Töölaud",
     "New Update": "Uuem tarkvara versioon on saadaval.",
     Language: "Keel",
@@ -44,7 +44,7 @@ export default {
     Edit: "Muuda",
     Delete: "Eemalda",
     Current: "Hetkeseisund",
-    Uptime: "Eluiga", // todo: launchpad?
+    Uptime: "Eluiga",
     "Cert Exp.": "Sert. aegumine",
     days: "päeva",
     day: "päev",
@@ -109,7 +109,7 @@ export default {
     "Create your admin account": "Admininstraatori konto loomine",
     "Repeat Password": "korda salasõna",
     respTime: "Reageerimisaeg (ms)",
-    notAvailableShort: "N/A", // tõlkimata, umbkaudu rahvusvaheline termin peaks sobima piisavalt
+    notAvailableShort: "N/A",
     enableDefaultNotificationDescription: "Kõik järgnevalt lisatud seired kasutavad seda teavitusteenuset. Seiretelt võib teavitusteenuse ühekaupa eemaldada.",
     clearEventsMsg: "Kas soovid seire kõik sündmused kustutada?",
     clearHeartbeatsMsg: "Kas soovid seire kõik tuksed kustutada?",
@@ -122,7 +122,7 @@ export default {
     "Clear Data": "Eemalda andmed",
     Events: "Sündmused",
     Heartbeats: "Tuksed",
-    "Auto Get": "Hangi automaatselt", // hangi? kõlab liiga otsetõlge
+    "Auto Get": "Hangi automaatselt",
     backupDescription: "Varunda kõik seired ja teavitused JSON faili.",
     backupDescription2: "PS: Varukoopia EI sisalda seirete ajalugu ja sündmustikku.",
     backupDescription3: "Varukoopiad sisaldavad teavitusteenusete pääsuvõtmeid.",
@@ -140,7 +140,7 @@ export default {
     "Two Factor Authentication": "Kaksikautentimine",
     Active: "kasutusel",
     Inactive: "seadistamata",
-    Token: "kaksikautentimise kood", // needs to compensate for no title
+    Token: "kaksikautentimise kood",
     "Show URI": "Näita URId",
     "Clear all statistics": "Tühjenda ajalugu",
     importHandleDescription: "'kombineeri' täiendab varukoopiast ja kirjutab üle samanimelised seireid ja teavitusteenused; 'lisa praegustele' jätab olemasolevad puutumata; 'asenda' kustutab ja asendab kõik seired ja teavitusteenused.",
@@ -150,14 +150,14 @@ export default {
     "Export Backup": "Varukoopia eksportimine",
     "Skip existing": "lisa praegustele",
     Overwrite: "asenda",
-    Options: "Mestimisviis", // reusal of key would be chaos
+    Options: "Mestimisviis",
     "Keep both": "kombineeri",
     Tags: "Sildid",
     "Add New below or Select...": "Leia või lisa all uus…",
     "Tag with this name already exist.": "Selle nimega silt on juba olemas.",
     "Tag with this value already exist.": "Selle väärtusega silt on juba olemas.",
     color: "värvus",
-    "value (optional)": "väärtus (fakultatiivne)", // milline sõna!
+    "value (optional)": "väärtus (fakultatiivne)",
     Gray: "hall",
     Red: "punane",
     Orange: "oranž",
@@ -167,7 +167,7 @@ export default {
     Purple: "lilla",
     Pink: "roosa",
     "Search...": "Otsi…",
-    "Avg. Ping": "Keskmine ping", // pikk, aga nagunii kahel real
+    "Avg. Ping": "Keskmine ping",
     "Avg. Response": "Keskmine reaktsiooniaeg",
     "Entry Page": "Avaleht",
     statusPageNothing: "Kippu ega kõppu; siia saab lisada seireid või -gruppe.",
@@ -178,4 +178,22 @@ export default {
     "Add Group": "Lisa grupp",
     "Edit Status Page": "Muuda lehte",
     "Go to Dashboard": "Töölauale",
+    checkEverySecond: "Kontrolli peale tõrget {0} sekundilise vahega.",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "elektronpost (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (vahendab üle 65 teavitusteenust)",
+    pushbullet: "Pushbullet",
+    line: "LINE",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/fa.js b/src/languages/fa.js
index 15478666..d686488f 100644
--- a/src/languages/fa.js
+++ b/src/languages/fa.js
@@ -186,5 +186,22 @@ export default {
     First: "اولین",
     Last: "آخرین",
     Info: "اطلاعات",
-    "Powered By": "نیرو گرفته از",
+    "Powered by": "نیرو گرفته از",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index bc3c5d5d..6ef69f0a 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -170,7 +170,7 @@ export default {
     "Avg. Ping": "Ping moyen",
     "Avg. Response": "Réponse moyenne",
     "Entry Page": "Page d'accueil",
-    "statusPageNothing": "Rien ici, veuillez ajouter un groupe ou une sonde.",
+    statusPageNothing: "Rien ici, veuillez ajouter un groupe ou une sonde.",
     "No Services": "Aucun service",
     "All Systems Operational": "Tous les systèmes sont opérationnels",
     "Partially Degraded Service": "Service partiellement dégradé",
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Ajouter une sonde",
     "Edit Status Page": "Modifier la page de statut",
     "Go to Dashboard": "Accéder au tableau de bord",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/hu.js b/src/languages/hu.js
index 9d3dbf6c..039cf670 100644
--- a/src/languages/hu.js
+++ b/src/languages/hu.js
@@ -178,4 +178,22 @@ export default {
     "Add a monitor": "Figyelő hozzáadása",
     "Edit Status Page": "Sátusz oldal szerkesztése",
     "Go to Dashboard": "Menj az irányítópulthoz",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
+    "Status Page": "Status Page",
 };
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 9beb9db5..b318c97e 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -169,7 +169,7 @@ export default {
     "Avg. Ping": "Ping medio",
     "Avg. Response": "Risposta media",
     "Entry Page": "Entry Page",
-    "statusPageNothing": "Non c'è nulla qui, aggiungere un gruppo oppure un monitoraggio.",
+    statusPageNothing: "Non c'è nulla qui, aggiungere un gruppo oppure un monitoraggio.",
     "No Services": "Nessun Servizio",
     "All Systems Operational": "Tutti i sistemi sono operativi",
     "Partially Degraded Service": "Servizio parzialmente degradato",
@@ -178,4 +178,22 @@ export default {
     "Add a monitor": "Aggiungi un monitoraggio",
     "Edit Status Page": "Modifica pagina di stato",
     "Go to Dashboard": "Vai al Cruscotto",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/ja.js b/src/languages/ja.js
index c0985825..5042d18b 100644
--- a/src/languages/ja.js
+++ b/src/languages/ja.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/ko-KR.js b/src/languages/ko-KR.js
index 566f07c1..6cb86ed2 100644
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/nl-NL.js b/src/languages/nl-NL.js
index 5fa9d4e1..1303a096 100644
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/pl.js b/src/languages/pl.js
index 00603914..9a079a9c 100644
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@@ -169,14 +169,32 @@ export default {
     "Search...": "Szukaj...",
     "Avg. Ping": "Średni ping",
     "Avg. Response": "Średnia odpowiedź",
-    "Entry Page": "Wejdź na stronę",
-    "statusPageNothing": "Nic tu nie ma, dodaj monitor lub grupę.",
+    "Entry Page": "Strona główna",
+    statusPageNothing: "Nic tu nie ma, dodaj grupę lub monitor.",
     "No Services": "Brak usług",
     "All Systems Operational": "Wszystkie systemy działają",
     "Partially Degraded Service": "Częściowy błąd usługi",
     "Degraded Service": "Błąd usługi",
     "Add Group": "Dodaj grupę",
-    "Add a monitor": "Dodaj monitoe",
+    "Add a monitor": "Dodaj monitor",
     "Edit Status Page": "Edytuj stronę statusu",
     "Go to Dashboard": "Idź do panelu",
+    "Status Page": "Strona statusu",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (obsługuje 50+ usług powiadamiania)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/pt-BR.js b/src/languages/pt-BR.js
index 4f65f603..201314bb 100644
--- a/src/languages/pt-BR.js
+++ b/src/languages/pt-BR.js
@@ -179,4 +179,21 @@ export default {
     "Add a monitor": "Adicionar um monitor",
     "Edit Status Page": "Editar Página de Status",
     "Go to Dashboard": "Ir para a dashboard",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index 1686aec4..f466ff79 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -43,7 +43,7 @@ export default {
     Delete: "Удалить",
     Current: "Текущий",
     Uptime: "Аптайм",
-    "Cert Exp.": "Сертификат просрочен",
+    "Cert Exp.": "Сертификат истекает",
     days: "дней",
     day: "день",
     "-day": " дней",
@@ -180,8 +180,25 @@ export default {
     "Edit Status Page": "Редактировать",
     "Go to Dashboard": "Панель мониторов",
     "Status Page": "Статус сервисов",
-    "Discard": "Отмена",
+    Discard: "Отмена",
     "Create Incident": "Создать инцидент",
     "Switch to Dark Theme": "Тёмная тема",
     "Switch to Light Theme": "Светлая тема",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/sr-latn.js b/src/languages/sr-latn.js
index e91c3c28..f249f568 100644
--- a/src/languages/sr-latn.js
+++ b/src/languages/sr-latn.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/sr.js b/src/languages/sr.js
index 60240550..8ea651b7 100644
--- a/src/languages/sr.js
+++ b/src/languages/sr.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/sv-SE.js b/src/languages/sv-SE.js
index d7174d34..997d94a7 100644
--- a/src/languages/sv-SE.js
+++ b/src/languages/sv-SE.js
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/tr-TR.js b/src/languages/tr-TR.js
index c7f9af40..614ab0ee 100644
--- a/src/languages/tr-TR.js
+++ b/src/languages/tr-TR.js
@@ -178,4 +178,22 @@ export default {
     "Add a monitor": "Add a monitor",
     "Edit Status Page": "Edit Status Page",
     "Go to Dashboard": "Go to Dashboard",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index e9b1c20e..65e8909a 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -170,7 +170,7 @@ export default {
     "Avg. Ping": "平均Ping",
     "Avg. Response": "平均响应",
     "Entry Page": "入口页面",
-    "statusPageNothing": "这里什么也没有，请添加一个分组或一个监控项。",
+    statusPageNothing: "这里什么也没有，请添加一个分组或一个监控项。",
     "No Services": "无服务",
     "All Systems Operational": "所有服务运行正常",
     "Partially Degraded Service": "部分服务出现故障",
@@ -179,4 +179,22 @@ export default {
     "Add a monitor": "添加监控项",
     "Edit Status Page": "编辑状态页",
     "Go to Dashboard": "前往仪表盘",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Support 50+ Notification services)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/languages/zh-HK.js b/src/languages/zh-HK.js
index f08d6f13..ea81f7f3 100644
--- a/src/languages/zh-HK.js
+++ b/src/languages/zh-HK.js
@@ -1,7 +1,7 @@
 export default {
     languageName: "繁體中文 (香港)",
     Settings: "設定",
-    Dashboard: "錶板",
+    Dashboard: "主控台",
     "New Update": "有更新",
     Language: "語言",
     Appearance: "外觀",
@@ -104,7 +104,7 @@ export default {
     rrtypeDescription: "請選擇 DNS 記錄類型",
     pauseMonitorMsg: "是否確定暫停？",
     "Last Result": "最後結果",
-    "Create your admin account": "製作你的管理員帳號",
+    "Create your admin account": "建立管理員帳號",
     "Repeat Password": "重複密碼",
     respTime: "反應時間 (ms)",
     notAvailableShort: "N/A",
@@ -146,37 +146,55 @@ export default {
     importHandleDescription: "Choose 'Skip existing' if you want to skip every monitor or notification with the same name. 'Overwrite' will delete every existing monitor and notification.",
     confirmImportMsg: "Are you sure to import the backup? Please make sure you've selected the right import option.",
     "Heartbeat Retry Interval": "Heartbeat Retry Interval",
-    "Import Backup": "Import Backup",
-    "Export Backup": "Export Backup",
-    "Skip existing": "Skip existing",
-    Overwrite: "Overwrite",
-    Options: "Options",
-    "Keep both": "Keep both",
-    Tags: "Tags",
+    "Import Backup": "匯入備份",
+    "Export Backup": "匯出備份",
+    "Skip existing": "略過已存在的",
+    Overwrite: "覆蓋",
+    Options: "選項",
+    "Keep both": "兩者並存",
+    Tags: "標籤",
     "Add New below or Select...": "Add New below or Select...",
     "Tag with this name already exist.": "Tag with this name already exist.",
     "Tag with this value already exist.": "Tag with this value already exist.",
-    color: "color",
-    "value (optional)": "value (optional)",
-    Gray: "Gray",
-    Red: "Red",
-    Orange: "Orange",
-    Green: "Green",
-    Blue: "Blue",
-    Indigo: "Indigo",
-    Purple: "Purple",
-    Pink: "Pink",
-    "Search...": "Search...",
-    "Avg. Ping": "Avg. Ping",
-    "Avg. Response": "Avg. Response",
+    color: "顏色",
+    "value (optional)": "值 (非必需)",
+    Gray: "灰",
+    Red: "紅",
+    Orange: "橙",
+    Green: "綠",
+    Blue: "藍",
+    Indigo: "靛",
+    Purple: "紫",
+    Pink: "粉紅",
+    "Search...": "搜尋...",
+    "Avg. Ping": "平均反應時間",
+    "Avg. Response": "平均反應時間",
     "Entry Page": "Entry Page",
     statusPageNothing: "Nothing here, please add a group or a monitor.",
-    "No Services": "No Services",
-    "All Systems Operational": "All Systems Operational",
-    "Partially Degraded Service": "Partially Degraded Service",
-    "Degraded Service": "Degraded Service",
-    "Add Group": "Add Group",
-    "Add a monitor": "Add a monitor",
-    "Edit Status Page": "Edit Status Page",
-    "Go to Dashboard": "Go to Dashboard",
+    "No Services": "沒有服務",
+    "All Systems Operational": "一切正常",
+    "Partially Degraded Service": "部份服務受阻",
+    "Degraded Service": "服務受阻",
+    "Add Group": "新增群組",
+    "Add a monitor": " 新增監測器",
+    "Edit Status Page": "編輯 Status Page",
+    "Go to Dashboard": "前往主控台",
+    "Status Page": "Status Page",
+    telegram: "Telegram",
+    webhook: "Webhook",
+    smtp: "電郵 (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    lunasea: "LunaSea",
+    apprise: "Apprise (支援 50 多種通知)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
 };
diff --git a/src/main.js b/src/main.js
index 94807b44..79ba2d1d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import "bootstrap";
 import { createApp, h } from "vue";
+import contenteditable from "vue-contenteditable";
 import Toast from "vue-toastification";
-import contenteditable from "vue-contenteditable"
 import "vue-toastification/dist/index.css";
 import App from "./App.vue";
 import "./assets/app.scss";
@@ -9,10 +9,9 @@ import { i18n } from "./i18n";
 import { FontAwesomeIcon } from "./icon.js";
 import datetime from "./mixins/datetime";
 import mobile from "./mixins/mobile";
+import publicMixin from "./mixins/public";
 import socket from "./mixins/socket";
 import theme from "./mixins/theme";
-import publicMixin from "./mixins/public";
-
 import { router } from "./router";
 import { appName } from "./util.ts";
 
@@ -27,10 +26,10 @@ const app = createApp({
     data() {
         return {
             appName: appName
-        }
+        };
     },
     render: () => h(App),
-})
+});
 
 app.use(router);
 app.use(i18n);
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 96f221e8..6a72dc82 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -256,7 +256,7 @@ export default {
             // Source: https://digitalfortress.tech/tips/top-15-commonly-used-regex/
             ipRegexPattern: "((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$))",
             // Source: https://stackoverflow.com/questions/106179/regular-expression-to-match-dns-hostname-or-ip-address
-            hostnameRegexPattern: "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"
+            hostnameRegexPattern: "^(([a-zA-Z0-9_]|[a-zA-Z0-9_][a-zA-Z0-9\\-_]*[a-zA-Z0-9_])\\.)*([A-Za-z0-9_]|[A-Za-z0-9_][A-Za-z0-9\\-_]*[A-Za-z0-9_])$"
         };
     },
 
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 22bb586c..259f334b 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -52,9 +52,12 @@
                             </div>
                         </div>
 
+                        <!-- General Settings -->
                         <h2 class="mt-5 mb-2">{{ $t("General") }}</h2>
+
                         <form class="mb-3" @submit.prevent="saveGeneral">
-                            <div class="mb-3">
+                            <!-- Timezone -->
+                            <div class="mb-4">
                                 <label for="timezone" class="form-label">{{ $t("Timezone") }}</label>
                                 <select id="timezone" v-model="$root.userTimezone" class="form-select">
                                     <option value="auto">
@@ -66,7 +69,8 @@
                                 </select>
                             </div>
 
-                            <div class="mb-3">
+                            <!-- Search Engine -->
+                            <div class="mb-4">
                                 <label class="form-label">{{ $t("Search Engine Visibility") }}</label>
 
                                 <div class="form-check">
@@ -83,7 +87,8 @@
                                 </div>
                             </div>
 
-                            <div class="mb-3">
+                            <!-- Entry Page -->
+                            <div class="mb-4">
                                 <label class="form-label">{{ $t("Entry Page") }}</label>
 
                                 <div class="form-check">
@@ -101,6 +106,19 @@
                                 </div>
                             </div>
 
+                            <!-- Primary Base URL -->
+                            <div class="mb-4">
+                                <label class="form-label" for="primaryBaseURL">Primary Base URL</label>
+
+                                <div class="input-group mb-3">
+                                    <input id="primaryBaseURL" v-model="settings.primaryBaseURL" class="form-control" name="primaryBaseURL" placeholder="https://" pattern="https?://.+">
+                                    <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryBaseURL">Auto Get</button>
+                                </div>
+
+                                <div class="form-text">
+                                </div>
+                            </div>
+
                             <div>
                                 <button class="btn btn-primary" type="submit">
                                     {{ $t("Save") }}
@@ -109,6 +127,7 @@
                         </form>
 
                         <template v-if="loaded">
+                            <!-- Change Password -->
                             <template v-if="! settings.disableAuth">
                                 <h2 class="mt-5 mb-2">{{ $t("Change Password") }}</h2>
                                 <form class="mb-3" @submit.prevent="savePassword">
@@ -196,36 +215,40 @@
                             <h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>
 
                             <div class="mb-3">
-                                <button v-if="settings.disableAuth" class="btn btn-outline-primary me-1 mb-1" @click="enableAuth">{{ $t("Enable Auth") }}</button>
-                                <button v-if="! settings.disableAuth" class="btn btn-primary me-1 mb-1" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
-                                <button v-if="! settings.disableAuth" class="btn btn-danger me-1 mb-1" @click="$root.logout">{{ $t("Logout") }}</button>
+                                <button v-if="settings.disableAuth" class="btn btn-outline-primary me-2 mb-2" @click="enableAuth">{{ $t("Enable Auth") }}</button>
+                                <button v-if="! settings.disableAuth" class="btn btn-primary me-2 mb-2" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
+                                <button v-if="! settings.disableAuth" class="btn btn-danger me-2 mb-2" @click="$root.logout">{{ $t("Logout") }}</button>
                                 <button class="btn btn-outline-danger me-1 mb-1" @click="confirmClearStatistics">{{ $t("Clear all statistics") }}</button>
                             </div>
                         </template>
                     </div>
 
-                    <div class="notification-list col-md-6">
+                    <div class="col-md-6">
                         <div v-if="$root.isMobile" class="mt-3" />
 
-                        <h2>{{ $t("Notifications") }}</h2>
-                        <p v-if="$root.notificationList.length === 0">
-                            {{ $t("Not available, please setup.") }}
-                        </p>
-                        <p v-else>
-                            {{ $t("notificationDescription") }}
-                        </p>
+                        <!-- Notifications -->
+                        <div class="notification-list ">
+                            <h2>{{ $t("Notifications") }}</h2>
+                            <p v-if="$root.notificationList.length === 0">
+                                {{ $t("Not available, please setup.") }}
+                            </p>
+                            <p v-else>
+                                {{ $t("notificationDescription") }}
+                            </p>
 
-                        <ul class="list-group mb-3" style="border-radius: 1rem;">
-                            <li v-for="(notification, index) in $root.notificationList" :key="index" class="list-group-item">
-                                {{ notification.name }}<br>
-                                <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
-                            </li>
-                        </ul>
+                            <ul class="list-group mb-3" style="border-radius: 1rem;">
+                                <li v-for="(notification, index) in $root.notificationList" :key="index" class="list-group-item">
+                                    {{ notification.name }}<br>
+                                    <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
+                                </li>
+                            </ul>
 
-                        <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
-                            {{ $t("Setup Notification") }}
-                        </button>
+                            <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
+                                {{ $t("Setup Notification") }}
+                            </button>
+                        </div>
 
+                        <!-- Info -->
                         <h2 class="mt-5">{{ $t("Info") }}</h2>
 
                         {{ $t("Version") }}: {{ $root.info.version }} <br />
@@ -325,7 +348,7 @@
                 <template v-else-if="$i18n.locale === 'bg-BG' ">
                     <p>Сигурни ли сте, че желаете да <strong>изключите удостоверяването</strong>?</p>
                     <p>Използва се в случаите, когато <strong>има настроен алтернативен метод за удостоверяване</strong> преди Uptime Kuma, например Cloudflare Access.</p>
-                    <p>Моля, използвайте внимателно.</p>
+                    <p>Моля, използвайте с повишено внимание.</p>
                 </template>
 
                 <template v-else-if="$i18n.locale === 'hu' ">
@@ -400,7 +423,7 @@ export default {
 
         "$i18n.locale"() {
             localStorage.locale = this.$i18n.locale;
-            setPageLocale()
+            setPageLocale();
         },
     },
 
@@ -531,6 +554,10 @@ export default {
                 }
             });
         },
+
+        autoGetPrimaryBaseURL() {
+            this.settings.primaryBaseURL = location.protocol + "//" + location.host;
+        }
     },
 };
 </script>
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 7050313e..87634f35 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -197,7 +197,7 @@
         </div>
 
         <footer class="mt-5 mb-4">
-            {{ $t("Powered By") }} <a target="_blank" href="https://github.com/louislam/uptime-kuma">{{ $t("Uptime Kuma" )}}</a>
+            {{ $t("Powered by") }} <a target="_blank" href="https://github.com/louislam/uptime-kuma">{{ $t("Uptime Kuma" ) }}</a>
         </footer>
     </div>
 </template>
diff --git a/src/util.js b/src/util.js
index 54649bd5..64ac2f6f 100644
--- a/src/util.js
+++ b/src/util.js
@@ -7,7 +7,7 @@
 // Backend uses the compiled file util.js
 // Frontend uses util.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genSecret = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
+exports.getMonitorRelativeURL = exports.genSecret = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
 const _dayjs = require("dayjs");
 const dayjs = _dayjs;
 exports.isDev = process.env.NODE_ENV === "development";
@@ -74,7 +74,7 @@ class TimeLogger {
         this.startTime = dayjs().valueOf();
     }
     print(name) {
-        if (exports.isDev) {
+        if (exports.isDev && process && process.env.TIMELOGGER === "1") {
             console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms");
         }
     }
@@ -112,3 +112,7 @@ function genSecret(length = 64) {
     return secret;
 }
 exports.genSecret = genSecret;
+function getMonitorRelativeURL(id) {
+    return "/dashboard/" + id;
+}
+exports.getMonitorRelativeURL = getMonitorRelativeURL;
diff --git a/src/util.ts b/src/util.ts
index 69dbe68a..45005049 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -86,7 +86,7 @@ export class TimeLogger {
     }
 
     print(name: string) {
-        if (isDev) {
+        if (isDev && process && process.env.TIMELOGGER === "1") {
             console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms")
         }
     }
@@ -123,3 +123,7 @@ export function genSecret(length = 64) {
     }
     return secret;
 }
+
+export function getMonitorRelativeURL(id: string) {
+    return "/dashboard/" + id;
+}
diff --git a/test/test.spec.js b/test/test.spec.js
index 67505b7d..91c8459b 100644
--- a/test/test.spec.js
+++ b/test/test.spec.js
@@ -1,6 +1,7 @@
 // eslint-disable-next-line no-unused-vars
-const { Page } = require("puppeteer");
+const { Page, Browser } = require("puppeteer");
 const { sleep } = require("../src/util");
+const axios = require("axios");
 
 /**
  * Set back the correct data type for page object
@@ -8,14 +9,17 @@ const { sleep } = require("../src/util");
  */
 page;
 
-beforeAll(() => {
-    if (process.env.JUST_FOR_TEST) {
-        console.log(process.env.JUST_FOR_TEST);
+/**
+ * @type {Browser}
+ */
+browser;
 
-        if (process.env.JUST_FOR_TEST === "JUST_FOR_TEST_HELLO") {
-            console.log("secret ok");
-        }
-    }
+beforeAll(async () => {
+    await page.setViewport({
+        width: 1280,
+        height: 720,
+        deviceScaleFactor: 1,
+    });
 });
 
 afterAll(() => {
@@ -35,6 +39,7 @@ describe("Init", () => {
         await expect(page.title()).resolves.toMatch(title);
     });
 
+    // Setup Page
     it("Setup", async () => {
         // Create an Admin
         await page.waitForSelector("#floatingInput");
@@ -49,20 +54,25 @@ describe("Init", () => {
         // Go to /setup again
         await page.goto(baseURL + "/setup");
         await sleep(3000);
-        const pathname = await page.evaluate(() => location.pathname);
+        let pathname = await page.evaluate(() => location.pathname);
         expect(pathname).toEqual("/dashboard");
 
         // Go to /
         await page.goto(baseURL);
+        await sleep(3000);
+        pathname = await page.evaluate(() => location.pathname);
         expect(pathname).toEqual("/dashboard");
     });
 
+    // Settings Page
     describe("Settings", () => {
         beforeAll(async () => {
             await page.goto(baseURL + "/settings");
         });
 
         it("Change Language", async () => {
+            await page.waitForSelector("#language");
+
             await page.select("#language", "zh-HK");
             let languageTitle = await page.evaluate(() => document.querySelector("[for=language]").innerText);
             expect(languageTitle).toMatch("語言");
@@ -73,19 +83,135 @@ describe("Init", () => {
         });
 
         it("Change Theme", async () => {
-            // Light
-            await page.click(".btn[for=btncheck1]");
-            await page.waitForSelector("div.light", {
-                timeout: 2000
-            });
+            await sleep(1000);
 
-            await page.click(".btn[for=btncheck2]");
-            await page.waitForSelector("div.dark", {
-                timeout: 2000
-            });
+            // Dark
+            await click(page, ".btn[for=btncheck2]");
+            await page.waitForSelector("div.dark");
+
+            await sleep(1000);
+
+            // Light
+            await click(page, ".btn[for=btncheck1]");
+            await page.waitForSelector("div.light");
         });
+
+        // TODO: Heartbeat Bar Style
+
+        // TODO: Timezone
+
+        it("Search Engine Visibility", async () => {
+            // Default
+            let res = await axios.get(baseURL + "/robots.txt");
+            expect(res.data).toMatch("Disallow: /");
+
+            // Yes
+            await click(page, "#searchEngineIndexYes");
+            await click(page, "form > div > .btn[type=submit]");
+            await sleep(2000);
+            res = await axios.get(baseURL + "/robots.txt");
+            expect(res.data).not.toMatch("Disallow: /");
+
+            // No
+            await click(page, "#searchEngineIndexNo");
+            await click(page, "form > div > .btn[type=submit]");
+            await sleep(2000);
+            res = await axios.get(baseURL + "/robots.txt");
+            expect(res.data).toMatch("Disallow: /");
+        });
+
+        it("Entry Page", async () => {
+            const newPage = await browser.newPage();
+
+            // Default
+            await newPage.goto(baseURL);
+            await sleep(3000);
+            let pathname = await newPage.evaluate(() => location.pathname);
+            expect(pathname).toEqual("/dashboard");
+
+            // Status Page
+            await click(page, "#entryPageNo");
+            await click(page, "form > div > .btn[type=submit]");
+            await sleep(4000);
+            await newPage.goto(baseURL);
+            await sleep(4000);
+            pathname = await newPage.evaluate(() => location.pathname);
+            expect(pathname).toEqual("/status");
+
+            // Back to Dashboard
+            await click(page, "#entryPageYes");
+            await click(page, "form > div > .btn[type=submit]");
+            await sleep(4000);
+            await newPage.goto(baseURL);
+            await sleep(4000);
+            pathname = await newPage.evaluate(() => location.pathname);
+            expect(pathname).toEqual("/dashboard");
+
+            await newPage.close();
+        });
+
+        it("Change Password (wrong current password)", async () => {
+            await page.goto(baseURL + "/settings");
+            await page.waitForSelector("#current-password");
+
+            await page.type("#current-password", "wrong_passw$$d");
+            await page.type("#new-password", "new_password123");
+            await page.type("#repeat-new-password", "new_password123");
+
+            // Save
+            await click(page, "form > div > .btn[type=submit]", 1);
+            await sleep(4000);
+
+            await click(page, ".btn-danger.btn.me-2");
+            await login("admin", "new_password123");
+            let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
+            expect(elementCount).toEqual(1);
+
+            await login("admin", "admin123");
+        });
+
+        it("Change Password (wrong repeat)", async () => {
+            await page.goto(baseURL + "/settings");
+            await page.waitForSelector("#current-password");
+
+            await page.type("#current-password", "admin123");
+            await page.type("#new-password", "new_password123");
+            await page.type("#repeat-new-password", "new_password1234567898797898");
+
+            await click(page, "form > div > .btn[type=submit]", 1);
+            await sleep(4000);
+
+            await click(page, ".btn-danger.btn.me-2");
+            await login("admin", "new_password123");
+
+            let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
+            expect(elementCount).toEqual(1);
+
+            await login("admin", "admin123");
+            await sleep(3000);
+        });
+
+        // TODO: 2FA
+
+        // TODO: Export Backup
+
+        // TODO: Import Backup
+
+        // TODO: Disable Auth
+
+        // TODO: Clear Stats
     });
 
+    /*
+     * TODO
+     * Create Monitor - All type
+     * Edit Monitor
+     * Delete Monitor
+     *
+     * Create Notification (token problem, maybe hard to test)
+     *
+     */
+
     describe("Status Page", () => {
         const title = "Uptime Kuma";
         beforeAll(async () => {
@@ -97,3 +223,28 @@ describe("Init", () => {
     });
 });
 
+async function login(username, password) {
+    await input(page, "#floatingInput", username);
+    await input(page, "#floatingPassword", password);
+    await page.click(".btn-primary[type=submit]");
+    await sleep(5000);
+}
+
+async function click(page, selector, elementIndex = 0) {
+    await page.waitForSelector(selector, {
+        timeout: 5000,
+    });
+    return await page.evaluate((s, i) => {
+        return document.querySelectorAll(s)[i].click();
+    }, selector, elementIndex);
+}
+
+async function input(page, selector, text) {
+    await page.waitForSelector(selector, {
+        timeout: 5000,
+    });
+    const element = await page.$(selector);
+    await element.click({ clickCount: 3 });
+    await page.keyboard.press("Backspace");
+    await page.type(selector, text);
+}
diff --git a/test/test_install_script/ubuntu1604.dockerfile b/test/test_install_script/ubuntu1604.dockerfile
index d689aead..34230a14 100644
--- a/test/test_install_script/ubuntu1604.dockerfile
+++ b/test/test_install_script/ubuntu1604.dockerfile
@@ -1,10 +1,10 @@
 FROM ubuntu:16.04
+RUN apt-get update
+RUN apt --yes install curl
 
 # Test invalid node version, these commands install nodejs 10
-RUN apt-get update
-RUN apt --yes install nodejs
+#RUN apt --yes install nodejs
 # RUN ln -s /usr/bin/nodejs /usr/bin/node
 # RUN node -v
 
-COPY ./install.sh .
-RUN bash install.sh local /opt/uptime-kuma 3000 0.0.0.0
+RUN curl -o kuma_install.sh http://git.kuma.pet/install.sh && bash kuma_install.sh local /opt/uptime-kuma 3000 0.0.0.0