chore(deps): bump rollup (transitive)

Patches CVE-2026-27606 (high — arbitrary file write via path traversal in Rollup 4). Transitive bump within existing semver range; no package.json change.
2026-04-30 01:45:06 -04:00
644 changed files with 20898 additions and 48778 deletions
@@ -1,6 +0,0 @@
-**/node_modules
-**/dist
-**/.env
-**/*.env
-.git
-docker/dev/mongo/data
@@ -1,103 +0,0 @@
-name: Build image
-
-on:
-  push:
-    branches: ["develop", "master"]
-    tags: ["v*"]
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # checkmate-backend-mono is a transitional alias so existing deployments
-      # keep receiving updates; drop it after one release cycle.
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/checkmate
-            ghcr.io/${{ github.repository_owner }}/checkmate-backend-mono
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
-
-      - name: Build and push multi-arch image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  # The hosted staging/prod instances share one host and one compose file; each
-  # deploy pulls and recreates only its own service.
-  deploy-staging:
-    needs: build-and-push
-    if: github.ref == 'refs/heads/develop'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy staging.checkmate.so
-        uses: appleboy/ssh-action@v1.2.2
-        with:
-          host: ${{ secrets.DEMO_SERVER_HOST }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
-          script: |
-            cd checkmate
-            git pull
-            cd docs/hosting/checkmate-so
-            docker compose pull checkmate-staging
-            docker compose up -d checkmate-staging
-            docker system prune -af
-
-  deploy-prod:
-    needs: build-and-push
-    if: github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy demo.checkmate.so
-        uses: appleboy/ssh-action@v1.2.2
-        with:
-          host: ${{ secrets.DEMO_SERVER_HOST }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
-          script: |
-            cd checkmate
-            git pull
-            cd docs/hosting/checkmate-so
-            docker compose pull checkmate-demo
-            docker compose up -d checkmate-demo
-            docker system prune -af
@@ -0,0 +1,148 @@
+name: Deploy images on release
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract version from tag
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-client:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Client Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-client:${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend:${{ steps.extract_tag.outputs.version }}
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server-mono-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/dist-arm/server.Dockerfile
+          push: true
+          no-cache: true
+          tags: |
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:${{ steps.extract_tag.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+          build-args: |
+            VITE_APP_VERSION=${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server-mono:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist-mono/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ steps.extract_tag.outputs.version }} \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }}
@@ -0,0 +1,143 @@
+name: Deploy images
+
+on:
+  push:
+    branches: ["master"]
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-client:latest \
+            -f ./docker/dist/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Client Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-client:latest
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend:latest \
+            -f ./docker/dist/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend:latest
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:latest \
+            -f ./docker/dist/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:latest
+
+  docker-build-and-push-server-mono-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/dist-arm/server.Dockerfile
+          push: true
+          no-cache: true
+          tags: |
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+          build-args: |
+            VITE_APP_VERSION=${{ env.VERSION }}
+
+  docker-build-and-push-server-mono:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:latest \
+            -f ./docker/dist-mono/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:latest
@@ -0,0 +1,91 @@
+name: Demo deploy
+
+on:
+  push:
+    branches: [ "demo" ]
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:frontend-demo \
+            -f ./docker/prod/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Client Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:frontend-demo
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:backend-demo \
+            -f ./docker/prod/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:backend-demo
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:mongo-demo \
+            -f ./docker/prod/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:mongo-demo
+
+  deploy-to-demo:
+    needs: docker-build-and-push-server
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH into server and restart container using Docker Compose
+        uses: appleboy/ssh-action@v1.2.2
+        with:
+          host: ${{ secrets.DEMO_SERVER_HOST }}
+          username: ${{ secrets.DEMO_SERVER_USER }}
+          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
+          script: |
+            cd checkmate
+            git pull
+            cd docker/unified
+            docker compose down
+            docker compose pull
+            docker compose up -d
+            docker system prune -af
@@ -0,0 +1,91 @@
+name: Staging deploy
+
+on:
+  push:
+    branches: [ "develop" ]
+
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:frontend-staging \
+            -f ./docker/staging/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
+            .
+
+      - name: Push Client Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:frontend-staging
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:backend-staging \
+            -f ./docker/staging/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:backend-staging
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate:mongo-staging \
+            -f ./docker/staging/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate:mongo-staging
+
+  deploy-to-staging:
+    needs: docker-build-and-push-server
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH into server and restart container using Docker Compose
+        uses: appleboy/ssh-action@v1.2.2
+        with:
+          host: ${{ secrets.DEMO_SERVER_HOST }}
+          username: ${{ secrets.DEMO_SERVER_USER }}
+          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
+          script: |
+            cd checkmate
+            git pull
+            cd docker/unified
+            docker compose down
+            docker compose pull
+            docker compose up -d
+            docker system prune -af
@@ -1,23 +1,4 @@
 #!/bin/sh
-
-# Skip during merge/rebase/cherry-pick/revert. lint-staged's internal
-# git-stash mechanism is incompatible with these states and will silently
-# wipe MERGE_HEAD and your conflict resolutions on commit failure.
-git_dir=$(git rev-parse --git-dir)
-if [ -e "$git_dir/MERGE_HEAD" ] \
-	|| [ -e "$git_dir/CHERRY_PICK_HEAD" ] \
-	|| [ -e "$git_dir/REVERT_HEAD" ] \
-	|| [ -d "$git_dir/rebase-merge" ] \
-	|| [ -d "$git_dir/rebase-apply" ]; then
-	echo "Skipping lint-staged (mid merge/rebase/cherry-pick/revert)"
-	exit 0
-fi
-
-# Anchor to repo root so commits made from a subdirectory still work, and
-# run each package's lint-staged in a subshell so cwd is scoped (a failure
-# inside one package can't poison the cwd for the next).
-cd "$(git rev-parse --show-toplevel)" || exit 1
-
 echo "Running lint-staged..."
-(cd client && npx lint-staged) || exit 1
-(cd server && npx lint-staged) || exit 1
+cd client && npx lint-staged && cd ..
+cd server && npx lint-staged && cd ..
@@ -35,9 +35,9 @@ npm run format           # Prettier formatting

 ### Docker Development
 ```bash
-docker build -f docker/Dockerfile -t checkmate .          # build the mono image (server + built client)
-docker compose -f docker/dev/docker-compose.yaml up       # local full stack (builds image, runs mongo + worker)
-docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:8.0   # just a dev database
+cd docker/dev
+./build_images.sh
+docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:6.0
 ```

 ## Environment Setup
@@ -68,23 +68,19 @@ VITE_APP_LOG_LEVEL="debug"
 ### Backend Layers
 ```
 server/src/
-├── api/             # HTTP layer
-│   ├── controllers/   # Route handlers (authController, monitorController, etc.)
-│   ├── middleware/    # verifyJWT, rateLimiter, sanitization, responseHandler
-│   ├── routes/        # API route definitions
-│   └── validation/    # Zod request-payload schemas
-├── domain/          # Business logic + data access, one folder per entity
-│   ├── monitors/      # e.g. monitor.service.ts, monitor.repository.ts, monitor.type.ts
-│   ├── checks/
-│   ├── incidents/
-│   └── …              # users, teams, status-pages, notifications, etc.
-├── service/         # Cross-cutting services (e.g. infrastructure/)
-├── config/          # App config wiring (controllers, routes, services, envValidation)
+├── controllers/     # Route handlers (authController, monitorController, etc.)
+├── service/         # Business logic
+│   ├── business/    # Core monitoring logic
+│   ├── infrastructure/  # Server/system utilities
+│   └── system/      # App-level settings
 ├── db/
-│   └── migration/   # Database migrations (run on startup)
-├── templates/       # Email/notification templates
-├── types/           # Shared const tuples + derived types
-└── utils/           # Shared utilities
+│   ├── models/      # Mongoose schemas (Monitor, Check, Incident, User, etc.)
+│   ├── migration/   # Database migrations (run on startup)
+│   └── modules/     # Database-specific modules
+├── middleware/v1/   # verifyJWT, rateLimiter, sanitization, responseHandler
+├── routes/v1/       # API route definitions
+├── validation/      # Joi input validation schemas
+└── repositories/    # Data access layer
 ```

 ### Frontend Structure
@@ -163,26 +159,14 @@ When working on anything related to check scheduling, incident lifecycle, or not

 ## Code Conventions

-### Coding conventions (mandatory)
-Read `docs/coding-conventions.md` before touching any `.tsx` or `.ts` file. The doc covers both frontend and backend rules, all enforced in code review.
-
-**Universal — rule 0:** look at peer files first and follow the established pattern. Don't sneak in novel shapes.
-
-**Frontend (`client/src`):**
+### Frontend conventions (mandatory for `client/src`)
+Read `docs/frontend-conventions.md` before touching any `.tsx` file. Five rules, all enforced in code review:
 1. Prefer MUI native props over `sx` (e.g. `color={…}`, `bgcolor={…}`, `mt={…}` — not `sx={{ color, bgcolor, mt }}`).
 2. Use the full theme path for colors: `color={theme.palette.text.secondary}`, never `color="text.secondary"` (greppability).
 3. No hardcoded literals — use `LAYOUT.*`, `typographyLevels.*`, `theme.shape.borderRadius`, `theme.palette.*`.
 4. Use `useTheme()` inside components; don't `import { theme } from "@/Utils/Theme/Theme"`.
 5. Pair runtime tuples with derived types: `const X = [...] as const; type X = (typeof X)[number]`.

-**Backend (`server/src`):**
-6. Layering: Controller → Service → Repository → Mongoose. No DB calls outside repositories.
-7. Provider conventions: DI for stdlib clients, `SERVICE_NAME` + `TIMEOUT_MS` constants, `timeRequest()` helper, inline `setTimeout` race for timeout, outer try/catch into `AppError`.
-8. Mongoose schema fields with closed value sets must declare `enum` reusing the same `types/*` const tuple.
-9. Provider tests at `server/test/unit/providers/network/<name>.test.ts`, `from "@jest/globals"`, `testStatusProviderContract`, inline `setup()` per test (not `beforeEach`).
-10. Centralize validation enums in `types/*` const tuples; never inline `z.enum([…])` more than once.
-11. New entity fields must land in the validator's `*ResponseSchema` so the auto-generated OpenAPI spec sees them.
-
 ### Internationalization
 All user-facing strings must use the translation function:
 ```javascript
@@ -88,10 +88,34 @@ cd Checkmate

 #### Step 2: Set Up Docker Containers (MongoDB)

+Navigate to the Docker dev directory:
+
+```bash
+cd docker/dev
+```
+
+Build the Docker images:
+
+Linux:
+```bash
+./build_images.sh
+```
+
+Windows:
+```bash
+./build_images.bat
+```
+
 Run MongoDB container:

 ```bash
-docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:8.0
+docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:6.0
+```
+
+Navigate back to the root directory:
+
+```bash
+cd ../..
 ```

 #### Step 3: Set Up the Backend (Server)
@@ -127,7 +151,6 @@ LOG_LEVEL="debug"
 - `ORIGIN`: Origin for CORS purposes
 - `TOKEN_TTL`: Token time to live (in vercel/ms format)
 - `LOG_LEVEL`: Debug level (debug, info, warn, error)
- `QUEUE_TYPE`: Job queue implementation (`superSimpleQueue` or `lessSimpleQueue`, optional, default: `superSimpleQueue`)

 Start the backend server:

@@ -232,35 +255,6 @@ docker rm uptime_database_mongo

 Start with [good first issues](https://github.com/bluewave-labs/checkmate/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).

-### Improve the documentation?
-
-Documentation contributions are very welcome — fixing a typo, clarifying a step, or adding a missing example is a valuable PR.
-
- Small edits (typos, wording, formatting): open a PR directly against `develop`.
- Larger changes (restructuring a section, adding a new guide): open an issue first so we can align on scope, then a PR.
- Screenshots are helpful when documenting UI behaviour.
- README translations live in `docs/translations/`. If you're adding a new language, please also add a flag + link to the language bar in the root `README.md` and every existing translated README so they stay in sync.
-
-### Help with translations?
-
-The application uses `i18next` with one JSON file per language under `client/src/locales/` (`en.json` is the source of truth). English source strings are the definitive copy; other languages are generated as one-time machine translations that anyone is welcome to refine.
-
-**To improve an existing language:**
-
-1. Edit the relevant `client/src/locales/<code>.json` file directly.
-2. Keep the JSON key structure identical to `en.json` — only translate the string values.
-3. Open a PR against `develop`. No language-selector code changes are needed.
-
-**To add a new language:**
-
-1. Add `client/src/locales/<code>.json` with the same key structure as `en.json`, translated. If you can't translate every key, leave unfamiliar strings in English rather than removing keys — i18next falls back to the key path when a value is missing.
-2. Add the display name to `languageNames` in `client/src/Components/inputs/LanguageSelector.tsx` (e.g. `it: "Italiano"`). The selector picks up any language present in `resources` automatically.
-3. Open a PR against `develop`.
-
-If translating a whole file is more than you want to take on, open an issue asking us to add the language and we'll generate an initial machine-translated file that you (or others) can refine over time.
-
-**Note:** an older workflow that synced translations with PoEditor is still in the repo but no longer authoritative. Please treat the `.json` files in `client/src/locales/` as the source of truth.
-
 ### Submit a pull request?

 Follow the [pull request checklist](#pull-request-checklist). Your PR should:
@@ -0,0 +1,172 @@
+<p align=center> <a href="https://trendshift.io/repositories/12443" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12443" alt="bluewave-labs%2Fcheckmate | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a></p>
+
+![](https://img.shields.io/github/license/bluewave-labs/checkmate)
+![](https://img.shields.io/github/repo-size/bluewave-labs/checkmate)
+![](https://img.shields.io/github/commit-activity/m/bluewave-labs/checkmate)
+![](https://img.shields.io/github/last-commit/bluewave-labs/checkmate)
+![](https://img.shields.io/github/languages/top/bluewave-labs/checkmate)
+![](https://img.shields.io/github/issues/bluewave-labs/checkmate)
+![](https://img.shields.io/github/issues-pr/bluewave-labs/checkmate)
+[![OpenSSF Mejores Prácticas](https://www.bestpractices.dev/projects/9901/badge)](https://www.bestpractices.dev/projects/9901)
+[![Pregunta en DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/bluewave-labs/checkmate)
+
+<h1 align="center"><a href="https://bluewavelabs.ca" target="_blank">Checkmate</a></h1>
+
+<p align="center"><strong>Una aplicación de código abierto para monitoreo de infraestructura y tiempo de actividad</strong></p>
+
+<img width="1660" alt="image" src="https://github.com/user-attachments/assets/b748f36d-a271-4965-ad0a-18bf153bbee7" />
+
+Este repositorio contiene tanto el frontend como el backend de Checkmate, una herramienta de monitoreo de código abierto y autoalojada para rastrear hardware de servidores, tiempo de actividad, tiempos de respuesta e incidentes en tiempo real con visualizaciones atractivas. Checkmate revisa regularmente si un servidor o sitio web es accesible y funciona de manera óptima, proporcionando alertas e informes en tiempo real sobre la disponibilidad, el tiempo de inactividad y el tiempo de respuesta de los servicios monitoreados.
+
+Checkmate también tiene un agente llamado [Capture](https://github.com/bluewave-labs/capture), para recuperar datos de servidores remotos. Aunque Capture no es obligatorio para ejecutar Checkmate, proporciona información adicional sobre el estado de la CPU, RAM, disco y temperatura de tus servidores.
+
+Checkmate ha sido probado con más de 1000 monitores activos sin problemas ni cuellos de botella de rendimiento.
+
+**Si deseas patrocinar una función, [visita este enlace](https://checkmate.so/sponsored-features).**
+
+## 📚 Tabla de contenidos
+
+- [📦 Demo](#demo)  
+- [🔗 Guía del usuario](#guía-del-usuario)  
+- [🛠️ Instalación](#instalación)
+- [🏁 Traducciones](#traducciones)  
+- [🚀 Rendimiento](#rendimiento)  
+- [💚 Preguntas e ideas](#preguntas-e-ideas)  
+- [🧩 Características](#características)  
+- [🏗️ Capturas de pantalla](#capturas-de-pantalla)  
+- [🏗️ Tecnologías](#tecnologías)  
+- [🔗 Enlaces útiles](#enlaces-útiles)  
+- [🤝 Contribuciones](#contribuciones)  
+- [💰 Patrocinadores](#patrocinadores)
+
+...
+
+**[Texto truncado para mantener la longitud del mensaje manejable]**
+
+## Demo
+
+Puedes ver la última versión de [Checkmate](https://checkmate-demo.bluewavelabs.ca/) en acción. El usuario es uptimedemo@demo.com y la contraseña es Demouser1! (ten en cuenta que actualizamos el servidor de demostración de vez en cuando, así que si no funciona para ti, por favor contáctanos en el canal de Discusiones).
+
+## Guía del usuario
+
+Las instrucciones de uso se pueden encontrar [aquí](https://checkmate.so/docs). Todavía está en desarrollo y parte de la información puede estar desactualizada ya que continuamente añadimos funciones cada semana. ¡Ten por seguro que estamos haciendo lo mejor posible! :)
+
+## Instalación
+
+Consulta las instrucciones de instalación en el [portal de documentación de Checkmate](https://checkmate.so/docs/getting-started/installation).
+
+Alternativamente, también puedes usar [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md) o [Pikapods](https://www.pikapods.com/) para desplegar rápidamente una instancia de Checkmate. Si deseas monitorear tu infraestructura de servidores, necesitarás el agente [Capture](https://github.com/bluewave-labs/capture). El repositorio de Capture también contiene las instrucciones de instalación.
+
+## Traducciones
+
+Si deseas usar Checkmate en tu idioma, por favor [ve a esta página](https://poeditor.com/join/project/lRUoGZFCsJ) y regístrate para el idioma al que te gustaría traducir Checkmate.
+
+## Rendimiento
+
+Gracias a extensas optimizaciones, Checkmate opera con un uso de memoria excepcionalmente bajo, requiriendo recursos mínimos de memoria y CPU. Aquí está el uso de memoria de una instancia de Node.js ejecutándose en un servidor que monitorea 323 servidores cada minuto:
+
+![image](https://github.com/user-attachments/assets/37e04a75-d83a-488f-b25c-025511b492c9)
+
+También puedes ver el consumo de memoria de MongoDB y Redis en el mismo servidor (398Mb y 15Mb) para la misma cantidad de servidores:
+
+![image](https://github.com/user-attachments/assets/3b469e85-e675-4040-a162-3f24c1afc751)
+
+## Preguntas e Ideas
+
+Si tienes alguna pregunta, sugerencia o comentario, tienes varias opciones:
+
+- [Canal de Discord](https://discord.gg/NAb6H3UTjK)
+- [Discusiones en GitHub](https://github.com/bluewave-labs/checkmate/discussions)
+- [Grupo en Reddit](https://www.reddit.com/r/CheckmateMonitoring/)
+
+¡No dudes en hacer preguntas o compartir tus ideas, nos encantaría saber de ti!
+
+## Características
+
+- Completamente de código abierto, desplegable en tus propios servidores o dispositivos personales (por ejemplo, Raspberry Pi 4 o 5)
+- Monitoreo de sitios web
+- Monitoreo de velocidad de carga
+- Monitoreo de infraestructura (memoria, uso de disco, rendimiento de CPU, etc) - requiere el agente [Capture](https://github.com/bluewave-labs/capture)
+- Monitoreo de Docker
+- Monitoreo con ping
+- Monitoreo de certificados SSL
+- Monitoreo de puertos
+- Incidentes en una sola vista
+- Páginas de estado
+- Notificaciones por correo, Webhooks, Discord, Telegram, Slack
+- Mantenimiento programado
+- Monitoreo de consultas JSON
+- Soporte para múltiples idiomas
+
+**Hoja de ruta a corto plazo:** ([Milestone 2.2](https://github.com/bluewave-labs/Checkmate/milestone/8))
+
+- Mejores notificaciones
+- Monitoreo de red
+- ...y algunas funciones más
+
+## Capturas de pantalla
+
+<p>
+<img width="1628" alt="image" src="https://github.com/user-attachments/assets/2eff6464-0738-4a32-9312-26e1e8e86275" />
+</p>
+<p>
+  <img width="1656" alt="image" src="https://github.com/user-attachments/assets/616c3563-c2a7-4ee4-af6c-7e6068955d1a" />
+</p>
+<p>
+<img width="1652" alt="image" src="https://github.com/user-attachments/assets/7912d7cf-0d0e-4f26-aa5c-2ad7170b5c99" />
+</p>
+<p>
+<img width="1652" alt="image" src="https://github.com/user-attachments/assets/08c2c6ac-3a2f-44d1-a229-d1746a3f9d16" />
+</p>
+
+## Tecnologías
+
+- [ReactJs](https://react.dev/)
+- [MUI (framework de React)](https://mui.com/)
+- [Node.js](https://nodejs.org/en)
+- [MongoDB](https://mongodb.com)
+- [Recharts](https://recharts.org)
+- ¡Y muchos otros componentes de código abierto!
+
+## Enlaces útiles
+
+- Si deseas apoyarnos, por favor considera darle una ⭐ y haz clic en "watch".
+- ¿Tienes una pregunta o sugerencia para la hoja de ruta? Revisa nuestro [canal de Discord](https://discord.gg/NAb6H3UTjK) o el foro de [Discusiones](https://github.com/bluewave-labs/checkmate/discussions).
+- ¿Quieres saber cuándo hay una nueva versión? Usa [Newreleases](https://newreleases.io/), un servicio gratuito para seguir lanzamientos.
+- Mira un video de instalación y uso de Checkmate [aquí](https://www.youtube.com/watch?v=GfFOc0xHIwY)
+
+## Contribuciones
+
+Somos [Alex](http://github.com/ajhollid) (líder de equipo), [Vishnu](http://github.com/vishnusn77), [Mohadeseh](http://github.com/mohicody), [Gorkem](http://github.com/gorkem-bwl/), [Owaise](http://github.com/Owaiseimdad), [Aryaman](https://github.com/Br0wnHammer) y [Mert](https://github.com/mertssmnoglu), ayudando a personas y empresas a monitorear su infraestructura y servidores.
+
+Nos enorgullecemos de construir conexiones fuertes con contribuyentes de todos los niveles. A pesar de ser un proyecto joven, Checkmate ya ha ganado más de 7000 estrellas y ha atraído a más de 90 contribuyentes de todo el mundo.
+
+Nuestro repositorio ha sido marcado con estrella por empleados de **Google, Microsoft, Intel, Cisco, Tencent, Electronic Arts, ByteDance, JP Morgan Chase, Deloitte, Accenture, Foxconn, Broadcom, China Telecom, Barclays, Capgemini, Wipro, Cloudflare, Dassault Systèmes y NEC**, ¡así que no te detengas — participa, contribuye y aprende con nosotros!
+
+Cómo contribuir:
+
+0. Dale una estrella al repositorio :)
+1. Revisa la [guía para contribuidores](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). Se anima a los nuevos a revisar las etiquetas `good-first-issue`.
+2. Consulta la [estructura del proyecto](https://deepwiki.com/bluewave-labs/Checkmate#system-architecture) y la [visión general](https://deepwiki.com/bluewave-labs/Checkmate#overview).
+3. Lee una estructura detallada de [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) si deseas profundizar en la arquitectura.
+4. Abre un issue si crees que has encontrado un error.
+5. Revisa los issues con la etiqueta `good-first-issue` si eres nuevo.
+6. Haz un pull request para añadir nuevas funciones, mejoras o correcciones.
+
+<a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
+</a>
+
+[![Historial de estrellas](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/bluewave-uptime&Date)
+
+## Patrocinadores
+
+Gracias a [Gitbook](https://gitbook.io/) por darnos una cuenta gratuita para su plataforma de documentación, y a [Poeditor](https://poeditor.com/) por proporcionarnos una cuenta gratuita para servicios de traducción. Si deseas patrocinar Checkmate, por favor envía un correo a hello@bluewavelabs.ca
+
+Si deseas patrocinar una función, [visita esta página](https://checkmate.so/sponsored-features).
+
+También puedes revisar otros proyectos de BlueWave orientados a desarrolladores y contribuidores:
+
+- [VerifyWise](https://github.com/bluewave-labs/verifywise), la primera plataforma de gobernanza de IA de código abierto.
+- [DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), una aplicación de intercambio de archivos seguro, también conocida como dataroom.
+- [Guidefox](https://github.com/bluewave-labs/guidefox), una app que ayuda a nuevos usuarios a aprender a usar tu producto mediante pistas, tours, popups y banners.
@@ -1,26 +1,5 @@
 <p align=center> <a href="https://trendshift.io/repositories/12443" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12443" alt="bluewave-labs%2Fcheckmate | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a></p>
-
-<p align="center">
-  🇺🇸 <a href="README.md">English</a> |
-  🇸🇦 <a href="docs/translations/README.ar.md">العربية</a> |
-  🇪🇸 <a href="docs/translations/README.ca.md">Català</a> |
-  🇨🇿 <a href="docs/translations/README.cs.md">Čeština</a> |
-  🇩🇪 <a href="docs/translations/README.de.md">Deutsch</a> |
-  🇪🇸 <a href="docs/translations/README.es.md">Español</a> |
-  🇫🇮 <a href="docs/translations/README.fi.md">Suomi</a> |
-  🇫🇷 <a href="docs/translations/README.fr.md">Français</a> |
-  🇮🇹 <a href="docs/translations/README.it.md">Italiano</a> |
-  🇯🇵 <a href="docs/translations/README.ja.md">日本語</a> |
-  🇧🇷 <a href="docs/translations/README.pt-BR.md">Português (Brasil)</a> |
-  🇷🇺 <a href="docs/translations/README.ru.md">Русский</a> |
-  🇹🇭 <a href="docs/translations/README.th.md">ไทย</a> |
-  🇹🇷 <a href="docs/translations/README.tr.md">Türkçe</a> |
-  🇺🇦 <a href="docs/translations/README.uk.md">Українська</a> |
-  🇻🇳 <a href="docs/translations/README.vi.md">Tiếng Việt</a> |
-  🇨🇳 <a href="docs/translations/README.zh-CN.md">简体中文</a> |
-  🇹🇼 <a href="docs/translations/README.zh-TW.md">繁體中文</a>
-</p>
-
+  
 ![](https://img.shields.io/github/license/bluewave-labs/checkmate)
 ![](https://img.shields.io/github/repo-size/bluewave-labs/checkmate)
 ![](https://img.shields.io/github/commit-activity/m/bluewave-labs/checkmate)
@@ -28,6 +7,7 @@
 ![](https://img.shields.io/github/languages/top/bluewave-labs/checkmate)
 ![](https://img.shields.io/github/issues/bluewave-labs/checkmate)
 ![](https://img.shields.io/github/issues-pr/bluewave-labs/checkmate)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9901/badge)](https://www.bestpractices.dev/projects/9901)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/bluewave-labs/checkmate)

 <h1 align="center"><a href="https://bluewavelabs.ca" target="_blank">Checkmate</a></h1>
@@ -61,14 +41,12 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 - [🤝 Contributing](#contributing)  


-<a id="demo"></a>
 ## Demo

 You can see the latest build of [Checkmate](https://demo.checkmate.so/) in action. 

 The username is demouser@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).

-<a id="users-guide"></a>
 ## User's guide

 Usage instructions can be found [here](https://checkmate.so/docs). 
@@ -77,40 +55,9 @@ Usage instructions can be found [here](https://checkmate.so/docs).
 - [Docker](https://www.docker.com/) installed
 - [Git](https://git-scm.com/) installed

-<a id="installation"></a>
 ## Installation

-The quickest way to run Checkmate is the reference Docker Compose file, which runs the all-in-one image (`ghcr.io/bluewave-labs/checkmate`) plus MongoDB:
-
-```bash
-curl -O https://raw.githubusercontent.com/bluewave-labs/checkmate/master/docker/docker-compose.yaml
-JWT_SECRET="$(openssl rand -hex 32)" docker compose up -d
-```
-
-Then open http://localhost:52345. If the app is reached at another origin (domain or LAN IP), set `CLIENT_HOST` accordingly. To build the image yourself, run `docker build -f docker/Dockerfile -t checkmate .` from a checkout. For TLS, put any reverse proxy (Caddy, Traefik, nginx) in front of port 52345.
-
-### Configuration
-
-The image is configured entirely through environment variables on the server container:
-
-| Variable | Required | Description |
-|---|---|---|
-| `DB_CONNECTION_STRING` | Yes | MongoDB connection string, e.g. `mongodb://mongodb:27017/uptime_db` |
-| `JWT_SECRET` | Yes | Secret used to sign auth tokens; generate one with `openssl rand -hex 32` |
-| `CLIENT_HOST` | Yes | The URL users reach the app at, e.g. `https://checkmate.example.com`; used for CORS and for links in notifications and emails |
-| `LOG_LEVEL` | No | Server log level: `error`, `warn`, `info`, or `debug` (default `debug`) |
-
-The web client needs no configuration by default: it calls the API on the same origin it was served from (`/api/v1`). For setups where the defaults don't apply — for example, the API is reached through a different origin than the page — the server renders overrides into the client at runtime via these optional variables:
-
-| Variable | Description |
-|---|---|
-| `CLIENT_CONFIG_API_BASE_URL` | Full base URL the client calls the API at, e.g. `https://api.example.com/api/v1`; defaults to same-origin `/api/v1` |
-| `CLIENT_CONFIG_CLIENT_HOST` | Origin used when the client builds absolute links (invites, status pages); defaults to the browser's current origin |
-| `CLIENT_CONFIG_LOG_LEVEL` | Browser console log level: `error`, `warn`, `info`, or `debug` (default `error`) |
-
-> **Upgrading from an older image?** The `UPTIME_APP_*` variables (`UPTIME_APP_API_BASE_URL`, `UPTIME_APP_CLIENT_HOST`, `UPTIME_APP_LOG_LEVEL`) are no longer read. In most setups no replacement is needed — the same-origin defaults cover them; if you pointed the client at a different origin, use the `CLIENT_CONFIG_*` equivalents above. The `checkmate-client`, `checkmate-backend`, `checkmate-mongo`, and `checkmate-backend-mono-multiarch` images are no longer updated — switch to `ghcr.io/bluewave-labs/checkmate`, keeping your existing MongoDB service and data volume.
-
-See full installation instructions in the [Checkmate documentation portal](https://checkmate.so/docs). 
+See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 

 Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa), [Cloudzy](https://cloudzy.com/marketplace/checkmate) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.

@@ -120,7 +67,6 @@ If you need to monitor internal HTTPS endpoints with certificates from private C

 For more documentation, see the [docs directory](./docs/).

-<a id="performance"></a>
 ## Performance

 Thanks to extensive optimizations, Checkmate operates with an exceptionally small memory footprint, requiring minimal memory and CPU resources. Here’s the memory usage of a Node.js instance running on a server that monitors 323 servers every minute:
@@ -131,7 +77,6 @@ You can see the memory footprint of MongoDB and Redis on the same server (398Mb

 ![image](https://github.com/user-attachments/assets/3b469e85-e675-4040-a162-3f24c1afc751)

-<a id="questions--ideas"></a>
 ## Questions & Ideas

 If you have any questions, suggestions or comments, you have several options: 
@@ -141,7 +86,6 @@ If you have any questions, suggestions or comments, you have several options:

 Feel free to ask questions or share your ideas - we'd love to hear from you!

-<a id="features"></a>
 ## Features

 - Completely open source, deployable on your servers or home devices (e.g Raspberry Pi 4 or 5)
@@ -166,7 +110,6 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 5. Upon a state change: an incident is either created or resolved, depending on the monitor's current status
 6. Notifications are triggered based on configuration

-<a id="screenshots"></a>
 ## Screenshots

 <p>
@@ -184,7 +127,6 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!



-<a id="tech-stack"></a>
 ## Tech stack

 - [ReactJs](https://react.dev/)
@@ -194,7 +136,6 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 - [Recharts](https://recharts.org)
 - Lots of other open source components!

-<a id="a-few-links"></a>
 ## A few links

 - If you would like to support us, please consider giving it a ⭐ and click on "watch".
@@ -202,7 +143,6 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 - Need a ping when there's a new release? Use [Newreleases](https://newreleases.io/), a free service to track releases.
 - Watch a Checkmate [installation and usage video](https://www.youtube.com/watch?v=GfFOc0xHIwY)

-<a id="contributing"></a>
 ## Contributing

 We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Aryaman](https://github.com/Br0wnHammer), [Mert](https://github.com/mertssmnoglu) and [Karen](https://github.com/karenvicent) helping individuals and businesses monitor their infra and servers.
@@ -2,9 +2,5 @@ apiVersion: v2
 name: checkmate-chart
 description: A Helm chart for Checkmate App
 type: application
-version: 0.2.0
-# DO NOT bump appVersion past v3.8.1 until this chart is migrated to the all-in-one
-# image (ghcr.io/bluewave-labs/checkmate). The checkmate-client / checkmate-backend /
-# checkmate-mongo images this chart references are frozen at v3.8.1 — later versions
-# are never published, so a bumped chart will fail to pull.
-appVersion: "v3.8.1" # "v" prefix: published image tags are v-prefixed (ghcr.io/.../checkmate-*:v3.8.1)
+version: 0.1.0
+appVersion: "2.3"
@@ -19,11 +19,12 @@ cd checkmate/charts/helm/checkmate

 ### 2. Customize values.yaml
 Edit `values.yaml` to update:
- `client.ingress.host` and `api.ingress.host` with your domain names
- `api.protocol` (usually http or https)
+- `client.ingress.host` and `server.ingress.host` with your domain names
+- `server.protocol` (usually http or https)
 - **If upgrading**: Migrate persistence settings from flat structure to nested:
  - Old: `persistence.mongodbSize` → New: `persistence.mongo.size`
-  - Add: `persistence.mongo.storageClass` (leave empty for default)
+  - Old: `persistence.redisSize` → New: `persistence.redis.size`
+  - Add: `persistence.mongo.storageClass` and `persistence.redis.storageClass` (leave empty for default)
 - Secrets under the `secrets` section (`JWT_SECRET`, email credentials, API keys, etc.) — replace all change_me values
 - **For TLS/HTTPS**: Configure ingress TLS settings (see section below)

@@ -31,7 +32,7 @@ Edit `values.yaml` to update:
 ```bash
 helm install checkmate ./charts/helm/checkmate
 ```
-This will deploy the client, api, and MongoDB components.
+This will deploy the client, server, MongoDB, and Redis components.

 ### 4. Verify the deployment
 Check pods and services:
@@ -42,137 +43,6 @@ kubectl get svc

 Once all pods are `Running` and `Ready`, you can access Checkmate via the configured ingress hosts.

-## Upgrading from a previous release
-
-This release renames the `server.*` value block to `api.*` and drops the (unused) bundled Redis.
-Read this before running `helm upgrade` on an existing install.
-
-### `server.*` → `api.*` (values rename)
-
-The value block formerly named `server` is now `api` (`server.image` → `api.image`,
-`server.ingress.host` → `api.ingress.host`, `server.protocol` → `api.protocol`, `server.resources`,
-`server.affinity`, `server.tolerations`, `server.ingress.*`, etc.).
-
-**Your existing `server.*` overrides keep working** — the chart merges any legacy `server.*` values on
-top of the `api.*` defaults (legacy wins where set), so an unchanged values file upgrades cleanly. The
-shim is transitional; migrate your overrides to `api.*` at your convenience and drop the `server:`
-block. If you set **both** `server.*` and `api.*` for the same field, the legacy `server.*` value wins —
-don't mix them.
-
-### Resource renames cause a replace, not a rename
-
-The Kubernetes objects are renamed alongside the values:
-
-| Old object | New object |
-| --- | --- |
-| Deployment/Service `checkmate-server` | `checkmate-api` |
-| Ingress `checkmate-server-ingress` | `checkmate-api-ingress` |
-| ConfigMap `checkmate-server-nginx-cm` | `checkmate-client-nginx-cm` |
-
-Helm deletes the old objects and creates the new ones on upgrade. Expect a brief API restart and a
-**new ClusterIP** for the API Service — update anything outside the chart that referenced the
-`checkmate-server` Service by name. MongoDB data (its PVC) is untouched.
-
-### Redis removed
-
-The bundled Redis StatefulSet/Service and the `redis.*` / `persistence.redis.*` values are gone — the
-scheduler runs in-process and never used them. Default installs (`redis.enabled: false`) are
-unaffected. If you had explicitly set `redis.enabled: true`, **the Redis StatefulSet and its PVC are
-deleted on upgrade** — back up anything you stored there first. Leftover `redis:` / `persistence.redis:`
-keys in your values file are harmless (ignored).
-
-### New secret defaults
-
-`NODE_ENV: production`, `LOG_LEVEL: info`, and `TOKEN_TTL: 99d` are now part of the default `secrets`
-block and merge into your install unless you override them. Set them explicitly if you relied on
-different values (e.g. a non-production `NODE_ENV`).
-
-### Image tags follow the chart's `appVersion`
-
-Each tier's `image` value is now the repository **without a tag**; the tag defaults to the chart's
-`appVersion`, so the client, api, worker, and mongodb images all move together when you upgrade the
-chart. You can still pin per tier:
-
-```yaml
-api:
-  image: ghcr.io/bluewave-labs/checkmate-backend   # repo only
-  tag: ""            # empty → Chart.appVersion; set e.g. "v3.1.0" to pin, or "latest" for a dev tag
-```
-
- `<tier>.tag` overrides the version for that tier. The `worker` tier inherits `api.tag` (and
-  `api.image`) unless you set `worker.tag` / `worker.image`.
- If you put a **full `repo:tag`** in `image` (e.g. a legacy `server.image: …:v3.2.0` override), it is
-  used verbatim and the `tag` field is ignored — so existing pinned values keep working unchanged.
-
-**Prefer a pinned tag over `latest`.** With the default `imagePullPolicy: IfNotPresent`, `latest` is
-cached per node and never refreshed, and `helm rollback` can't move a floating tag — pin a version (or
-let it default to `appVersion`) for reproducible, rollback-able deploys.
-
-## Scaling: the worker tier & autoscaling
-
-By default the chart runs a single all-in-one API pod that both schedules **and** processes monitoring
-jobs (`worker.enabled: false`). For larger deployments you can split processing onto a dedicated,
-horizontally-scalable worker tier.
-
-### Topology
-
-| `worker.enabled` | API (`checkmate-api`) | Worker (`checkmate-worker`) |
-| --- | --- | --- |
-| `false` (default) | schedules **and** processes jobs (`QUEUE_PRIMARY_PROCESSES=true`) | not deployed |
-| `true` | schedules + serves the API only (`QUEUE_PRIMARY_PROCESSES=false`, derived) | processes all jobs |
-
-`QUEUE_PRIMARY_PROCESSES` is **derived** from `worker.enabled` — you never set it directly, so the API
-and worker tier can never both process (or both ignore) the queue.
-
-### Enabling the worker tier
-
-```yaml
-worker:
-  enabled: true
-  replicas: 2   # used only when autoscaling.enabled = false
-```
-
-The worker takes **no inbound traffic** (no Service): the kubelet probes pod IPs directly on
-`HEALTH_PORT` (`/livez`, `/readyz`), and graceful shutdown drains in-flight jobs before exit.
-
-> **Invariant:** `worker.terminationGracePeriodSeconds` (default `30`) **must stay greater than the
-> server drain timeout (25s)**. Lower it and Kubernetes SIGKILLs workers mid-drain, losing in-flight
-> checks.
-
-> **Caveat:** with the worker tier enabled the API no longer processes jobs, so if **all** workers are
-> down nothing processes. The `autoscaling.minReplicaCount: 1` floor plus liveness restarts mitigate
-> this; full failover to the API would need leader election (not supported).
-
-### Autoscaling with KEDA
-
-Backlog-driven autoscaling is **off by default** and requires the
-[KEDA operator](https://keda.sh/) installed in-cluster. Enable it with:
-
-```yaml
-worker:
-  enabled: true
-  autoscaling:
-    enabled: true
-    minReplicaCount: 1     # processing floor — never 0, or checks silently stall
-    maxReplicaCount: 10
-    backlogPerReplica: 50  # target due-job backlog per worker
-    mongo:
-      dbName: uptime_db    # MUST match the database in DB_CONNECTION_STRING
-```
-
-A KEDA `ScaledObject` queries MongoDB directly for the due-check backlog and scales the worker
-Deployment between `minReplicaCount` and `maxReplicaCount`. When autoscaling is on, the Deployment
-omits `replicas` so it doesn't fight the HPA KEDA creates. Make sure `autoscaling.mongo.dbName`
-matches the database name in your `DB_CONNECTION_STRING`, or the scaler counts the wrong DB (always 0
-backlog → never scales up).
-
-#### Fallback: Prometheus-adapter HPA (not shipped)
-
-If your KEDA/Mongo versions reject the `$$NOW`/`$toLong` query, or you already run Prometheus, scrape
-the worker's `/metrics` (`checkmate_worker_due_backlog`), expose it via prometheus-adapter, and target
-it with a standard `HorizontalPodAutoscaler`. The manifest is left to the operator; the app computes
-`now` in code on this path, so the query coercion is unnecessary.
-
 ## Enabling TLS/HTTPS with cert-manager

 If you have [cert-manager](https://cert-manager.io/) installed in your cluster, you can enable automatic TLS certificate provisioning using Let's Encrypt or other certificate issuers.
@@ -198,7 +68,7 @@ client:
      enabled: true
      secretName: checkmate-client-tls

-api:
+server:
  protocol: https
  ingress:
    enabled: true
@@ -208,7 +78,7 @@ api:
      cert-manager.io/cluster-issuer: "letsencrypt-prod"
    tls:
      enabled: true
-      secretName: checkmate-api-tls
+      secretName: checkmate-server-tls
 ```

 ### Alternative: Using --set flags
@@ -218,13 +88,13 @@ You can also enable TLS during installation using Helm's `--set` flags:
 ```bash
 helm install checkmate ./charts/helm/checkmate \
  --set client.protocol=https \
-  --set api.protocol=https \
+  --set server.protocol=https \
  --set client.ingress.annotations."cert-manager\.io/cluster-issuer"="letsencrypt-prod" \
  --set client.ingress.tls.enabled=true \
  --set client.ingress.tls.secretName=checkmate-client-tls \
-  --set api.ingress.annotations."cert-manager\.io/cluster-issuer"="letsencrypt-prod" \
-  --set api.ingress.tls.enabled=true \
-  --set api.ingress.tls.secretName=checkmate-api-tls
+  --set server.ingress.annotations."cert-manager\.io/cluster-issuer"="letsencrypt-prod" \
+  --set server.ingress.tls.enabled=true \
+  --set server.ingress.tls.secretName=checkmate-server-tls
 ```

 ### Verification
@@ -237,7 +107,7 @@ kubectl get certificates

 # Check certificate details
 kubectl describe certificate checkmate-client-tls
-kubectl describe certificate checkmate-api-tls
+kubectl describe certificate checkmate-server-tls

 # Verify the secrets were created
 kubectl get secrets | grep checkmate-tls
@@ -1,35 +0,0 @@
-{{- /*
-Back-compat shim: the `server.*` value block was renamed to `api.*`. Existing installs that
-still pass a legacy `server:` block keep working — this returns the effective API values with any
-legacy `server.*` overrides merged on top of the `api.*` defaults (legacy wins where set).
-
-New installs have no `server:` key, so this is a no-op deepCopy of `.Values.api`. Consume it as:
-  {{- $api := include "checkmate.api" . | fromYaml -}}
-then reference `$api.*` instead of `.Values.api.*`.
-*/}}
-{{- define "checkmate.api" -}}
-{{- $api := deepCopy .Values.api -}}
-{{- with .Values.server -}}
-{{- $api = mergeOverwrite $api (deepCopy .) -}}
-{{- end -}}
-{{- $api | toYaml -}}
-{{- end -}}
-
-{{- /*
-Resolve a full image reference from a repo + optional tag. `appVersion` is the single source of
-truth for tags: bumping Chart.appVersion moves every tier at once. Call as:
-  {{ include "checkmate.image" (dict "image" $repo "tag" $tag "root" $) }}
-
-If `image` already carries a tag (a ":" in its final path segment) it is used verbatim — this keeps
-legacy `server.image: repo:tag` overrides working and lets anyone pin a full ref (e.g. tag "latest").
-A ":" only in the registry segment (a registry port like "reg:5000/x") is ignored, so a tag is still
-appended. Otherwise the tag is `tag` if set, else the chart's appVersion.
-*/}}
-{{- define "checkmate.image" -}}
-{{- $lastSegment := .image | splitList "/" | last -}}
-{{- if contains ":" $lastSegment -}}
-{{- .image -}}
-{{- else -}}
-{{- printf "%s:%s" .image (.tag | default .root.Chart.AppVersion) -}}
-{{- end -}}
-{{- end -}}
@@ -1,65 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: checkmate-api
-spec:
-  replicas: 1 # single scheduler — seeds/reconciles the jobs collection
-  selector:
-    matchLabels:
-      app: checkmate-api
-  template:
-    metadata:
-      labels:
-        app: checkmate-api
-    spec:
-    {{- with $api.affinity }}
-      affinity:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-    {{- with $api.tolerations }}
-      tolerations:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-      containers:
-        - name: api
-          image: {{ include "checkmate.image" (dict "image" $api.image "tag" $api.tag "root" $) }}
-          imagePullPolicy: {{ $api.imagePullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ $api.port }}
-          envFrom:
-            - secretRef:
-                name: checkmate-secrets
-          # Probes hit the Express /api/v1/health endpoint — proves the HTTP server is responsive.
-          # NOTE: this does NOT detect a wedged job loop when queuePrimaryProcesses=true (the API is
-          # also a worker). Worker-aware health for that mode is a follow-up — see worker-health-checks.md §7.5.
-          livenessProbe:
-            httpGet:
-              path: /api/v1/health
-              port: http
-            initialDelaySeconds: {{ $api.probes.liveness.initialDelaySeconds }}
-            periodSeconds: {{ $api.probes.liveness.periodSeconds }}
-            timeoutSeconds: {{ $api.probes.liveness.timeoutSeconds }}
-            failureThreshold: {{ $api.probes.liveness.failureThreshold }}
-          readinessProbe:
-            httpGet:
-              path: /api/v1/health
-              port: http
-            initialDelaySeconds: {{ $api.probes.readiness.initialDelaySeconds }}
-            periodSeconds: {{ $api.probes.readiness.periodSeconds }}
-            timeoutSeconds: {{ $api.probes.readiness.timeoutSeconds }}
-            failureThreshold: {{ $api.probes.readiness.failureThreshold }}
-          {{- with $api.resources }}
-          resources:
-              {{- tpl ( . | toYaml) $ | nindent 12 }}
-          {{- end }}
-          env:
-          - name: CLIENT_HOST
-            value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
-          - name: QUEUE_MODE
-            value: "primary"
-          # Derived: when a worker tier is deployed the API only schedules (false); otherwise it is
-          # all-in-one and processes jobs itself (true). Keeps the two from ever competing for jobs.
-          - name: QUEUE_PRIMARY_PROCESSES
-            value: {{ not .Values.worker.enabled | quote }}
@@ -1,10 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: checkmate-api
-spec:
-  selector:
-    app: checkmate-api
-  ports:
-    - port: {{ $api.port }}
@@ -1,4 +1,3 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -23,13 +22,12 @@ spec:
    {{- end }}
      containers:
        - name: client
-          image: {{ include "checkmate.image" (dict "image" .Values.client.image "tag" .Values.client.tag "root" $) }}
-          imagePullPolicy: {{ .Values.client.imagePullPolicy }}
+          image: {{ .Values.client.image }}
          ports:
            - containerPort: {{ .Values.client.port }}
          env:
            - name: UPTIME_APP_API_BASE_URL
-              value: "{{ $api.protocol }}://{{ $api.ingress.host }}/api/v1"
+              value: "{{ .Values.server.protocol }}://{{ .Values.server.ingress.host }}/api/v1"
            - name: UPTIME_APP_CLIENT_HOST
              value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
          volumeMounts:
@@ -43,4 +41,4 @@ spec:
      volumes:
        - name: config-volume
          configMap:
-            name: checkmate-client-nginx-cm
+            name: checkmate-server-nginx-cm
@@ -22,8 +22,7 @@ spec:
    {{- end }}
      containers:
        - name: mongodb
-          image: {{ include "checkmate.image" (dict "image" .Values.mongodb.image "tag" .Values.mongodb.tag "root" $) }}
-          imagePullPolicy: {{ .Values.mongodb.imagePullPolicy }}
+          image: {{ .Values.mongodb.image }}
          ports:
            - containerPort: {{ .Values.mongodb.port }}
          command: ["mongod", "--quiet", "--bind_ip_all"]
@@ -38,9 +37,7 @@ spec:
    - metadata:
        name: checkmate-mongo-persistent-storage
      spec:
-        {{- with .Values.persistence.mongo.storageClass }}
-        storageClassName: {{ . | quote }} {{/* omitted when empty so the cluster's default StorageClass applies */}}
-        {{- end }}
+        storageClassName: {{ .Values.persistence.mongo.storageClass | quote }}
        accessModes: ["ReadWriteOnce"]
        resources:
          requests:
@@ -1,15 +1,14 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
 {{- if eq .Values.client.ingress.host "change_me" }}
  {{- fail "client.ingress.host must be overridden and not set to 'change_me'" }}
 {{- end }}

-{{- if eq $api.ingress.host "change_me" }}
-  {{- fail "api.ingress.host (or legacy server.ingress.host) must be overridden and not set to 'change_me'" }}
+{{- if eq .Values.server.ingress.host "change_me" }}
+  {{- fail "server.ingress.host must be overridden and not set to 'change_me'" }}
 {{- end }}

-{{- $apiProtocol := $api.protocol }}
-{{- if not (or (eq $apiProtocol "http") (eq $apiProtocol "https")) }}
-  {{- fail "api.protocol must be either 'http' or 'https'" }}
+{{- $serverProtocol := .Values.server.protocol }}
+{{- if not (or (eq $serverProtocol "http") (eq $serverProtocol "https")) }}
+  {{- fail "server.protocol must be either 'http' or 'https'" }}
 {{- end }}

 {{- $clientProtocol := .Values.client.protocol }}
@@ -22,33 +21,28 @@
  {{- fail "client.ingress.tls.enabled is true but client.protocol is not 'https'. Set client.protocol: https to avoid mixed content." }}
 {{- end }}

-{{- if and $api.ingress.tls.enabled (ne $apiProtocol "https") }}
-  {{- fail "api.ingress.tls.enabled is true but api.protocol is not 'https'. Set api.protocol: https to ensure correct API base URL." }}
+{{- if and .Values.server.ingress.tls.enabled (ne $serverProtocol "https") }}
+  {{- fail "server.ingress.tls.enabled is true but server.protocol is not 'https'. Set server.protocol: https to ensure correct API base URL." }}
 {{- end }}

 {{/* If client runs on https, API must also be https to avoid mixed content */}}
-{{- if and (eq $clientProtocol "https") (ne $apiProtocol "https") }}
-  {{- fail "client.protocol is 'https' but api.protocol is not. Set api.protocol: https to prevent browser mixed-content issues." }}
+{{- if and (eq $clientProtocol "https") (ne $serverProtocol "https") }}
+  {{- fail "client.protocol is 'https' but server.protocol is not. Set server.protocol: https to prevent browser mixed-content issues." }}
 {{- end }}

 {{/* Fail early if TLS enabled without cert-manager annotations (cluster-issuer or issuer) */}}
 {{- $cAnn := .Values.client.ingress.annotations | default dict }}
-{{- $aAnn := $api.ingress.annotations | default dict }}
+{{- $sAnn := .Values.server.ingress.annotations | default dict }}

 {{- $clientHasIssuer := or (hasKey $cAnn "cert-manager.io/cluster-issuer") (hasKey $cAnn "cert-manager.io/issuer") }}
-{{- $apiHasIssuer := or (hasKey $aAnn "cert-manager.io/cluster-issuer") (hasKey $aAnn "cert-manager.io/issuer") }}
+{{- $serverHasIssuer := or (hasKey $sAnn "cert-manager.io/cluster-issuer") (hasKey $sAnn "cert-manager.io/issuer") }}

 {{- if and .Values.client.ingress.tls.enabled (not $clientHasIssuer) }}
  {{- fail "client.ingress.tls.enabled is true but no cert-manager issuer annotation found. Add 'cert-manager.io/cluster-issuer' or 'cert-manager.io/issuer'." }}
 {{- end }}

-{{- if and $api.ingress.tls.enabled (not $apiHasIssuer) }}
-  {{- fail "api.ingress.tls.enabled is true but no cert-manager issuer annotation found. Add 'cert-manager.io/cluster-issuer' or 'cert-manager.io/issuer'." }}
+{{- if and .Values.server.ingress.tls.enabled (not $serverHasIssuer) }}
+  {{- fail "server.ingress.tls.enabled is true but no cert-manager issuer annotation found. Add 'cert-manager.io/cluster-issuer' or 'cert-manager.io/issuer'." }}
 {{- end }}

-{{/* Worker grace period must exceed the server drain timeout (25s) or workers are SIGKILLed mid-drain */}}
-{{- if and .Values.worker.enabled (le (int .Values.worker.terminationGracePeriodSeconds) 25) }}
-  {{- fail "worker.terminationGracePeriodSeconds must be greater than 25 (the server drain timeout) or workers are killed mid-drain" }}
-{{- end }}
-
-{{/* Secret name can be omitted; we default to <release>-client|api-tls in templates */}}
+{{/* Secret name can be omitted; we default to <release>-client|server-tls in templates */}}
@@ -0,0 +1,11 @@
+{{- if .Values.redis.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: checkmate-redis
+spec:
+  selector:
+    app: checkmate-redis
+  ports:
+    - port: {{ .Values.redis.port }}
+{{- end }}
@@ -0,0 +1,33 @@
+{{- if .Values.redis.enabled }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: checkmate-redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: checkmate-redis
+  template:
+    metadata:
+      labels:
+        app: checkmate-redis
+    spec:
+      containers:
+        - name: redis
+          image: {{ .Values.redis.image }}
+          ports:
+            - containerPort: {{ .Values.redis.port }}
+          volumeMounts:
+            - name: redis-data
+              mountPath: /data
+  volumeClaimTemplates:
+    - metadata:
+        name: checkmate-redis-persistent-storage
+      spec:
+        storageClassName: {{ .Values.persistence.redis.storageClass | quote }}
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: {{ .Values.persistence.redis.size | default "1Gi" | quote }}
+{{- end }}
@@ -4,14 +4,6 @@
  {{- fail "secrets.JWT_SECRET must be overridden and cannot be 'change_me'" }}
 {{- end }}

-{{- /*
-  The bundled Mongo service ("checkmate-mongodb") lives in .Release.Namespace. App pods reach it
-  by bare name, but the KEDA operator runs in its own namespace and a bare name is NXDOMAIN there,
-  so worker autoscaling fails to query the backlog. Qualify the in-cluster host to its FQDN here so
-  the one connection string resolves from every namespace. External/already-qualified hosts are not
-  matched (the char after the host name is "." for an FQDN, which the pattern excludes).
-*/}}
-{{- $mongoFqdn := printf "checkmate-mongodb.%s.svc.cluster.local" .Release.Namespace }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -19,9 +11,5 @@ metadata:
 type: Opaque
 stringData:
 {{- range $key, $value := $secrets }}
-{{- if eq $key "DB_CONNECTION_STRING" }}
-  {{ $key }}: {{ regexReplaceAll "(//|@)checkmate-mongodb([:/,]|$)" $value (printf "${1}%s${2}" $mongoFqdn) | quote }}
-{{- else }}
  {{ $key }}: {{ $value | quote }}
-{{- end }}
 {{- end }}
@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: checkmate-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: checkmate-server
+  template:
+    metadata:
+      labels:
+        app: checkmate-server
+    spec:
+    {{- with .Values.server.affinity }}
+      affinity:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+    {{- with .Values.server.tolerations }}
+      tolerations:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+      containers:
+        - name: server
+          image: {{ .Values.server.image }}
+          ports:
+            - containerPort: {{ .Values.server.port }}
+          envFrom:
+            - secretRef:
+                name: checkmate-secrets
+          {{- with .Values.server.resources }}
+          resources:
+              {{- tpl ( . | toYaml) $ | nindent 12 }}
+          {{- end }}
+          env:
+          - name: CLIENT_HOST
+            value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
@@ -1,12 +1,11 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-{{- if $api.ingress.enabled }}
+{{- if .Values.server.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: checkmate-api-ingress
-  {{- if $api.ingress.annotations }}
+  name: checkmate-server-ingress
+  {{- if .Values.server.ingress.annotations }}
  annotations:
-    {{- range $key, $value := $api.ingress.annotations }}
+    {{- range $key, $value := .Values.server.ingress.annotations }}
    {{ $key }}: {{ $value | quote }}
    {{- end }}
  {{- end }}
@@ -18,22 +17,22 @@ metadata:
    #nginx.ingress.kubernetes.io/cors-allow-headers: "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization"
    #nginx.ingress.kubernetes.io/cors-allow-credentials: "true"*/}}
 spec:
-  ingressClassName: {{ $api.ingress.className }}
-  {{- if $api.ingress.tls.enabled }}
+  ingressClassName: {{ .Values.server.ingress.className }}
+  {{- if .Values.server.ingress.tls.enabled }}
  tls:
    - hosts:
-        - {{ $api.ingress.host }}
-      secretName: {{ default (printf "%s-api-tls" .Release.Name) $api.ingress.tls.secretName }}
+        - {{ .Values.server.ingress.host }}
+      secretName: {{ default (printf "%s-server-tls" .Release.Name) .Values.server.ingress.tls.secretName }}
  {{- end }}
  rules:
-    - host: {{ $api.ingress.host }}
+    - host: {{ .Values.server.ingress.host }}
      http:
        paths:
          - path: /api/v1
            pathType: Prefix
            backend:
              service:
-                name: checkmate-api
+                name: checkmate-server
                port:
-                  number: {{ $api.port }}
+                  number: {{ .Values.server.port }}
 {{- end }}
@@ -1,8 +1,7 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
 apiVersion: v1
-kind: ConfigMap
+kind: ConfigMap 
 metadata:
-  name: checkmate-client-nginx-cm
+  name: checkmate-server-nginx-cm
 data:
  default.conf: |
    server {
@@ -23,7 +22,7 @@ data:
      }

      # location /api/ {
-      #     proxy_pass http://{{ $api.ingress.host }}:5000/api/;
+      #     proxy_pass http://{{ .Values.server.ingress.host }}:5000/api/;
      #     proxy_http_version 1.1;
      #     proxy_set_header Host $host;
      #     proxy_set_header X-Real-IP $remote_addr;
@@ -32,7 +31,7 @@ data:
      # }

      location /api-docs/ {
-          proxy_pass http://{{ $api.ingress.host }}:5000/api-docs/;
+          proxy_pass http://{{ .Values.server.ingress.host }}:5000/api-docs/;
          proxy_http_version 1.1;
          proxy_set_header Host $host;
          proxy_set_header X-Real-IP $remote_addr;
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: checkmate-server
+spec:
+  selector:
+    app: checkmate-server
+  ports:
+    - port: {{ .Values.server.port }}
@@ -1,66 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-{{- if .Values.worker.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: checkmate-worker
-spec:
-  {{- if not .Values.worker.autoscaling.enabled }}
-  replicas: {{ .Values.worker.replicas }} # omitted when autoscaling owns the replica count
-  {{- end }}
-  selector:
-    matchLabels:
-      app: checkmate-worker
-  template:
-    metadata:
-      labels:
-        app: checkmate-worker
-    spec:
-      terminationGracePeriodSeconds: {{ .Values.worker.terminationGracePeriodSeconds }}
-    {{- with .Values.worker.affinity }}
-      affinity:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-    {{- with .Values.worker.tolerations }}
-      tolerations:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-      containers:
-        - name: worker
-          image: {{ include "checkmate.image" (dict "image" (.Values.worker.image | default $api.image) "tag" (.Values.worker.tag | default $api.tag) "root" $) }}
-          imagePullPolicy: {{ .Values.worker.imagePullPolicy | default $api.imagePullPolicy }}
-          ports:
-            - name: health
-              containerPort: {{ .Values.worker.healthPort }}
-          envFrom:
-            - secretRef:
-                name: checkmate-secrets # DB_CONNECTION_STRING (+ JWT_SECRET/CLIENT_HOST for validateEnv)
-          env:
-          # Secret default CLIENT_HOST is the non-URL "change_me"; override like the API so validateEnv passes.
-          - name: CLIENT_HOST
-            value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
-          - name: QUEUE_MODE
-            value: "worker"
-          - name: HEALTH_PORT
-            value: {{ .Values.worker.healthPort | quote }}
-          livenessProbe:
-            httpGet:
-              path: /livez
-              port: health
-            initialDelaySeconds: {{ .Values.worker.probes.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.worker.probes.liveness.periodSeconds }}
-            timeoutSeconds: {{ .Values.worker.probes.liveness.timeoutSeconds }}
-            failureThreshold: {{ .Values.worker.probes.liveness.failureThreshold }}
-          readinessProbe:
-            httpGet:
-              path: /readyz
-              port: health
-            initialDelaySeconds: {{ .Values.worker.probes.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.worker.probes.readiness.periodSeconds }}
-            timeoutSeconds: {{ .Values.worker.probes.readiness.timeoutSeconds }}
-            failureThreshold: {{ .Values.worker.probes.readiness.failureThreshold }}
-          {{- with .Values.worker.resources }}
-          resources:
-              {{- tpl ( . | toYaml) $ | nindent 12 }}
-          {{- end }}
-{{- end }}
@@ -1,30 +0,0 @@
-{{- if and .Values.worker.enabled .Values.worker.autoscaling.enabled }}
-apiVersion: keda.sh/v1alpha1
-kind: ScaledObject
-metadata:
-  name: checkmate-worker
-spec:
-  scaleTargetRef:
-    name: checkmate-worker
-  minReplicaCount: {{ .Values.worker.autoscaling.minReplicaCount }} # floor: never 0 — a cold gap stops checks
-  maxReplicaCount: {{ .Values.worker.autoscaling.maxReplicaCount }}
-  cooldownPeriod: {{ .Values.worker.autoscaling.cooldownPeriod }}
-  advanced:
-    horizontalPodAutoscalerConfig:
-      behavior:
-        scaleDown:
-          stabilizationWindowSeconds: {{ .Values.worker.autoscaling.stabilizationWindowSeconds }}
-  triggers:
-    - type: mongodb
-      metadata:
-        dbName: {{ .Values.worker.autoscaling.mongo.dbName | quote }}
-        collection: {{ .Values.worker.autoscaling.mongo.collection | quote }}
-        # The Phase 2 countDueBacklog predicate, time-relativized with $$NOW (epoch-ms via $toLong):
-        query: >-
-          { "type": "check", "isActive": true,
-            "$expr": { "$lte": ["$nextScheduledAt", { "$toLong": "$$NOW" }] },
-            "$or": [ { "lockedUntil": null },
-                     { "$expr": { "$lt": ["$lockedUntil", { "$toLong": "$$NOW" }] } } ] }
-        queryValue: {{ .Values.worker.autoscaling.backlogPerReplica | quote }}
-        connectionStringFromEnv: DB_CONNECTION_STRING # resolved from the worker's checkmate-secrets
-{{- end }}
@@ -1,7 +1,5 @@
 client:
-  image: ghcr.io/bluewave-labs/checkmate-client
-  tag: "" # defaults to Chart.appVersion; set a full repo:tag in `image` to pin (e.g. a :latest dev tag)
-  imagePullPolicy: IfNotPresent # IfNotPresent so kind-loaded :latest images are used (not pulled)
+  image: ghcr.io/bluewave-labs/checkmate-client:v3.2.0
  port: 80
  protocol: http
  ingress:
@@ -19,24 +17,10 @@ client:
      # a cert-manager issuer annotation (e.g. cert-manager.io/cluster-issuer: "letsencrypt-prod").
      # The secret will be automatically created by cert-manager when using the cert-manager.io/cluster-issuer annotation

-api:
-  image: ghcr.io/bluewave-labs/checkmate-backend
-  tag: "" # defaults to Chart.appVersion; set a full repo:tag in `image` to pin (e.g. a :latest dev tag)
-  imagePullPolicy: IfNotPresent # IfNotPresent so kind-loaded :latest images are used (not pulled)
+server:
+  image: ghcr.io/bluewave-labs/checkmate-backend:v3.2.0
  port: 52345
  protocol: http
-  # Liveness/readiness probes hit GET /api/v1/health on the api port (proves the HTTP server is up).
-  probes:
-    liveness:
-      initialDelaySeconds: 10
-      periodSeconds: 10
-      timeoutSeconds: 3
-      failureThreshold: 3
-    readiness:
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      timeoutSeconds: 3
-      failureThreshold: 3
  ingress:
    enabled: true
    host: change_me
@@ -47,62 +31,40 @@ api:
    #   cert-manager.io/cluster-issuer: "letsencrypt-prod"
    tls:
      enabled: false
-      # secretName: {{ .Release.Name }}-api-tls  # Optional; defaults to <release>-api-tls if omitted
-      # Note: when enabling TLS, also set api.protocol: https and add
+      # secretName: {{ .Release.Name }}-server-tls  # Optional; defaults to <release>-server-tls if omitted
+      # Note: when enabling TLS, also set server.protocol: https and add
      # a cert-manager issuer annotation (e.g. cert-manager.io/cluster-issuer: "letsencrypt-prod").
      # The secret will be automatically created by cert-manager when using the cert-manager.io/cluster-issuer annotation

-mongodb:
-  image: ghcr.io/bluewave-labs/checkmate-mongo
-  tag: "" # defaults to Chart.appVersion; set a full repo:tag in `image` to pin
-  imagePullPolicy: IfNotPresent # IfNotPresent so kind-loaded :latest images are used (not pulled)
-  port: 27017
-
-worker:
-  # Off by default; existing installs are unchanged. When true, a dedicated worker processes all
-  # jobs and the API stops processing (QUEUE_PRIMARY_PROCESSES is derived as false). When false, the
-  # API is all-in-one and processes jobs itself.
+redis:
  enabled: false
-  image: "" # defaults to api.image when empty, same as API image
-  tag: "" # defaults to api.tag (-> Chart.appVersion) when empty
-  imagePullPolicy: "" # defaults to api.imagePullPolicy when empty
-  replicas: 1 # used only when autoscaling.enabled = false
-  healthPort: 52346 # HEALTH_PORT; serves /livez /readyz /metrics
-  terminationGracePeriodSeconds: 30 # MUST stay > the server drain timeout (25s) or workers are killed mid-drain
-  resources: {}
-  affinity: {}
-  tolerations: {}
-  probes:
-    liveness: # /livez — failureThreshold>=3 so one slow tick never restarts mid-job
-      initialDelaySeconds: 10
-      periodSeconds: 10
-      timeoutSeconds: 3
-      failureThreshold: 3
-    readiness: # /readyz — flips to 503 on drain
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      timeoutSeconds: 3
-      failureThreshold: 3
-  autoscaling:
-    enabled: false # requires the KEDA operator installed in-cluster
-    minReplicaCount: 1 # processing floor — never 0 (a cold gap silently stops checks)
-    maxReplicaCount: 10
-    backlogPerReplica: 50 # KEDA queryValue: target due-backlog per worker
-    cooldownPeriod: 300 # seconds before scaling an idle target down
-    stabilizationWindowSeconds: 300 # damp the interval-boundary herd
-    mongo:
-      dbName: uptime_db # must match DB_CONNECTION_STRING's database
-      collection: jobs
+  image: redis:7.2
+  port: 6379
+
+mongodb:
+  image: ghcr.io/bluewave-labs/checkmate-mongo:v3.2.0
+  port: 27017

 secrets:
  JWT_SECRET: change_me
-  DB_CONNECTION_STRING: mongodb://checkmate-mongodb:27017/uptime_db
+#  REFRESH_TOKEN_SECRET: change_me
+#  SYSTEM_EMAIL_ADDRESS: test@example.com
+#  SYSTEM_EMAIL_PASSWORD: change_me
+#  SYSTEM_EMAIL_HOST: smtp.example.com
+#  SYSTEM_EMAIL_PORT: "587"
+#  PAGESPEED_API_KEY: change_me
+  DB_CONNECTION_STRING: mongodb://checkmate-mongodb.namespace.svc:27017/uptime_db
  CLIENT_HOST: change_me
-  NODE_ENV: production
-  LOG_LEVEL: info
-  TOKEN_TTL: 99d
+#  REDIS_HOST: redis
+#  REDIS_PORT: "6379"
+#  DB_TYPE: MongoDB
+#  TOKEN_TTL: 99d
+#  REFRESH_TOKEN_TTL: 99d

 persistence:
  mongo:
    size: 5Gi
    storageClass: ""
+  redis:
+    size: 1Gi
+    storageClass: ""
@@ -1,6 +1,4 @@
-# Production builds use same-origin defaults: API at /api/v1, client host from
-# window.location.origin. The empty values below override any local .env so a
-# production build never bakes in a developer's localhost URLs.
-VITE_APP_API_BASE_URL=
-VITE_APP_CLIENT_HOST=
-VITE_APP_LOG_LEVEL=
+VITE_APP_API_BASE_URL=UPTIME_APP_API_BASE_URL
+VITE_APP_API_V2_BASE_URL=UPTIME_APP_API_V2_BASE_URL
+VITE_APP_CLIENT_HOST=UPTIME_APP_CLIENT_HOST
+VITE_APP_LOG_LEVEL=UPTIME_APP_LOG_LEVEL
@@ -28,4 +28,5 @@ dist-ssr

 # Scripts
 *.sh
+!env.sh
 .env.development
@@ -0,0 +1,8 @@
+#!/bin/sh
+for i in $(env | grep UPTIME_APP_)
+do
+    key=$(echo $i | cut -d '=' -f 1)
+    value=$(echo $i | cut -d '=' -f 2-)
+    echo $key=$value
+    find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|${key}|${value}|g" '{}' +
+done
@@ -12,7 +12,6 @@
 		/>

 		<title>Checkmate</title>
-		<script src="/config.js"></script>
 	</head>

 	<body>
@@ -1,7 +1,7 @@
 {
 	"name": "client",
 	"private": true,
-	"version": "3.10.0",
+	"version": "3.7.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -14,10 +14,9 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write --ignore-unknown"
+		"**/*": "prettier --write"
 	},
 	"dependencies": {
-		"@csstools/css-tokenizer": "^3.0.4",
 		"@emotion/react": "^11.13.3",
 		"@emotion/styled": "^11.13.0",
 		"@hello-pangea/dnd": "^18.0.0",
@@ -28,12 +27,12 @@
 		"@mui/x-date-pickers": "7.29.4",
 		"@reduxjs/toolkit": "2.7.0",
 		"@types/maplibre-gl": "^1.13.2",
-		"axios": "^1.15.2",
+		"axios": "^1.7.4",
 		"dayjs": "1.11.13",
 		"html2canvas": "^1.4.1",
 		"human-interval": "2.0.1",
 		"i18next": "25.4.2",
-		"joi": "17.13.4",
+		"joi": "17.13.3",
 		"lucide-react": "^0.562.0",
 		"maplibre-gl": "^5.19.0",
 		"mui-color-input": "^7.0.0",
@@ -67,9 +66,8 @@
 		"eslint-plugin-react-hooks": "^5.0.0",
 		"eslint-plugin-react-refresh": "^0.4.6",
 		"lint-staged": "^16.2.7",
-		"mongoose": "9.6.2",
 		"prettier": "^3.3.3",
 		"typescript": "5.9.3",
-		"vite": "^6.4.2"
+		"vite": "6.4.1"
 	}
 }
@@ -1,4 +0,0 @@
-// Fallback so /config.js always resolves (e.g. under the Vite dev server). In
-// the Docker image the server shadows this path and renders the real config
-// from its CLIENT_CONFIG_* environment variables.
-window.__CHECKMATE_CONFIG__ = {};
@@ -5,7 +5,7 @@ import { getResponseColor } from "@/Utils/DataUtils";
 import { HeatmapResponseTimeTooltip } from "@/Components/common/charts/HeatmapResponseTimeTooltip";
 import type { SxProps } from "@mui/material/styles";
 import type { ResponsiveStyleValue } from "@mui/system";
-import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
+
 interface PlaceholderCheck {
 	status: "placeholder";
 	responseTime: 0;
@@ -32,11 +32,11 @@ export const HeatmapResponseTime = ({

 	if (!checks || checks.length === 0) return null;

-	const latestChecks = checks.slice(-MAX_RECENT_CHECKS);
+	const latestChecks = checks.slice(-25);

 	let data: Array<CheckSnapshot | PlaceholderCheck>;
-	if (latestChecks.length !== MAX_RECENT_CHECKS) {
-		const placeholders = Array(MAX_RECENT_CHECKS - latestChecks.length).fill({
+	if (latestChecks.length !== 25) {
+		const placeholders = Array(25 - latestChecks.length).fill({
 			status: "placeholder" as const,
 		});
 		data = [...latestChecks, ...placeholders];
@@ -44,13 +44,13 @@ export const HeatmapResponseTime = ({
 		data = latestChecks;
 	}
 	return (
-		<Box width={"100%"}>
+		<Box sx={{ width: "100%" }}>
 			<Box
-				width={"100%"}
-				display={"grid"}
-				gap={gap}
 				sx={{
-					gridTemplateColumns: `repeat(${MAX_RECENT_CHECKS}, 1fr)`,
+					width: "100%",
+					display: "grid",
+					gridTemplateColumns: "repeat(25, 1fr)",
+					gap: gap,
 					alignItems: "stretch",
 				}}
 			>
@@ -82,50 +82,50 @@ export const HeatmapResponseTime = ({
 							check={check}
 						>
 							<Box
-								display={"grid"}
 								sx={{
+									display: "grid",
 									gridTemplateRows: "auto auto",
 								}}
 							>
 								<Box
-									display={"flex"}
-									gap={theme.spacing(2)}
 									sx={{
+										display: "flex",
 										flexDirection: "column",
+										gap: theme.spacing(2),
 									}}
 								>
 									<Box
-										width={"100%"}
 										sx={{
 											position: "relative",
+											width: "100%",
 											aspectRatio: "10",
 										}}
 									>
 										<Box
-											bgcolor={statusBg}
-											borderRadius={theme.shape.borderRadius}
 											sx={{
 												position: "absolute",
 												inset: 0,
+												bgcolor: statusBg,
+												borderRadius: theme.spacing(0.5),
 												...availabilityCellSx,
 											}}
 										/>
 										<Box
-											borderRadius={theme.shape.borderRadius}
 											sx={{
 												position: "absolute",
 												inset: 0,
 												pointerEvents: "none",
+												borderRadius: theme.spacing(0.5),
 												boxShadow: `inset 0 0 0 2px ${statusBorder}`,
 											}}
 										/>
 									</Box>
 									<Box
-										width={"100%"}
-										bgcolor={respBg}
-										borderRadius={theme.shape.borderRadius}
 										sx={{
+											width: "100%",
 											aspectRatio: "1 / 1",
+											bgcolor: respBg,
+											borderRadius: theme.spacing(0.5),
 											...responseCellSx,
 										}}
 									/>
@@ -7,7 +7,6 @@ import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import type { RootState } from "@/Types/state";
 import { useTranslation } from "react-i18next";
-import prettyMilliseconds from "pretty-ms";

 type HeatmapCheck =
 	| CheckSnapshot
@@ -59,9 +58,7 @@ export const HeatmapResponseTimeTooltip = ({
 					</Typography>
 					<Typography>
 						{t("common.labels.responseTime")}:{" "}
-						{check?.responseTime
-							? prettyMilliseconds(check.responseTime, { compact: true })
-							: "N/A"}
+						{check?.originalResponseTime?.toFixed() ?? "N/A"} ms
 					</Typography>
 					<Typography textTransform={"capitalize"}>
 						Status:{" "}
@@ -7,8 +7,6 @@ import type { CheckSnapshot } from "@/Types/Check";
 import { HeatmapResponseTimeTooltip } from "./HeatmapResponseTimeTooltip";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
-import { computeBarHeights } from "@/Utils/DataUtils";

 interface HistogramResponseTimeProps {
 	checks: CheckSnapshot[];
@@ -30,13 +28,13 @@ const calculateResponseTimeStats = (checks: CheckSnapshot[]): ResponseTimeStats
 		return { max: "-", avg: "-" };
 	}

-	const validChecks = checks.filter((check) => check.responseTime != null);
+	const validChecks = checks.filter((check) => check.originalResponseTime != null);
 	if (validChecks.length === 0) {
 		return { max: "-", avg: "-" };
 	}

-	const responseTimes = validChecks.map((check) => check.responseTime);
-	const max = Math.round(Math.max(...responseTimes));
+	const responseTimes = validChecks.map((check) => check.originalResponseTime);
+	const max = Math.max(...responseTimes);
 	const avg = Math.round(
 		responseTimes.reduce((sum, time) => sum + time, 0) / responseTimes.length
 	);
@@ -55,15 +53,12 @@ export const HistogramResponseTime = ({
 	const { t } = useTranslation();

 	const stats = useMemo(() => calculateResponseTimeStats(checks), [checks]);
-	const barHeights = useMemo(() => computeBarHeights(checks), [checks]);
+
 	if (!Array.isArray(checks) || checks.length === 0) return null;

 	const data =
-		checks.length !== MAX_RECENT_CHECKS
-			? [
-					...checks,
-					...Array(MAX_RECENT_CHECKS - checks.length).fill({ status: "placeholder" }),
-				]
+		checks.length !== 25
+			? [...checks, ...Array(25 - checks.length).fill({ status: "placeholder" })]
 			: checks;

 	const chartHeight = typeof height === "number" ? `${height}px` : height;
@@ -74,20 +69,14 @@ export const HistogramResponseTime = ({
 			<Stack
 				justifyContent="center"
 				alignItems={statsPosition === "left" ? "flex-end" : "flex-start"}
-				width={110}
+				minWidth={70}
 				pr={statsPosition === "left" ? theme.spacing(8) : 0}
 				pl={statsPosition === "right" ? theme.spacing(8) : 0}
 			>
-				<Typography
-					variant="body2"
-					noWrap
-				>
+				<Typography variant="body2">
 					{t("common.charts.histogram.avg", { value: stats.avg })}
 				</Typography>
-				<Typography
-					variant="body2"
-					noWrap
-				>
+				<Typography variant="body2">
 					{t("common.charts.histogram.max", { value: stats.max })}
 				</Typography>
 			</Stack>
@@ -97,45 +86,45 @@ export const HistogramResponseTime = ({
 		<Stack
 			direction={statsPosition === "left" ? "row-reverse" : "row"}
 			alignItems="center"
-			width={"100%"}
+			sx={{ width: "100%" }}
 		>
 			<Box sx={{ flex: 1 }}>
 				<Box
-					width={"100%"}
-					display={"grid"}
-					gap={gridGap}
-					height={chartHeight}
 					sx={{
-						gridTemplateColumns: `repeat(${MAX_RECENT_CHECKS}, 1fr)`,
+						width: "100%",
+						display: "grid",
+						gridTemplateColumns: "repeat(25, 1fr)",
+						gap: gridGap,
 						alignItems: "end",
+						height: chartHeight,
 					}}
 				>
 					{data.map((check, index) => {
 						const isPlaceholder = (check as any).status === "placeholder";
-						const heightPct = `${barHeights[index] ?? 0}%`;
+						const heightPct = `${Math.max(0, Math.min(100, (check as any).responseTime ?? 0))}%`;
 						const barColor =
 							check.status === true
 								? theme.palette.success.light
 								: theme.palette.error.light;
 						const bar = (
 							<Box
-								width={"100%"}
-								height={"100%"}
-								borderRadius={theme.shape.borderRadius}
-								bgcolor={theme.palette.action.hover}
 								sx={{
 									position: "relative",
+									width: "100%",
+									height: "100%",
+									borderRadius: theme.spacing(1),
+									bgcolor: theme.palette.action.hover,
 									overflow: "hidden",
 								}}
 							>
 								<Box
-									width={"100%"}
-									height={isPlaceholder ? 0 : heightPct}
-									bgcolor={barColor}
 									sx={{
 										position: "absolute",
 										bottom: 0,
 										left: 0,
+										width: "100%",
+										height: isPlaceholder ? 0 : heightPct,
+										bgcolor: barColor,
 										transition: "height 500ms cubic-bezier(0.4, 0, 0.2, 1)",
 									}}
 								/>
@@ -144,8 +133,8 @@ export const HistogramResponseTime = ({

 						return isPlaceholder ? (
 							<Box
-								height={"100%"}
 								key={index}
+								sx={{ height: "100%" }}
 							>
 								{bar}
 							</Box>
@@ -13,7 +13,6 @@ type BaseChartProps = React.PropsWithChildren<{
 	width?: number | string;
 	maxWidth?: number | string;
 	padding?: number | string | ResponsiveStyleValue<number | string>;
-	onClick?: () => void;
 }>;

 export const BaseChart = ({
@@ -22,22 +21,16 @@ export const BaseChart = ({
 	width = "100%",
 	maxWidth = "100%",
 	padding,
-	onClick,
 }: BaseChartProps) => {
 	const theme = useTheme();
 	return (
 		<BaseBox
-			onClick={onClick}
 			sx={{
 				padding: padding ?? theme.spacing(LAYOUT.MD),
 				display: "flex",
 				flex: 1,
 				width: width,
 				maxWidth: maxWidth,
-				...(onClick && {
-					cursor: "pointer",
-					"& .recharts-wrapper": { cursor: "pointer !important" },
-				}),
 			}}
 		>
 			<Stack
@@ -47,7 +40,6 @@ export const BaseChart = ({
 				<Typography
 					variant="eyebrow"
 					color="text.secondary"
-					sx={{ overflowWrap: "anywhere" }}
 				>
 					{title}
 				</Typography>
@@ -1,28 +1,18 @@
 import type { CSSProperties } from "react";

-export const DotSizes = ["xs", "sm", "md", "lg"] as const;
-export type DotSize = (typeof DotSizes)[number];
-
-const DOT_SIZE_PX: Record<DotSize, string> = {
-	xs: "2px",
-	sm: "4px",
-	md: "8px",
-	lg: "12px",
-};
-
 interface DotProps {
 	color?: string;
-	size?: DotSize;
+	size?: string;
 	style?: CSSProperties;
 }

-export const Dot = ({ color = "gray", size = "sm", style }: DotProps) => {
+export const Dot = ({ color = "gray", size = "4px", style }: DotProps) => {
 	return (
 		<span
 			style={{
 				content: '""',
-				width: DOT_SIZE_PX[size],
-				height: DOT_SIZE_PX[size],
+				width: size,
+				height: size,
 				borderRadius: "50%",
 				backgroundColor: color,
 				opacity: 0.8,
@@ -1,36 +1,30 @@
 import { BaseChart } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
-import Box, { type BoxProps } from "@mui/material/Box";
+import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";

 import { useTheme } from "@mui/material/styles";
-import { forwardRef, useMemo, useState, useEffect } from "react";
+import { useMemo, useState, useEffect } from "react";
 import { getInfraGaugeColor } from "@/Utils/MonitorUtils";

 const MINIMUM_VALUE = 0;
 const MAXIMUM_VALUE = 100;

-interface GaugeProps extends Omit<BoxProps, "color"> {
+export const Gauge = ({
+	isLoading = false,
+	progress = 0,
+	radius = 70,
+	strokeWidth = 15,
+	precision = 1,
+	unit = "%",
+}: {
 	isLoading?: boolean;
 	progress?: number;
 	radius?: number;
 	strokeWidth?: number;
 	precision?: number;
 	unit?: string;
-}
-
-export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
-	{
-		isLoading = false,
-		progress = 0,
-		radius = 70,
-		strokeWidth = 15,
-		precision = 1,
-		unit = "%",
-		...rest
-	},
-	ref
-) {
+}) => {
 	const theme = useTheme();
 	const progressWithinRange = Math.max(MINIMUM_VALUE, Math.min(progress, MAXIMUM_VALUE));

@@ -57,19 +51,17 @@ export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
 	const fillColor = getInfraGaugeColor(progressWithinRange, theme);

 	if (isLoading) {
-		return null;
+		return;
 	}

 	return (
 		<Box
-			ref={ref}
 			display={"inline-block"}
 			position={"relative"}
 			width={radius}
 			height={radius}
 			bgcolor={theme.palette.background.paper}
 			borderRadius={"50%"}
-			{...rest}
 		>
 			<svg
 				viewBox={`0 0 ${totalSize} ${totalSize}`}
@@ -113,7 +105,7 @@ export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
 			</Typography>
 		</Box>
 	);
-});
+};

 export const DetailGauge = ({
 	title,
@@ -1,13 +1,12 @@
 import type { Monitor } from "@/Types/Monitor";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { PulseDot, Dot, StrategyBadge } from "@/Components/design-elements";
+import { PulseDot, Dot } from "@/Components/design-elements";
 import { getStatusColor, formatUrl } from "@/Utils/MonitorUtils";
 import { useTheme } from "@mui/material/styles";
 import prettyMilliseconds from "pretty-ms";
 import { typographyLevels } from "@/Utils/Theme/Palette";
 import useMediaQuery from "@mui/material/useMediaQuery";
-import { LAYOUT } from "@/Utils/Theme/constants";
 export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 	const theme = useTheme();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
@@ -29,7 +28,7 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 			<Stack
 				direction="row"
 				alignItems={"center"}
-				gap={theme.spacing(LAYOUT.XS)}
+				gap={theme.spacing(4)}
 			>
 				<PulseDot color={getStatusColor(monitor.status, theme)} />
 				<Typography
@@ -42,12 +41,6 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 				>
 					{formatUrl(monitor?.url)}
 				</Typography>
-				{monitor.type === "pagespeed" && monitor.strategy && (
-					<>
-						<Dot />
-						<StrategyBadge strategy={monitor.strategy} />
-					</>
-				)}
 				{!isSmall && (
 					<>
 						<Dot />
@@ -1,40 +0,0 @@
-import { useTranslation } from "react-i18next";
-import {
-	formatStatusCode,
-	getStatusCodeTooltip,
-	getStatusCodeValueType,
-} from "@/Utils/statusCode";
-import { ValueLabel } from "./StatusLabel";
-import { Tooltip } from "./Tooltip";
-
-export type StatusCodeLabelProps = {
-	statusCode: number | null | undefined;
-	message?: string | null;
-	fallback?: string;
-};
-
-export const StatusCodeLabel = ({
-	statusCode,
-	message,
-	fallback = "N/A",
-}: StatusCodeLabelProps) => {
-	const { t } = useTranslation();
-	if (!statusCode) {
-		return <>{fallback}</>;
-	}
-
-	const text = formatStatusCode(statusCode, t);
-	const tooltip = getStatusCodeTooltip(statusCode, message, t);
-	const body = (
-		<ValueLabel
-			value={getStatusCodeValueType(statusCode)}
-			text={text}
-		/>
-	);
-	if (!tooltip) return body;
-	return (
-		<Tooltip title={tooltip}>
-			<span>{body}</span>
-		</Tooltip>
-	);
-};
@@ -93,20 +93,3 @@ export const ValueLabel = ({ value, text }: { value: ValueType; text: string })
 		</BaseBox>
 	);
 };
-
-export const ColoredLabel = ({ text, color }: { text: string; color: string }) => {
-	const theme = useTheme();
-
-	return (
-		<BaseBox
-			sx={{
-				width: "fit-content",
-				padding: theme.spacing(1, 3),
-				color: color,
-				borderColor: color,
-			}}
-		>
-			<Typography>{text}</Typography>
-		</BaseBox>
-	);
-};
@@ -1,42 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Box from "@mui/material/Box";
-import { useTheme, alpha } from "@mui/material/styles";
-import { LAYOUT } from "@/Utils/Theme/constants";
-
-interface StepProgressProps {
-	steps: number;
-	current: number;
-}
-
-export const StepProgress = ({ steps, current }: StepProgressProps) => {
-	const theme = useTheme();
-	const activeBg = `linear-gradient(135deg, ${theme.palette.primary.light} 0%, ${theme.palette.primary.main} 100%)`;
-	const completedBg = `linear-gradient(135deg, ${alpha(theme.palette.primary.light, 0.5)} 0%, ${alpha(theme.palette.primary.main, 0.5)} 100%)`;
-
-	const getSegmentBackground = (index: number) => {
-		if (index < current) return completedBg;
-		if (index === current) return activeBg;
-		return theme.palette.divider;
-	};
-
-	return (
-		<Stack
-			direction="row"
-			gap={theme.spacing(LAYOUT.XS)}
-			width="100%"
-		>
-			{Array.from({ length: steps }).map((_, index) => (
-				<Box
-					key={index}
-					flex={1}
-					height={theme.spacing(LAYOUT.XXS)}
-					borderRadius={theme.shape.borderRadius}
-					sx={{
-						background: getSegmentBackground(index),
-						transition: "background 0.2s ease",
-					}}
-				/>
-			))}
-		</Stack>
-	);
-};
@@ -1,32 +0,0 @@
-import Typography from "@mui/material/Typography";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import type { PageSpeedStrategy } from "@/Types/Monitor";
-import { SPACING } from "@/Utils/Theme/constants";
-
-interface StrategyBadgeProps {
-	strategy: PageSpeedStrategy | undefined;
-	variant?: "caption" | "body2";
-}
-
-export const StrategyBadge = ({ strategy, variant = "body2" }: StrategyBadgeProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	if (!strategy) {
-		return null;
-	}
-
-	return (
-		<Typography
-			variant={variant}
-			px={SPACING.XXL}
-			py={SPACING.SM}
-			borderRadius={theme.shape.borderRadius}
-			bgcolor={theme.palette.secondary.light}
-			color={theme.palette.text.primary}
-		>
-			{t(`pages.pageSpeed.strategy.${strategy}`)}
-		</Typography>
-	);
-};
@@ -35,9 +35,6 @@ import useMediaQuery from "@mui/material/useMediaQuery";
 export type Header<T> = {
 	id: number | string;
 	content: React.ReactNode;
-	mobileLabel?: React.ReactNode;
-	hideMobileLabel?: boolean;
-	align?: "left" | "center" | "right" | "justify" | "inherit";
 	onClick?: (event: React.MouseEvent<HTMLTableCellElement | null>, row: T) => void;
 	render: (row: T) => React.ReactNode;
 };
@@ -112,24 +109,6 @@ export function DataTable<
 							key={key}
 						>
 							{headers.map((header) => {
-								if (header.hideMobileLabel) {
-									return (
-										<Grid2
-											container
-											key={header.id}
-										>
-											<Grid2
-												size={12}
-												display="flex"
-												alignItems="center"
-												justifyContent="flex-end"
-											>
-												{header.render(row)}
-											</Grid2>
-										</Grid2>
-									);
-								}
-
 								return (
 									<Grid2
 										container
@@ -144,7 +123,7 @@ export function DataTable<
 												component="div"
 												color={theme.palette.text.primary}
 											>
-												{header.mobileLabel ?? header.content}
+												{header.content}
 											</Typography>
 										</Grid2>
 										<Grid2
@@ -214,7 +193,7 @@ export function DataTable<
 						{headers.map((header, idx) => {
 							return (
 								<TableCell
-									align={header.align ?? (idx === 0 ? "left" : "center")}
+									align={idx === 0 ? "left" : "center"}
 									key={header.id}
 								>
 									{header.content}
@@ -243,7 +222,7 @@ export function DataTable<
 									{headers.map((header, index) => {
 										return (
 											<TableCell
-												align={header.align ?? (index === 0 ? "left" : "center")}
+												align={index === 0 ? "left" : "center"}
 												key={header.id}
 												onClick={
 													header.onClick ? (e) => header.onClick!(e, row) : undefined
@@ -6,11 +6,7 @@ import type { TooltipProps } from "@mui/material/Tooltip";

 type StyledTooltipProps = TooltipProps;

-export const Tooltip = ({
-	placement = "top",
-	slotProps,
-	...props
-}: StyledTooltipProps) => {
+export const Tooltip = ({ placement = "top", ...props }: StyledTooltipProps) => {
 	const theme = useTheme();

 	return (
@@ -31,7 +27,6 @@ export const Tooltip = ({
 						boxShadow: theme.shadows[6],
 					},
 				},
-				...slotProps,
 			}}
 		>
 			{props.children}
@@ -25,6 +25,3 @@ export * from "./TextLink";
 export * from "./NoticeBanner";
 export * from "./OfflineBanner";
 export * from "./Avatar";
-export * from "./StatusCodeLabel";
-export * from "./StrategyBadge";
-export * from "./StepProgress";
@@ -14,19 +14,17 @@ type AutoCompleteInputProps = Omit<
 	renderInput?: AutocompleteProps<any, boolean, boolean, boolean>["renderInput"];
 	fieldLabel?: string;
 	required?: boolean;
-	renderOptionContent?: (option: any) => React.ReactNode;
 };

 export const AutoCompleteInput = ({
 	fieldLabel,
 	required,
 	renderInput,
-	renderOptionContent,
 	...props
 }: AutoCompleteInputProps) => {
 	const theme = useTheme();
 	const multiple = props.multiple;
-	const { renderOption: customRenderOption, ...autocompleteProps } = props;
+
 	const defaultRenderInput = (params: any) => (
 		<TextField
 			{...params}
@@ -36,7 +34,7 @@ export const AutoCompleteInput = ({

 	const autocomplete = (
 		<Autocomplete
-			{...autocompleteProps}
+			{...props}
 			disableCloseOnSelect={!!multiple}
 			popupIcon={
 				<ChevronDown
@@ -48,28 +46,24 @@ export const AutoCompleteInput = ({
 			renderInput={renderInput || defaultRenderInput}
 			getOptionKey={(option) => option.id}
 			renderTags={() => null}
-			renderOption={
-				customRenderOption ||
-				((props, option, { selected }) => {
-					const { key, ...optionProps } = props;
-					return (
-						<ListItem
-							key={key}
-							{...optionProps}
+			renderOption={(props, option, { selected }) => {
+				const { key, ...optionProps } = props;
+				return (
+					<ListItem
+						key={key}
+						{...optionProps}
+					>
+						<Stack
+							direction={"row"}
+							alignItems={"center"}
+							gap={theme.spacing(2)}
 						>
-							<Stack
-								direction={"row"}
-								alignItems={"center"}
-								gap={theme.spacing(2)}
-								width="100%"
-							>
-								{multiple && <Checkbox checked={selected} />}
-								{renderOptionContent ? renderOptionContent(option) : option.name}
-							</Stack>
-						</ListItem>
-					);
-				})
-			}
+							{multiple && <Checkbox checked={selected} />}
+							{option.name}
+						</Stack>
+					</ListItem>
+				);
+			}}
 			sx={{
 				"&.MuiAutocomplete-root .MuiAutocomplete-input": {
 					padding: `0 ${theme.spacing(5)}`,
@@ -1,7 +1,7 @@
 import { forwardRef } from "react";
 import Checkbox from "@mui/material/Checkbox";
 import type { CheckboxProps } from "@mui/material/Checkbox";
-import { Square, SquareCheck, SquareMinus } from "lucide-react";
+import { Square, SquareCheck } from "lucide-react";
 import { useTheme } from "@mui/material/styles";

 type CheckboxInputProps = CheckboxProps & {
@@ -34,15 +34,9 @@ export const CheckboxInput = forwardRef<HTMLInputElement, CheckboxInputProps>(
 						strokeWidth={1.5}
 					/>
 				}
-				indeterminateIcon={
-					<SquareMinus
-						size={16}
-						strokeWidth={1.5}
-					/>
-				}
 				sx={{
 					color: theme.palette.text.secondary,
-					"&.Mui-checked, &.MuiCheckbox-indeterminate": {
+					"&.Mui-checked": {
 						color: theme.palette.primary.main,
 					},
 					"&:hover": { backgroundColor: "transparent" },
@@ -10,12 +10,9 @@ import type { RootState } from "@/Types/state";
 export const languageNames: Record<string, string> = {
 	en: "English",
 	de: "Deutsch",
-	ca: "Català",
 	es: "Español",
 	fr: "Français",
-	it: "Italiano",
 	"pt-BR": "Português (BR)",
-	pl: "Polski",
 	cs: "Čeština",
 	fi: "Suomi",
 	tr: "Türkçe",
@@ -22,7 +22,7 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(function T
 		width: "100%",
 		"& .MuiOutlinedInput-root": {
 			borderRadius: theme.shape.borderRadius,
-			height: props.multiline ? "auto" : 34,
+			height: 34,
 			fontSize: typographyLevels.base,
 			overflow: "hidden",
 		},
@@ -1,102 +0,0 @@
-import React from "react";
-import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import Paper from "@mui/material/Paper";
-import Slide from "@mui/material/Slide";
-import IconButton from "@mui/material/IconButton";
-import { X } from "lucide-react";
-
-import { useTranslation } from "react-i18next";
-import { useTheme } from "@mui/material/styles";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { useSidebar } from "@/Hooks/useSidebar";
-
-interface BulkActionsBarProps {
-	selectedCount: number;
-	onCancel: () => void;
-	children?: React.ReactNode;
-}
-
-export const BulkActionsBar = ({
-	selectedCount,
-	onCancel,
-	children,
-}: BulkActionsBarProps) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-	const isOpen = selectedCount > 0;
-
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	const { width, collapsedWidth, transition } = useSidebar();
-
-	return (
-		<Box
-			sx={{
-				position: "fixed",
-				bottom: theme.spacing(LAYOUT.XS),
-				left: isSmall ? collapsedWidth : width,
-				right: 0,
-				display: "flex",
-				justifyContent: "center",
-				pointerEvents: "none",
-				zIndex: theme.zIndex.snackbar,
-				transition: transition.replace("width", "left"),
-			}}
-		>
-			<Slide
-				direction="up"
-				in={isOpen}
-				mountOnEnter
-				unmountOnExit
-			>
-				<Paper
-					elevation={6}
-					sx={{
-						pointerEvents: "auto",
-						px: LAYOUT.MD,
-						py: LAYOUT.XS,
-						borderRadius: theme.shape.borderRadius,
-						backgroundColor: theme.palette.background.paper,
-						border: `1px solid ${theme.palette.divider}`,
-						display: "flex",
-						alignItems: "center",
-						gap: LAYOUT.XS,
-						boxShadow: theme.shadows[8],
-					}}
-				>
-					<Stack
-						direction="row"
-						alignItems="center"
-						gap={LAYOUT.XXS}
-					>
-						<Typography
-							variant="body1"
-							fontWeight={600}
-							color={theme.palette.text.primary}
-						>
-							{t("pages.common.monitors.actions.bulkSelected", {
-								count: selectedCount,
-							})}
-						</Typography>
-						<IconButton
-							size="small"
-							onClick={onCancel}
-							aria-label={t("common.buttons.cancel")}
-						>
-							<X size={18} />
-						</IconButton>
-					</Stack>
-					<Stack
-						direction="row"
-						alignItems="center"
-						gap={LAYOUT.XXS}
-					>
-						{children}
-					</Stack>
-				</Paper>
-			</Slide>
-		</Box>
-	);
-};
@@ -1,11 +1,9 @@
 import Stack from "@mui/material/Stack";
-import { Select, Autocomplete, Button, TextField } from "@/Components/inputs";
-import { ColoredLabel } from "@/Components/design-elements";
+import { Select, Button } from "@/Components/inputs";
 import MenuItem from "@mui/material/MenuItem";
 import useMediaQuery from "@mui/material/useMediaQuery";

 import type { MonitorType } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
 import { Typography, useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";

@@ -30,34 +28,22 @@ export const ControlsFilter = ({
 	setSelectedStatus,
 	selectedState,
 	setSelectedState,
-	tagOptions,
-	selectedTags,
-	setSelectedTags,
 	onClearFilters,
 }: {
 	showTypes?: boolean;
 	selectedTypes?: MonitorType[];
 	setSelectedTypes?: React.Dispatch<React.SetStateAction<MonitorType[]>>;
-	selectedStatus?: string;
-	setSelectedStatus?: React.Dispatch<React.SetStateAction<string>>;
-	selectedState?: string;
-	setSelectedState?: React.Dispatch<React.SetStateAction<string>>;
-	tagOptions?: Tag[];
-	selectedTags?: string[];
-	setSelectedTags?: React.Dispatch<React.SetStateAction<string[]>>;
+	selectedStatus: string;
+	setSelectedStatus: React.Dispatch<React.SetStateAction<string>>;
+	selectedState: string;
+	setSelectedState: React.Dispatch<React.SetStateAction<string>>;
 	onClearFilters: () => void;
 }) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isFilterActive =
-		(selectedTypes?.length ?? 0) > 0 ||
-		Boolean(selectedStatus) ||
-		Boolean(selectedState) ||
-		(selectedTags?.length ?? 0) > 0;
-	const selectedTagObjects = (tagOptions ?? []).filter((tag) =>
-		(selectedTags ?? []).includes(tag.id)
-	);
+		(selectedTypes?.length ?? 0) > 0 || selectedStatus !== "" || selectedState !== "";
 	return (
 		<Stack
 			direction={isSmall ? "column" : "row"}
@@ -80,68 +66,34 @@ export const ControlsFilter = ({
 					))}
 				</Select>
 			)}
-			{setSelectedStatus && (
-				<Select
-					placeholder="Status"
-					value={selectedStatus ?? ""}
-					onChange={(e) => setSelectedStatus(e.target.value)}
-				>
-					{statuses.map((status) => (
-						<MenuItem
-							key={status}
-							value={status}
-						>
-							<Typography textTransform={"capitalize"}>{status}</Typography>
-						</MenuItem>
-					))}
-				</Select>
-			)}
-			{setSelectedState && (
-				<Select
-					placeholder="State"
-					value={selectedState ?? ""}
-					onChange={(e) => setSelectedState(e.target.value)}
-				>
-					{states.map((state) => (
-						<MenuItem
-							key={state}
-							value={state}
-						>
-							<Typography textTransform={"capitalize"}>{state}</Typography>
-						</MenuItem>
-					))}
-				</Select>
-			)}
-			{tagOptions && setSelectedTags && (
-				<Autocomplete
-					multiple
-					options={tagOptions}
-					value={selectedTagObjects}
-					getOptionLabel={(option) => option.name}
-					onChange={(_: unknown, newValue: Tag[]) => {
-						setSelectedTags(newValue.map((tag) => tag.id));
-					}}
-					isOptionEqualToValue={(option, value) => option.id === value.id}
-					renderOptionContent={(option) => (
-						<ColoredLabel
-							text={option.name}
-							color={option.color}
-						/>
-					)}
-					renderInput={(params) => (
-						<TextField
-							{...params}
-							placeholder={t("common.table.headers.tags")}
-						/>
-					)}
-					slotProps={{
-						popper: {
-							sx: { width: "fit-content !important", minWidth: 280 },
-						},
-					}}
-					sx={{ minWidth: 180 }}
-				/>
-			)}
+			<Select
+				placeholder="Status"
+				value={selectedStatus}
+				onChange={(e) => setSelectedStatus(e.target.value)}
+			>
+				{statuses.map((status) => (
+					<MenuItem
+						key={status}
+						value={status}
+					>
+						<Typography textTransform={"capitalize"}>{status}</Typography>
+					</MenuItem>
+				))}
+			</Select>
+			<Select
+				placeholder="State"
+				value={selectedState}
+				onChange={(e) => setSelectedState(e.target.value)}
+			>
+				{states.map((state) => (
+					<MenuItem
+						key={state}
+						value={state}
+					>
+						<Typography textTransform={"capitalize"}>{state}</Typography>
+					</MenuItem>
+				))}
+			</Select>
 			{isFilterActive && (
 				<Button
 					variant="contained"
@@ -3,8 +3,6 @@ import { Box, Typography, Stack, useTheme, GlobalStyles } from "@mui/material";
 import Map, { Marker, Popup } from "react-map-gl/maplibre";
 import type { MapRef } from "react-map-gl/maplibre";
 import type { FlatGeoCheck } from "@/Types/GeoCheck";
-import { useTranslation } from "react-i18next";
-import { formatStatusCode } from "@/Utils/statusCode";
 import "maplibre-gl/dist/maplibre-gl.css";

 interface GeoChecksMapProps {
@@ -16,7 +14,6 @@ export const GeoChecksMap = ({ geoChecks }: GeoChecksMapProps) => {
 	const [selectedCheck, setSelectedCheck] = useState<FlatGeoCheck | null>(null);
 	const theme = useTheme();
 	const isDarkMode = theme.palette.mode === "dark";
-	const { t } = useTranslation();

 	const mapPopupStyles = (
 		<GlobalStyles
@@ -177,7 +174,7 @@ export const GeoChecksMap = ({ geoChecks }: GeoChecksMapProps) => {
 										>
 											Status Code:
 										</Typography>{" "}
-										{formatStatusCode(selectedCheck.statusCode, t)}
+										{selectedCheck.statusCode}
 									</Typography>
 									<Typography variant="body2">
 										<Typography
@@ -1,34 +0,0 @@
-export const computeYAxisCap = (values: number[]): number | undefined => {
-	const sorted = values.slice().sort((a, b) => a - b);
-	if (sorted.length < 2) return undefined;
-	const p95 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.95))];
-	return p95 > 0 ? Math.ceil(p95 * 2) : undefined;
-};
-
-export const PHASE_KEYS = [
-	"avgDns",
-	"avgTcp",
-	"avgTls",
-	"avgRequest",
-	"avgFirstByte",
-	"avgDownload",
-] as const;
-
-export const PHASE_COLOR_KEYS = {
-	avgDns: "dns",
-	avgTcp: "tcp",
-	avgTls: "tls",
-	avgRequest: "request",
-	avgFirstByte: "firstByte",
-	avgDownload: "download",
-} as const;
-
-// i18n keys, resolved with t() at render
-export const PHASE_LABEL_KEYS: Record<(typeof PHASE_KEYS)[number], string> = {
-	avgDns: "common.charts.phases.dns",
-	avgTcp: "common.charts.phases.tcp",
-	avgTls: "common.charts.phases.tls",
-	avgRequest: "common.charts.phases.request",
-	avgFirstByte: "common.charts.phases.firstByte",
-	avgDownload: "common.charts.phases.download",
-};
@@ -1,44 +1,57 @@
-import Stack from "@mui/material/Stack";
 import { BaseChart, BaseBox } from "@/Components/design-elements";
 import { Clock } from "lucide-react";
-import { Dot } from "@/Components/design-elements";
 import {
 	AreaChart,
 	Area,
 	XAxis,
-	YAxis,
 	Tooltip,
 	CartesianGrid,
 	ResponsiveContainer,
+	Text,
 } from "recharts";
-import type { TooltipProps } from "recharts";
-import type { NameType, ValueType } from "recharts/types/component/DefaultTooltipContent";
 import Typography from "@mui/material/Typography";
-import prettyMilliseconds from "pretty-ms";
-import { XTick } from "@/Components/monitors/charts/XTick";
+
 import { useSelector } from "react-redux";
-import { useTranslation } from "react-i18next";
-import { formatDateWithTz, tooltipDateFormatLookup } from "@/Utils/TimeUtils";
-import { useTheme } from "@mui/material/styles";
-import type { Theme } from "@mui/material/styles";
-import type { GroupedCheck, GroupedUptimeCheck } from "@/Types/Check";
-import type { RootState } from "@/Types/state";
-import { computeYAxisCap } from "@/Components/monitors/charts/ChartUtils";
-
-import { useMemo, useState } from "react";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 import {
-	PHASE_COLOR_KEYS,
-	PHASE_KEYS,
-	PHASE_LABEL_KEYS,
-} from "@/Components/monitors/charts/ChartUtils";
+	formatDateWithTz,
+	tickDateFormatLookup,
+	tooltipDateFormatLookup,
+} from "@/Utils/TimeUtils";
+import { useTheme } from "@mui/material/styles";
+import type { GroupedCheck } from "@/Types/Check";
+import type { RootState } from "@/Types/state";

-type DetailsCheck = GroupedCheck &
-	Partial<Pick<GroupedUptimeCheck, (typeof PHASE_KEYS)[number]>>;
-
-type ResponseTimeToolTipProps = TooltipProps<ValueType, NameType> & {
+type XTickProps = {
+	x: number;
+	y: number;
+	payload: { value: any };
 	range: string;
-	theme: Theme;
+};
+
+export const XTick = ({ x, y, payload, range }: XTickProps) => {
+	const format = tickDateFormatLookup(range);
+	const theme = useTheme();
+	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
+	return (
+		<Text
+			x={x}
+			y={y + 10}
+			textAnchor="middle"
+			fill={theme.palette.text.secondary}
+			fontSize={11}
+			fontWeight={400}
+		>
+			{formatDateWithTz(payload?.value, format, uiTimezone)}
+		</Text>
+	);
+};
+
+type ResponseTimeToolTipProps = {
+	active?: boolean | undefined;
+	payload?: any[];
+	label?: string | number;
+	range: string;
+	theme: any;
 	uiTimezone: string;
 };

@@ -50,72 +63,16 @@ const ResponseTimeToolTip = ({
 	theme,
 	uiTimezone,
 }: ResponseTimeToolTipProps) => {
-	const { t } = useTranslation();
 	if (!label) return null;
 	if (!payload) return null;
 	if (!active) return null;

 	const format = tooltipDateFormatLookup(range);
-	const responseTime = Math.floor(payload[0]?.payload?.avgResponseTime || 0);
+	const responseTime = Math.floor(payload?.[0]?.payload?.avgResponseTime || 0);
 	return (
 		<BaseBox sx={{ py: theme.spacing(2), px: theme.spacing(4) }}>
 			<Typography>{formatDateWithTz(String(label), format, uiTimezone)}</Typography>
-			<Typography>
-				{t("common.charts.histogram.responseTime", {
-					value: prettyMilliseconds(responseTime, {
-						formatSubMilliseconds: true,
-						compact: true,
-					}),
-				})}
-			</Typography>
-		</BaseBox>
-	);
-};
-
-type TimingPhaseToolTipProps = TooltipProps<ValueType, NameType> & {
-	range: string;
-	theme: Theme;
-	uiTimezone: string;
-};
-
-const TimingPhasesToolTip = ({
-	active,
-	payload,
-	range,
-	theme,
-	uiTimezone,
-}: TimingPhaseToolTipProps) => {
-	const { t } = useTranslation();
-	if (!active || !payload?.length) return null;
-	const bucket = payload[0].payload as GroupedUptimeCheck;
-	const total = PHASE_KEYS.reduce((sum, key) => sum + bucket[key], 0);
-	const format = tooltipDateFormatLookup(range);
-	return (
-		<BaseBox sx={{ py: theme.spacing(2), px: theme.spacing(4) }}>
-			<Typography>{formatDateWithTz(bucket.bucketDate, format, uiTimezone)}</Typography>
-			<Typography>
-				{t("common.charts.histogram.total", { value: prettyMilliseconds(total) })}
-			</Typography>
-			{PHASE_KEYS.map((key) => (
-				<Stack
-					alignItems={"center"}
-					direction="row"
-					key={key}
-					gap={SPACING.LG}
-				>
-					<Dot
-						size="lg"
-						color={theme.palette.chart.phases[PHASE_COLOR_KEYS[key]]}
-					/>
-					<Typography>
-						{t(PHASE_LABEL_KEYS[key])}:{" "}
-						{prettyMilliseconds(bucket[key], {
-							formatSubMilliseconds: true,
-							compact: true,
-						})}
-					</Typography>
-				</Stack>
-			))}
+			<Typography>Response time: {responseTime} ms</Typography>
 		</BaseBox>
 	);
 };
@@ -124,28 +81,11 @@ export const HistogramDetails = ({
 	checks,
 	range,
 }: {
-	checks: DetailsCheck[];
+	checks: GroupedCheck[];
 	range: string;
 }) => {
-	const [showTimingPhases, setShowTimingPhases] = useState(false);
-	const [hoveredPhase, setHoveredPhase] = useState<string | null>(null);
-
-	const { t } = useTranslation();
 	const theme = useTheme();
 	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
-	const yMax = useMemo(() => {
-		const totals = checks.map((check) => {
-			const phaseSum = PHASE_KEYS.reduce((sum, key) => sum + (check[key] ?? 0), 0);
-			return Math.max(check.avgResponseTime ?? 0, phaseSum);
-		});
-		return computeYAxisCap(totals);
-	}, [checks]);
-
-	const hasTimingPhases = useMemo(
-		() => (checks ?? []).some((check) => PHASE_KEYS.some((key) => (check[key] ?? 0) > 0)),
-		[checks]
-	);
-
 	return (
 		<BaseChart
 			icon={
@@ -154,15 +94,7 @@ export const HistogramDetails = ({
 					strokeWidth={1.5}
 				/>
 			}
-			title={
-				showTimingPhases
-					? t("common.charts.labels.timingPhases")
-					: t("common.charts.labels.responseTime")
-			}
-			onClick={() => {
-				if (!hasTimingPhases) return;
-				setShowTimingPhases((prev) => !prev);
-			}}
+			title="Response times"
 		>
 			<ResponsiveContainer
 				width="100%"
@@ -195,34 +127,7 @@ export const HistogramDetails = ({
 								stopOpacity={0}
 							/>
 						</linearGradient>
-						{PHASE_KEYS.map((key) => (
-							<linearGradient
-								key={key}
-								id={`phaseGradient-${key}`}
-								x1="0"
-								y1="0"
-								x2="0"
-								y2="1"
-							>
-								<stop
-									offset="0%"
-									stopColor={theme.palette.chart.phases[PHASE_COLOR_KEYS[key]]}
-									stopOpacity={0.8}
-								/>
-								<stop
-									offset="100%"
-									stopColor={theme.palette.chart.phases[PHASE_COLOR_KEYS[key]]}
-									stopOpacity={0.2}
-								/>
-							</linearGradient>
-						))}
 					</defs>
-					<YAxis
-						hide
-						// scale="sqrt"
-						domain={[0, yMax ?? "auto"]}
-						allowDataOverflow
-					/>
 					<XAxis
 						axisLine={false}
 						tickLine={false}
@@ -235,99 +140,24 @@ export const HistogramDetails = ({
 						)}
 					/>

-					{showTimingPhases ? (
-						<Tooltip
-							content={(props) => (
-								<TimingPhasesToolTip
-									{...props}
-									range={range}
-									theme={theme}
-									uiTimezone={uiTimezone}
-								/>
-							)}
-						/>
-					) : (
-						<Tooltip
-							content={(props) => (
-								<ResponseTimeToolTip
-									{...props}
-									range={range}
-									theme={theme}
-									uiTimezone={uiTimezone}
-								/>
-							)}
-						/>
-					)}
-					{!showTimingPhases && (
-						<Area
-							type="monotone"
-							dataKey="avgResponseTime"
-							stroke={theme.palette.primary.main}
-							fill="url(#colorUv)"
-						/>
-					)}
-					{hasTimingPhases &&
-						showTimingPhases &&
-						PHASE_KEYS.map((key) => {
-							const dimmed = hoveredPhase !== null && hoveredPhase !== key;
-							return (
-								<Area
-									key={key}
-									type="monotone"
-									stackId={1}
-									dataKey={key}
-									stroke={theme.palette.chart.phases[PHASE_COLOR_KEYS[key]]}
-									fill={`url(#phaseGradient-${key})`}
-									fillOpacity={dimmed ? 0.2 : undefined}
-									strokeOpacity={dimmed ? 0.2 : undefined}
-								/>
-							);
-						})}
+					<Tooltip
+						content={(props) => (
+							<ResponseTimeToolTip
+								{...props}
+								range={range}
+								theme={theme}
+								uiTimezone={uiTimezone}
+							/>
+						)}
+					/>
+					<Area
+						type="monotone"
+						dataKey="avgResponseTime"
+						stroke={theme.palette.primary.main}
+						fill="url(#colorUv)"
+					/>
 				</AreaChart>
 			</ResponsiveContainer>
-			<Stack
-				justifyContent={"center"}
-				gap={LAYOUT.XS}
-				direction={"row"}
-				flexWrap={"wrap"}
-			>
-				{showTimingPhases ? (
-					PHASE_KEYS.map((key) => {
-						return (
-							<Stack
-								direction="row"
-								alignItems="center"
-								gap={SPACING.LG}
-								key={key}
-								onMouseEnter={() => setHoveredPhase(key)}
-								onMouseLeave={() => setHoveredPhase(null)}
-							>
-								<Dot
-									color={theme.palette.chart.phases[PHASE_COLOR_KEYS[key]]}
-									size="lg"
-								/>
-								<Typography lineHeight={1}>{t(PHASE_LABEL_KEYS[key])}</Typography>
-							</Stack>
-						);
-					})
-				) : (
-					<Stack
-						direction="row"
-						alignItems="center"
-						gap={SPACING.LG}
-						onMouseEnter={() => setHoveredPhase("avgResponseTime")}
-						onMouseLeave={() => setHoveredPhase(null)}
-					>
-						<Dot
-							color={theme.palette.primary.main}
-							size="lg"
-						/>
-						<Typography lineHeight={1}>
-							{t("common.charts.labels.totalResponseTime")}
-						</Typography>
-					</Stack>
-				)}
-			</Stack>
 		</BaseChart>
 	);
 };
@@ -8,7 +8,7 @@ import {
 	ResponsiveContainer,
 } from "recharts";
 import { Fragment, useId } from "react";
-import { XTick } from "@/Components/monitors/charts/XTick";
+import { XTick } from "@/Components/monitors";

 import { useTheme } from "@mui/material/styles";
 import type { HardwareCheckStats } from "@/Types/Monitor";
@@ -1,6 +1,6 @@
 import { BaseChart } from "@/Components/design-elements";
 import { TrendingUp } from "lucide-react";
-import { XTick } from "@/Components/monitors/charts/XTick";
+import { XTick } from "@/Components/monitors";
 import {
 	XAxis,
 	AreaChart,
@@ -20,7 +20,7 @@ export const RadialAvgResponse = ({ avg, max }: { avg: number; max: number }) =>
 	const msg: Record<string, string> = {
 		success: "Excellent",
 		warning: "Average",
-		error: "Poor",
+		danger: "Poor",
 	};

 	return (
@@ -1,30 +0,0 @@
-import { formatDateWithTz, tickDateFormatLookup } from "@/Utils/TimeUtils";
-import { useSelector } from "react-redux";
-import { Text } from "recharts";
-import { useTheme } from "@mui/material";
-import type { RootState } from "@/Types/state";
-
-type XTickProps = {
-	x: number;
-	y: number;
-	payload: { value: string };
-	range: string;
-};
-
-export const XTick = ({ x, y, payload, range }: XTickProps) => {
-	const format = tickDateFormatLookup(range);
-	const theme = useTheme();
-	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
-	return (
-		<Text
-			x={x}
-			y={y + 10}
-			textAnchor="middle"
-			fill={theme.palette.text.secondary}
-			fontSize={11}
-			fontWeight={400}
-		>
-			{formatDateWithTz(payload?.value, format, uiTimezone)}
-		</Text>
-	);
-};
@@ -14,4 +14,3 @@ export * from "./charts/HistogramPageSpeedDetails";
 export * from "./charts/HistogramPageSpeedDetailsTooltip";
 export * from "./charts/HistogramInfrastructure";
 export * from "./HeaderMonitorsSummary";
-export * from "./BulkActionsBar";
@@ -17,7 +17,6 @@ import {
 	User,
 	Lock,
 	Users,
-	Tag,
 } from "lucide-react";

 export const getMenu = (t: Function) => {
@@ -42,11 +41,6 @@ export const getMenu = (t: Function) => {
 			path: "notifications",
 			icon: <Icon icon={Bell} />,
 		},
-		{
-			name: t("components.sidebar.menu.tags"),
-			path: "tags",
-			icon: <Icon icon={Tag} />,
-		},
 		{
 			name: t("components.sidebar.menu.checks"),
 			path: "checks",
@@ -20,8 +20,6 @@ export const useToast = () => {
 		showToast(msg, { ...opts, type: "error" });
 	const toastInfo = (msg: string, opts?: ToastOptions) =>
 		showToast(msg, { ...opts, type: "info" });
-	const toastWarning = (msg: string, opts?: ToastOptions) =>
-		showToast(msg, { ...opts, type: "warning" });

-	return { showToast, toastSuccess, toastError, toastInfo, toastWarning };
+	return { showToast, toastSuccess, toastError, toastInfo };
 };
@@ -1,105 +0,0 @@
-import { useState, useEffect } from "react";
-import axios from "axios";
-import { post } from "@/Utils/ApiClient";
-import { useToast } from "@/Hooks/UseToast";
-import { useTranslation } from "react-i18next";
-import { logger } from "@/Utils/logger";
-import type { Monitor } from "@/Types/Monitor";
-
-interface ApiResponse {
-	success: boolean;
-	msg: string;
-	data: {
-		monitors: Monitor[];
-		failedCount: number;
-	};
-}
-
-interface UseBulkMonitorActionsReturn {
-	selectedRows: string[];
-	setSelectedRows: (rows: string[]) => void;
-	handleBulkPause: () => Promise<void>;
-	handleBulkResume: () => Promise<void>;
-	handleCancelSelection: () => void;
-}
-
-export const useBulkMonitorActions = (
-	refetch: () => void,
-	page?: number
-): UseBulkMonitorActionsReturn => {
-	const [selectedRows, setSelectedRows] = useState<string[]>([]);
-	const { toastSuccess, toastError, toastInfo, toastWarning } = useToast();
-	const { t } = useTranslation();
-
-	// Clear selection when page changes
-	useEffect(() => {
-		setSelectedRows([]);
-	}, [page]);
-
-	const executeBulkAction = async (pause: boolean) => {
-		try {
-			const res = await post<ApiResponse>("/monitors/bulk/pause", {
-				monitorIds: selectedRows,
-				pause,
-			});
-
-			const affectedCount = res.data?.data?.monitors?.length ?? 0;
-			const failedCount = res.data?.data?.failedCount ?? 0;
-
-			if (affectedCount === 0) {
-				const key = pause
-					? "pages.common.monitors.bulkPause.alreadyPaused"
-					: "pages.common.monitors.bulkPause.alreadyRunning";
-				toastInfo(t(key, { count: selectedRows.length }));
-			} else if (failedCount > 0) {
-				toastWarning(
-					t("pages.common.monitors.bulkPause.partialFailure", {
-						successCount: affectedCount,
-						failedCount,
-					})
-				);
-			} else {
-				const key = pause
-					? "pages.common.monitors.bulkPause.paused"
-					: "pages.common.monitors.bulkPause.resumed";
-				toastSuccess(t(key, { count: affectedCount }));
-			}
-
-			setSelectedRows([]);
-			refetch();
-		} catch (err: unknown) {
-			let errMsg = "An error occurred";
-
-			if (axios.isAxiosError(err)) {
-				errMsg = err.response?.data?.msg || err.message || errMsg;
-			} else if (err instanceof Error) {
-				errMsg = err.message;
-			}
-
-			logger.error("Bulk pause/resume failed", err instanceof Error ? err : undefined, {
-				pause,
-			});
-			toastError(errMsg);
-		}
-	};
-
-	const handleBulkPause = async () => {
-		await executeBulkAction(true);
-	};
-
-	const handleBulkResume = async () => {
-		await executeBulkAction(false);
-	};
-
-	const handleCancelSelection = () => {
-		setSelectedRows([]);
-	};
-
-	return {
-		selectedRows,
-		setSelectedRows,
-		handleBulkPause,
-		handleBulkResume,
-		handleCancelSelection,
-	};
-};
@@ -2,7 +2,6 @@ import { useMemo } from "react";
 import dayjs from "dayjs";
 import {
 	maintenanceWindowSchema,
-	maintenanceWindowEditSchema,
 	repeatOptions,
 	type MaintenanceWindowFormData,
 } from "@/Validation/maintenanceWindow";
@@ -33,7 +32,7 @@ export const useMaintenanceWindowForm = ({
 				startTime: startDate.format("HH:mm"),
 				duration: data.duration ?? 0,
 				durationUnit: data.durationUnit ?? "minutes",
-				monitors: data.monitorIds,
+				monitors: [data.monitorId],
 			};
 		} else {
 			const now = dayjs();
@@ -48,9 +47,6 @@ export const useMaintenanceWindowForm = ({
 			};
 		}

-		return {
-			schema: data ? maintenanceWindowEditSchema : maintenanceWindowSchema,
-			defaults,
-		};
+		return { schema: maintenanceWindowSchema, defaults };
 	}, [data]);
 };
@@ -1,6 +1,5 @@
 import { useMemo } from "react";
 import { monitorSchema, type MonitorFormData } from "@/Validation/monitor";
-import { DefaultHttpMethod, DefaultPageSpeedStrategy } from "@/Types/Monitor";
 import type { Monitor, MonitorType } from "@/Types/Monitor";

 interface UseMonitorFormOptions {
@@ -13,147 +12,118 @@ const getBaseDefaults = (data?: Monitor | null) => ({
 	description: data?.description || "",
 	interval: data?.interval || 60000,
 	notifications: data?.notifications || [],
-	tags: data?.tags || [],
 	statusWindowSize: data?.statusWindowSize || 5,
 	statusWindowThreshold: data?.statusWindowThreshold || 60,
-});
-
-// Geo-check defaults — only http and ping support geo checks.
-const getGeoCheckDefaults = (data?: Monitor | null) => ({
 	geoCheckEnabled: data?.geoCheckEnabled ?? false,
 	geoCheckLocations: data?.geoCheckLocations || [],
 	geoCheckInterval: data?.geoCheckInterval || 300000,
 });

-export const getMonitorDefaults = (
-	type: MonitorType,
-	data: Monitor | null = null
-): MonitorFormData => {
-	const base = getBaseDefaults(data);
-
-	let defaults: MonitorFormData;
-
-	switch (type) {
-		case "http":
-			defaults = {
-				...base,
-				...getGeoCheckDefaults(data),
-				type: "http",
-				url: data?.url || "",
-				method: data?.method ?? DefaultHttpMethod,
-				ignoreTlsErrors: data?.ignoreTlsErrors || false,
-				useAdvancedMatching: data?.useAdvancedMatching || false,
-				matchMethod: data?.matchMethod || "",
-				expectedValue: data?.expectedValue || "",
-				jsonPath: data?.jsonPath || "",
-				customUpCodes: data?.customUpCodes || [],
-			};
-			break;
-		case "ping":
-			defaults = {
-				...base,
-				...getGeoCheckDefaults(data),
-				type: "ping",
-				url: data?.url || "",
-			};
-			break;
-		case "port":
-			defaults = {
-				...base,
-				type: "port",
-				url: data?.url || "",
-				port: data?.port || 80,
-			};
-			break;
-		case "docker":
-			defaults = {
-				...base,
-				type: "docker",
-				url: data?.url || "",
-			};
-			break;
-		case "game":
-			defaults = {
-				...base,
-				type: "game",
-				url: data?.url || "",
-				port: data?.port || 27015,
-				gameId: data?.gameId || "",
-			};
-			break;
-		case "grpc":
-			defaults = {
-				...base,
-				type: "grpc",
-				url: data?.url || "",
-				port: data?.port || 50051,
-				grpcServiceName: data?.grpcServiceName || "",
-				ignoreTlsErrors: data?.ignoreTlsErrors || false,
-			};
-			break;
-		case "pagespeed":
-			defaults = {
-				...base,
-				type: "pagespeed",
-				url: data?.url || "",
-				strategy: data?.strategy ?? DefaultPageSpeedStrategy,
-			};
-			break;
-		case "hardware":
-			defaults = {
-				...base,
-				type: "hardware",
-				url: data?.url || "",
-				secret: data?.secret || "",
-				cpuAlertThreshold: data?.cpuAlertThreshold ?? 100,
-				memoryAlertThreshold: data?.memoryAlertThreshold ?? 100,
-				diskAlertThreshold: data?.diskAlertThreshold ?? 100,
-				tempAlertThreshold: data?.tempAlertThreshold ?? 100,
-				selectedDisks: data?.selectedDisks || [],
-			};
-			break;
-		case "websocket":
-			defaults = {
-				...base,
-				type: "websocket",
-				url: data?.url || "",
-				ignoreTlsErrors: data?.ignoreTlsErrors || false,
-			};
-			break;
-		case "dns":
-			defaults = {
-				...base,
-				type: "dns",
-				url: data?.url || "",
-				dnsServer: data?.dnsServer || "",
-				dnsRecordType: data?.dnsRecordType || "A",
-			};
-			break;
-		default:
-			defaults = {
-				...base,
-				...getGeoCheckDefaults(data),
-				type: "http",
-				url: "",
-				method: DefaultHttpMethod,
-				ignoreTlsErrors: false,
-				useAdvancedMatching: false,
-				matchMethod: "",
-				expectedValue: "",
-				jsonPath: "",
-				customUpCodes: [],
-			};
-	}
-
-	return defaults;
-};
-
 export const useMonitorForm = ({
 	data = null,
 	defaultType = "http",
 }: UseMonitorFormOptions = {}) => {
 	return useMemo(() => {
 		const type = data?.type || defaultType;
-		return { schema: monitorSchema, defaults: getMonitorDefaults(type, data) };
+		const base = getBaseDefaults(data);
+
+		let defaults: MonitorFormData;
+
+		switch (type) {
+			case "http":
+				defaults = {
+					...base,
+					type: "http",
+					url: data?.url || "",
+					ignoreTlsErrors: data?.ignoreTlsErrors || false,
+					useAdvancedMatching: data?.useAdvancedMatching || false,
+					matchMethod: data?.matchMethod || "",
+					expectedValue: data?.expectedValue || "",
+					jsonPath: data?.jsonPath || "",
+				};
+				break;
+			case "ping":
+				defaults = {
+					...base,
+					type: "ping",
+					url: data?.url || "",
+				};
+				break;
+			case "port":
+				defaults = {
+					...base,
+					type: "port",
+					url: data?.url || "",
+					port: data?.port || 80,
+				};
+				break;
+			case "docker":
+				defaults = {
+					...base,
+					type: "docker",
+					url: data?.url || "",
+				};
+				break;
+			case "game":
+				defaults = {
+					...base,
+					type: "game",
+					url: data?.url || "",
+					port: data?.port || 27015,
+					gameId: data?.gameId || "",
+				};
+				break;
+			case "grpc":
+				defaults = {
+					...base,
+					type: "grpc",
+					url: data?.url || "",
+					port: data?.port || 50051,
+					grpcServiceName: data?.grpcServiceName || "",
+					ignoreTlsErrors: data?.ignoreTlsErrors || false,
+				};
+				break;
+			case "pagespeed":
+				defaults = {
+					...base,
+					type: "pagespeed",
+					url: data?.url || "",
+				};
+				break;
+			case "hardware":
+				defaults = {
+					...base,
+					type: "hardware",
+					url: data?.url || "",
+					secret: data?.secret || "",
+					cpuAlertThreshold: data?.cpuAlertThreshold ?? 100,
+					memoryAlertThreshold: data?.memoryAlertThreshold ?? 100,
+					diskAlertThreshold: data?.diskAlertThreshold ?? 100,
+					tempAlertThreshold: data?.tempAlertThreshold ?? 100,
+					selectedDisks: data?.selectedDisks || [],
+				};
+				break;
+			case "websocket":
+				defaults = {
+					...base,
+					type: "websocket",
+					url: data?.url || "",
+					ignoreTlsErrors: data?.ignoreTlsErrors || false,
+				};
+				break;
+			default:
+				defaults = {
+					...base,
+					type: "http",
+					url: "",
+					ignoreTlsErrors: false,
+					useAdvancedMatching: false,
+					matchMethod: "",
+					expectedValue: "",
+					jsonPath: "",
+				};
+		}
+
+		return { schema: monitorSchema, defaults };
 	}, [data, defaultType]);
 };
@@ -78,14 +78,6 @@ function buildDefaults(data: Notification | null): NotificationFormData {
 			accessToken: data.accessToken || "",
 		};
 	}
-	if (data?.type === "ntfy") {
-		return {
-			type: "ntfy",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-			topic: data.topic || "",
-		};
-	}
 	// Default: email (covers both data === null and data.type === "email")
 	return {
 		type: "email",
@@ -6,7 +6,6 @@ import {
 	DEFAULT_STATUS_PAGE_THEME_MODE,
 } from "@/Types/StatusPage";
 import type { Monitor } from "@/Types/Monitor";
-import { resolveTimezone } from "@/Utils/TimeUtils";

 interface UseStatusPageFormOptions {
 	data?: StatusPage | null;
@@ -31,8 +30,7 @@ export const useStatusPageForm = ({
 		const defaults: StatusPageFormData = {
 			companyName: data?.companyName || "",
 			url: data?.url || generateDefaultUrl(),
-			customDomain: data?.customDomain ?? null,
-			timezone: resolveTimezone(data?.timezone),
+			timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
 			type: data?.type || ["uptime"],
 			color: data?.color || "#13715B",
 			monitors: data?.monitors || [],
@@ -1,18 +0,0 @@
-import { useMemo } from "react";
-import { tagSchema, type TagFormData } from "@/Validation/tag";
-import type { Tag } from "@/Types/Tag";
-
-interface UseTagsFormOptions {
-	data?: Tag | null;
-}
-
-export const useTagsForm = ({ data }: UseTagsFormOptions) => {
-	return useMemo(() => {
-		const defaults: TagFormData = {
-			name: data?.name ?? "",
-			color: data?.color ?? "#13715B",
-		};
-
-		return { schema: tagSchema, defaults };
-	}, [data]);
-};
@@ -10,9 +10,8 @@ import { useInviteForm } from "@/Hooks/useInviteForm";
 import type { InviteFormData } from "@/Validation/invite";
 import { usePost } from "@/Hooks/UseApi";
 import { LAYOUT } from "@/Utils/Theme/constants";
-import { runtimeConfig } from "@/Utils/runtimeConfig";

-const CLIENT_HOST = runtimeConfig.clientHost || import.meta.env.VITE_APP_CLIENT_HOST;
+const CLIENT_HOST = import.meta.env.VITE_APP_CLIENT_HOST;

 interface InviteResponse {
 	token: string;
@@ -57,7 +56,7 @@ export const InviteTeamMemberDialog = ({
 		const result = await generateToken("/invite", data);
 		if (result?.data?.token) {
 			const token = result.data.token;
-			const link = `${CLIENT_HOST || window.location.origin}/register/${token}`;
+			const link = CLIENT_HOST ? `${CLIENT_HOST}/register/${token}` : token;
 			setInviteLink(link);
 		}
 	};
@@ -1,12 +1,8 @@
-import {
-	Table,
-	Pagination,
-	StatusLabel,
-	StatusCodeLabel,
-} from "@/Components/design-elements";
+import { Table, Pagination, ValueLabel, StatusLabel } from "@/Components/design-elements";
 import Box from "@mui/material/Box";
 import type { Header } from "@/Components/design-elements/Table";
 import type { Monitor } from "@/Types/Monitor";
+
 import { useTranslation } from "react-i18next";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
 import type { Check } from "@/Types/Check";
@@ -33,7 +29,7 @@ export const ChecksTable = ({
 	const { t } = useTranslation();
 	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);

-	const getHeaders = () => {
+	const getHeaders = (t: Function, uiTimezone: string) => {
 		const headers: Header<Check>[] = [
 			{
 				id: "monitorName",
@@ -67,10 +63,13 @@ export const ChecksTable = ({
 				id: "statusCode",
 				content: t("pages.checks.table.headers.statusCode"),
 				render: (row) => {
+					const code = row.statusCode;
+					if (!code) return "N/A";
+					const value = code < 300 ? "positive" : code < 400 ? "neutral" : "negative";
 					return (
-						<StatusCodeLabel
-							statusCode={row.statusCode}
-							message={row.message}
+						<ValueLabel
+							value={value}
+							text={String(code)}
 						/>
 					);
 				},
@@ -86,7 +85,7 @@ export const ChecksTable = ({
 		return headers;
 	};

-	const headers = getHeaders();
+	const headers = getHeaders(t, uiTimezone);

 	const handlePageChange = (
 		_e: React.MouseEvent<HTMLButtonElement> | null,
@@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack";
 import Grid from "@mui/material/Grid";
 import Divider from "@mui/material/Divider";
 import Typography from "@mui/material/Typography";
-import { BaseBox, ValueLabel, StatusCodeLabel } from "@/Components/design-elements";
+import { BaseBox, ValueLabel } from "@/Components/design-elements";
 import { LAYOUT } from "@/Utils/Theme/constants";

 import { useTranslation } from "react-i18next";
@@ -46,7 +46,6 @@ export const CardDetails = ({ incident, monitor, sx }: CardDetailsProps) => {
 	if (!incident) {
 		return null;
 	}
-
 	return (
 		<Stack
 			gap={theme.spacing(LAYOUT.MD)}
@@ -124,12 +123,7 @@ export const CardDetails = ({ incident, monitor, sx }: CardDetailsProps) => {
 							<Cell>{t("pages.incidents.dialog.details.statusCode")}</Cell>
 						</Grid>
 						<Grid size={4}>
-							<Cell>
-								<StatusCodeLabel
-									statusCode={incident.statusCode}
-									message={incident.message}
-								/>
-							</Cell>
+							<Cell>{incident.statusCode ?? "N/A"}</Cell>
 						</Grid>
 						<Grid size={2}>
 							<Cell>{t("pages.incidents.dialog.details.downtime")}</Cell>
@@ -1,6 +1,8 @@
-import { Table, ValueLabel, StatusCodeLabel } from "@/Components/design-elements";
+import { Table } from "@/Components/design-elements";
 import { Pagination } from "@/Components/design-elements/Table";
 import type { Header } from "@/Components/design-elements/Table";
+import { ValueLabel } from "@/Components/design-elements";
+import type { ValueType } from "@/Components/design-elements/StatusLabel";
 import { ActionsMenu } from "@/Components/actions-menu";
 import type { Incident } from "@/Types/Incident";
 import type { Monitor } from "@/Types/Monitor";
@@ -134,12 +136,13 @@ export const IncidentsTable = ({
 						return (
 							<Typography
 								variant="body2"
-								color={
-									row.resolutionType === "manual"
-										? theme.palette.warning.main
-										: theme.palette.success.main
-								}
-								textTransform={"capitalize"}
+								sx={{
+									textTransform: "capitalize",
+									color:
+										row.resolutionType === "manual"
+											? theme.palette.warning.main
+											: theme.palette.success.main,
+								}}
 							>
 								{row.resolutionType}
 							</Typography>
@@ -152,10 +155,15 @@ export const IncidentsTable = ({
 				id: "statusCode",
 				content: t("pages.incidents.table.headers.statusCode"),
 				render: (row) => {
+					const code = row.statusCode;
+					if (!code) return "N/A";
+					let value: ValueType = "neutral";
+					if (code < 300) value = "positive";
+					else if (code >= 400) value = "negative";
 					return (
-						<StatusCodeLabel
-							statusCode={row.statusCode}
-							message={row.message}
+						<ValueLabel
+							value={value}
+							text={String(code)}
 						/>
 					);
 				},
@@ -63,20 +63,10 @@ const getChartConfigs = (
 	return configs;
 };

-// Loopback / bridge names Capture sees when it can only observe the container's
-// own network namespace. When ALL reported interfaces match this set we assume
-// the "no real interfaces visible" case and surface the notice.
-const CONTAINER_ONLY_IFACE_NAMES = new Set(["lo", "lo0", "docker0"]);
-
-const onlyContainerVisibleInterfaces = (checks: HardwareCheckStats[]): boolean => {
-	const named = new Set<string>();
-	checks.forEach((c) => c.net?.forEach((iface) => named.add(iface.name)));
-	if (named.size === 0) return false;
-	for (const name of named) {
-		if (!CONTAINER_ONLY_IFACE_NAMES.has(name)) return false;
-	}
-	return true;
-};
+const hasAnyNetworkTraffic = (checks: HardwareCheckStats[]): boolean =>
+	checks.some((c) =>
+		c.net?.some((iface) => iface.bytesSentPerSecond > 0 || iface.deltaBytesRecv > 0)
+	);

 export const InfraNetworkCharts = ({
 	checks,
@@ -92,14 +82,13 @@ export const InfraNetworkCharts = ({
 		() => getChartConfigs(theme, checks, t),
 		[theme, checks, t]
 	);
-	const showLoopbackOnlyNotice =
-		chartConfigs.length > 0 && onlyContainerVisibleInterfaces(checks);
+	const showNoTrafficNotice = chartConfigs.length > 0 && !hasAnyNetworkTraffic(checks);

 	return (
 		<Stack gap={theme.spacing(LAYOUT.XS)}>
-			{showLoopbackOnlyNotice && (
+			{showNoTrafficNotice && (
 				<NoticeBanner severity="warning">
-					{t("pages.infrastructure.charts.labels.loopbackOnlyNotice")}
+					{t("pages.infrastructure.charts.labels.netNoTraffic")}
 				</NoticeBanner>
 			)}
 			<Grid
@@ -25,11 +25,10 @@ export const InfraDetailsGauges = ({
 		<Stack
 			direction={isSmall ? "column" : "row"}
 			spacing={theme.spacing(8)}
-			alignItems={"stretch"}
+			alignItems={"center"}
 		>
 			<DetailGauge
 				title={t("pages.infrastructure.gauges.memory.title")}
-				maxWidth={260}
 				progress={(snapshot?.memory?.usage_percent || 0) * 100}
 				upperLabel={t("pages.infrastructure.gauges.memory.upperLabel")}
 				upperValue={prettyBytes(snapshot?.memory?.used_bytes || 0)}
@@ -38,7 +37,6 @@ export const InfraDetailsGauges = ({
 			/>
 			<DetailGauge
 				title={t("pages.infrastructure.gauges.cpu.title")}
-				maxWidth={260}
 				progress={(snapshot?.cpu?.usage_percent || 0) * 100}
 				upperLabel={t("pages.infrastructure.gauges.cpu.upperLabel")}
 				upperValue={getFrequency(snapshot?.cpu?.current_frequency || 0)}
@@ -51,7 +49,6 @@ export const InfraDetailsGauges = ({
 						key={disk?.device || 0 + idx}
 						// title={`Disk ${idx} usage`}
 						title={t("pages.infrastructure.gauges.disk.title", { idx })}
-						maxWidth={260}
 						progress={(disk.usage_percent || 0) * 100}
 						upperLabel={t("pages.infrastructure.gauges.disk.upperLabel")}
 						upperValue={prettyBytes(disk?.used_bytes || 0)}
@@ -1,14 +1,6 @@
 import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import {
-	Table,
-	Pagination,
-	StatusLabel,
-	Gauge,
-	ColoredLabel,
-} from "@/Components/design-elements";
-import { SPACING } from "@/Utils/Theme/constants";
+import { Table, Pagination, StatusLabel, Gauge } from "@/Components/design-elements";
 import type { Header } from "@/Components/design-elements/Table";
 import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu";
 import { ArrowUp, ArrowDown } from "lucide-react";
@@ -20,30 +12,9 @@ import { useNavigate } from "react-router-dom";
 import { usePost } from "@/Hooks/UseApi";

 import type { Monitor } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
-import { Checkbox } from "@/Components/inputs";
-
-interface InfraMonitorsTableProps {
-	monitors: Monitor[];
-	tags: Tag[];
-	refetch: () => void;
-	setSelectedMonitor: (monitor: Monitor | null) => void;
-	sortField: string;
-	setSortField: (field: string) => void;
-	sortOrder: "asc" | "desc";
-	setSortOrder: (order: "asc" | "desc") => void;
-	count: number;
-	page: number;
-	setPage: (page: number) => void;
-	rowsPerPage: number;
-	setRowsPerPage: (rowsPerPage: number) => void;
-	selectedRows?: string[];
-	onSelectionChange?: (selected: string[]) => void;
-}

 export const InfraMonitorsTable = ({
 	monitors,
-	tags,
 	refetch,
 	setSelectedMonitor,
 	sortField,
@@ -55,32 +26,29 @@ export const InfraMonitorsTable = ({
 	setPage,
 	rowsPerPage,
 	setRowsPerPage,
-	selectedRows = [],
-	onSelectionChange,
-}: InfraMonitorsTableProps) => {
+}: {
+	monitors: Monitor[];
+	refetch: Function;
+	setSelectedMonitor: Function;
+	sortField: string;
+	setSortField: (field: string) => void;
+	sortOrder: "asc" | "desc";
+	setSortOrder: (order: "asc" | "desc") => void;
+	count: number;
+	page: number;
+	setPage: (page: number) => void;
+	rowsPerPage: number;
+	setRowsPerPage: (rowsPerPage: number) => void;
+}) => {
 	const { t } = useTranslation();
 	const theme = useTheme();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const navigate = useNavigate();
-	const { post } = usePost<Record<string, never>, Monitor>();
-
-	const selectedSet = new Set(selectedRows);
-	const isAllSelected =
-		monitors.length > 0 && monitors.every((m) => selectedSet.has(m.id));
-	const isSomeSelected = selectedRows.length > 0 && !isAllSelected;
-
-	const handleSelectAll = (checked: boolean) => {
-		onSelectionChange?.(checked ? monitors.map((m) => m.id) : []);
-	};
-
-	const handleSelectRow = (id: string, checked: boolean) => {
-		if (!onSelectionChange) return;
-		onSelectionChange(
-			checked ? [...selectedRows, id] : selectedRows.filter((rowId) => rowId !== id)
-		);
-	};
-
-	const isRowSelected = (id: string) => selectedSet.has(id);
+	const {
+		post,
+		// loading: isPatching,
+		// error: postError,
+	} = usePost<any, Monitor>();

 	const handlePageChange = (
 		_e: React.MouseEvent<HTMLButtonElement> | null,
@@ -97,7 +65,7 @@ export const InfraMonitorsTable = ({
 		setRowsPerPage(value);
 	};

-	const handleSort = (e: React.MouseEvent, field: string) => {
+	const handleSort = (e: any, field: string) => {
 		e.preventDefault();
 		e.stopPropagation();
 		if (sortField === field) {
@@ -133,6 +101,13 @@ export const InfraMonitorsTable = ({
 					navigate(`/infrastructure/configure/${monitor.id}`);
 				},
 			},
+			// {
+			//   id: 5,
+			//   label: "Clone",
+			//   action: () => {
+
+			//   },
+			// },
 			{
 				id: 6,
 				label:
@@ -177,35 +152,8 @@ export const InfraMonitorsTable = ({
 			</Box>
 		);
 		const headers: Header<Monitor>[] = [
-			{
-				id: "selection",
-				content: (
-					<Checkbox
-						aria-label={t("pages.common.monitors.actions.selectAll")}
-						indeterminate={isSomeSelected}
-						checked={isAllSelected}
-						onChange={(e) => handleSelectAll(e.target.checked)}
-					/>
-				),
-				hideMobileLabel: true,
-				render: (row) => (
-					<Checkbox
-						aria-label={t("pages.common.monitors.actions.selectMonitor", {
-							name: row.name,
-						})}
-						checked={isRowSelected(row.id)}
-						onChange={(e) => {
-							handleSelectRow(row.id, e.target.checked);
-						}}
-						onClick={(e) => e.stopPropagation()}
-					/>
-				),
-				onClick: (e) => e?.stopPropagation(),
-			},
 			{
 				id: "name",
-				align: "left",
-				mobileLabel: t("common.table.headers.name"),
 				content: (
 					<Typography
 						component="div"
@@ -225,20 +173,18 @@ export const InfraMonitorsTable = ({
 			},
 			{
 				id: "status",
-				mobileLabel: t("common.table.headers.status"),
 				content: (
-					<Stack
+					<Typography
+						component="div"
+						display="inline-flex"
+						alignItems="center"
 						gap={theme.spacing(4)}
-						direction={"row"}
-						justifyContent={"center"}
-						alignItems={"center"}
 						onClick={(e) => handleSort(e, "status")}
 						sx={{ cursor: "pointer" }}
 					>
-						<Box width={theme.spacing(8)} />
 						{t("common.table.headers.status")}
 						{renderSortIcon(sortField === "status")}
-					</Stack>
+					</Typography>
 				),
 				render: (row) => {
 					return <StatusLabel status={row.status} />;
@@ -277,32 +223,6 @@ export const InfraMonitorsTable = ({
 					return <Gauge progress={diskUsage} />;
 				},
 			},
-			{
-				id: "tags",
-				content: t("common.table.headers.tags"),
-				render: (row) => {
-					if (row.tags.length === 0) return "-";
-					return (
-						<Stack
-							justifyContent={"center"}
-							direction={isSmall ? "column" : "row"}
-							gap={theme.spacing(SPACING.LG)}
-						>
-							{row.tags.map((tagId) => {
-								const fullTag = tags.find((t) => t.id === tagId);
-								if (!fullTag) return null;
-								return (
-									<ColoredLabel
-										key={fullTag.id}
-										text={fullTag.name}
-										color={fullTag.color}
-									/>
-								);
-							})}
-						</Stack>
-					);
-				},
-			},

 			{
 				id: "actions",
@@ -328,11 +248,6 @@ export const InfraMonitorsTable = ({
 				onRowClick={(row) => {
 					navigate(`/infrastructure/${row.id}`);
 				}}
-				getRowSx={(row) => ({
-					backgroundColor: isRowSelected(row.id)
-						? theme.palette.action.selected
-						: "inherit",
-				})}
 			/>
 			<Pagination
 				component="div"
@@ -1,22 +1,14 @@
 import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
 import useMediaQuery from "@mui/material/useMediaQuery";
-import { MonitorBasePageWithStates, ColoredLabel } from "@/Components/design-elements";
+import { MonitorBasePageWithStates } from "@/Components/design-elements";
 import { HeaderCreate } from "@/Components/common";
-import {
-	ControlsFilter,
-	HeaderMonitorsSummary,
-	BulkActionsBar,
-} from "@/Components/monitors";
-import { TextField, Dialog, Button } from "@/Components/inputs";
-import { Play, Pause } from "lucide-react";
+import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/monitors";
+import { TextField, Dialog } from "@/Components/inputs";

 import { useGet, useDelete } from "@/Hooks/UseApi";
 import { useIsAdmin } from "@/Hooks/useIsAdmin";
 import type { Monitor, MonitorsWithChecksResponse } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
 import { useTheme } from "@mui/material";
-import { SPACING } from "@/Utils/Theme/constants";
 import { useState, useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { useSelector, useDispatch } from "react-redux";
@@ -24,7 +16,6 @@ import { setRowsPerPage } from "@/Features/UI/uiSlice.js";
 import type { RootState } from "@/Types/state";
 import { InfraMonitorsTable } from "./Components/MonitorsTable";
 import useDebounce from "@/Hooks/useDebounce";
-import { useBulkMonitorActions } from "@/Hooks/useBulkMonitorActions";

 const InfrastructureMonitors = () => {
 	const { t } = useTranslation();
@@ -41,15 +32,11 @@ const InfrastructureMonitors = () => {
 	// Local state
 	const [selectedStatus, setSelectedStatus] = useState<string>("");
 	const [selectedState, setSelectedState] = useState<string>("");
-	const [selectedTags, setSelectedTags] = useState<string[]>([]);
 	const [search, setSearch] = useState<string>("");
 	const [page, setPage] = useState<number>(0);
 	const [sortField, setSortField] = useState<string>("");
 	const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
 	const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
-
-	const { data: tags } = useGet<Tag[]>("/tags/team");
-
 	const isDialogOpen = Boolean(selectedMonitor);

 	const debouncedSearch = useDebounce<string>(search, 300);
@@ -57,7 +44,6 @@ const InfrastructureMonitors = () => {
 	const handleClearFilters = useCallback(() => {
 		setSelectedStatus("");
 		setSelectedState("");
-		setSelectedTags([]);
 		setSearch("");
 	}, []);

@@ -88,7 +74,6 @@ const InfrastructureMonitors = () => {
 	const monitorsWithChecksUrl = useMemo(() => {
 		const params = new URLSearchParams();
 		params.append("type", "hardware");
-		selectedTags.forEach((tagId) => params.append("tags", tagId));
 		params.append("limit", "1");
 		if (page !== undefined) params.append("page", String(page));
 		if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
@@ -96,7 +81,7 @@ const InfrastructureMonitors = () => {
 		if (field) params.append("field", field);
 		if (sortOrder) params.append("order", sortOrder);
 		return `/monitors/team/with-checks?${params.toString()}`;
-	}, [page, rowsPerPage, filter, field, sortOrder, selectedTags]);
+	}, [page, rowsPerPage, filter, field, sortOrder]);

 	const {
 		data: monitorsWithChecksData,
@@ -112,19 +97,8 @@ const InfrastructureMonitors = () => {
 	const { summary, count } = monitorsWithChecksData ?? { summary: null, count: 0 };
 	const isLoading = monitorsWithChecksLoading;

-	// Bulk actions
-	const {
-		selectedRows,
-		setSelectedRows,
-		handleBulkPause,
-		handleBulkResume,
-		handleCancelSelection,
-	} = useBulkMonitorActions(refetch, page);
-
 	// Check if any filters are active
-	const hasActiveFilters = Boolean(
-		selectedStatus || selectedState || selectedTags.length > 0 || search
-	);
+	const hasActiveFilters = Boolean(selectedStatus || selectedState || search);

 	// Show empty state only when there are truly no monitors (not just filtered out)
 	const effectiveTotalCount =
@@ -175,9 +149,6 @@ const InfrastructureMonitors = () => {
 					setSelectedStatus={setSelectedStatus}
 					selectedState={selectedState}
 					setSelectedState={setSelectedState}
-					tagOptions={tags ?? []}
-					selectedTags={selectedTags}
-					setSelectedTags={setSelectedTags}
 					onClearFilters={handleClearFilters}
 				/>
 				<TextField
@@ -188,56 +159,8 @@ const InfrastructureMonitors = () => {
 					}}
 				/>
 			</Stack>
-
-			{selectedTags.length > 0 && (
-				<Stack
-					direction={isSmall ? "column" : "row"}
-					alignItems={isSmall ? "flex-start" : "center"}
-					flexWrap="wrap"
-					gap={theme.spacing(SPACING.XL)}
-				>
-					<Typography color={theme.palette.text.secondary}>
-						{t("pages.uptime.filters.activeTags")}
-					</Typography>
-					{selectedTags.map((tagId) => {
-						const tag = tags?.find((t) => t.id === tagId);
-						if (!tag) return null;
-						return (
-							<ColoredLabel
-								key={tag.id}
-								text={tag.name}
-								color={tag.color}
-							/>
-						);
-					})}
-				</Stack>
-			)}
-
-			{!isLoading && (
-				<BulkActionsBar
-					selectedCount={selectedRows.length}
-					onCancel={handleCancelSelection}
-				>
-					<Button
-						size="small"
-						startIcon={<Play size={16} />}
-						onClick={handleBulkResume}
-					>
-						{t("common.buttons.resume")}
-					</Button>
-					<Button
-						size="small"
-						startIcon={<Pause size={16} />}
-						onClick={handleBulkPause}
-					>
-						{t("common.buttons.pause")}
-					</Button>
-				</BulkActionsBar>
-			)}
-
 			<InfraMonitorsTable
 				monitors={monitorsWithChecksData?.monitors || []}
-				tags={tags ?? []}
 				refetch={refetch}
 				setSelectedMonitor={setSelectedMonitor}
 				sortField={sortField}
@@ -257,8 +180,6 @@ const InfrastructureMonitors = () => {
 					);
 					setPage(0);
 				}}
-				selectedRows={selectedRows}
-				onSelectionChange={setSelectedRows}
 			/>
 			<Dialog
 				open={isDialogOpen}
@@ -1,15 +1,12 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Stats } from "@/Pages/Logs/components/Stats";
-import { MongoStats } from "@/Pages/Logs/components/MongoStats";
-import { MongoCollectionStats } from "./components/MongoCollectionStats";
 import { StatGauges } from "@/Pages/Logs/components/StatGauges";

 import { useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { useGet } from "@/Hooks/UseApi";
 import type { Diagnostics } from "@/Types/Diagnostics";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";

 export const TabDiagnostics = () => {
 	const theme = useTheme();
@@ -22,12 +19,12 @@ export const TabDiagnostics = () => {
 	} = useGet<Diagnostics>("/diagnostic/system", {}, { refreshInterval: 5000 });

 	return (
-		<Stack gap={theme.spacing(LAYOUT.XL)}>
-			<Stack gap={theme.spacing(LAYOUT.XS)}>
-				<Stack gap={theme.spacing(SPACING.SM)}>
+		<Stack gap={theme.spacing(12)}>
+			<Stack gap={theme.spacing(4)}>
+				<Stack gap={theme.spacing(1)}>
 					<Typography
 						variant="eyebrow"
-						color={theme.palette.text.secondary}
+						color="text.secondary"
 					>
 						{t("pages.logs.diagnostics.sections.runtimeStats.title")}
 					</Typography>
@@ -37,11 +34,11 @@ export const TabDiagnostics = () => {
 				</Stack>
 				<Stats diagnostics={diagnostics} />
 			</Stack>
-			<Stack gap={theme.spacing(LAYOUT.XS)}>
-				<Stack gap={theme.spacing(SPACING.SM)}>
+			<Stack gap={theme.spacing(4)}>
+				<Stack gap={theme.spacing(1)}>
 					<Typography
 						variant="eyebrow"
-						color={theme.palette.text.secondary}
+						color="text.secondary"
 					>
 						{t("pages.logs.diagnostics.sections.memoryCpu.title")}
 					</Typography>
@@ -51,30 +48,6 @@ export const TabDiagnostics = () => {
 				</Stack>
 				<StatGauges diagnostics={diagnostics} />
 			</Stack>
-			<Stack gap={theme.spacing(LAYOUT.XS)}>
-				<Typography
-					variant="eyebrow"
-					color={theme.palette.text.secondary}
-				>
-					{t("pages.logs.diagnostics.sections.mongoDBStats.title")}
-				</Typography>
-				<Typography color={theme.palette.text.secondary}>
-					{t("pages.logs.diagnostics.sections.mongoDBStats.description")}
-				</Typography>
-				<MongoStats diagnostics={diagnostics} />
-			</Stack>
-			<Stack gap={theme.spacing(LAYOUT.XS)}>
-				<Typography
-					variant="eyebrow"
-					color={theme.palette.text.secondary}
-				>
-					{t("pages.logs.diagnostics.sections.mongoDBCollectionStats.title")}
-				</Typography>
-				<Typography color={theme.palette.text.secondary}>
-					{t("pages.logs.diagnostics.sections.mongoDBCollectionStats.description")}
-				</Typography>
-				<MongoCollectionStats diagnostics={diagnostics} />
-			</Stack>
 		</Stack>
 	);
 };
@@ -2,41 +2,28 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
 import { TableJobs, TableFailedJobs } from "./components/TableJobs";
-import { TableWorkers } from "./components/TableWorkers";
+
 import { useTheme } from "@mui/material";
-import { useState } from "react";
 import { useTranslation, Trans } from "react-i18next";
 import { useGet, usePost } from "@/Hooks/UseApi";
 import type { QueueData } from "@/Types/Queue";
 import { Metrics } from "@/Pages/Logs/components/Metrics";
 import { Button } from "@/Components/inputs";
 import { EmptyState } from "@/Components/design-elements";
-import { SPACING } from "@/Utils/Theme/constants";

 export const TabQueue = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const [page, setPage] = useState(0);
-	const [rowsPerPage, setRowsPerPage] = useState(10);
 	const {
 		data: queueData,
 		isLoading,
 		// error,
 		refetch,
-	} = useGet<QueueData>(
-		`/queue/all-metrics?page=${page}&rowsPerPage=${rowsPerPage}`,
-		{},
-		{ refreshInterval: 1000, keepPreviousData: true }
-	);
+	} = useGet<QueueData>("/queue/all-metrics", {}, { refreshInterval: 5000 });

 	const { post, loading: isFlushing } = usePost();

 	const jobs = queueData?.jobs ?? [];
-	const jobsCount = queueData?.count ?? 0;
-	const workers = (queueData?.metrics?.workers ?? []).map((worker, idx) => ({
-		...worker,
-		id: idx,
-	}));
 	const metrics = queueData?.metrics ?? null;
 	const hasNeverRun = !isLoading && metrics !== null && (metrics.totalRuns ?? 0) === 0;
 	const noQueueData = !isLoading && metrics === null && jobs.length === 0;
@@ -62,77 +49,54 @@ export const TabQueue = () => {
 				<Stack gap={theme.spacing(1)}>
 					<Typography
 						variant="eyebrow"
-						color={theme.palette.text.secondary}
-					>
-						{t("pages.logs.workers")}
-					</Typography>
-					<Typography color={theme.palette.text.secondary}>
-						<Trans
-							i18nKey="pages.logs.workersExplainers"
-							components={{
-								highlight: (
-									<Box
-										component="span"
-										bgcolor={theme.palette.rowStatus.running}
-										color={theme.palette.text.primary}
-										px={SPACING.SM}
-										py={SPACING.XXS}
-										borderRadius={theme.shape.borderRadius}
-									/>
-								),
-							}}
-						/>
-					</Typography>
-				</Stack>
-				<TableWorkers queueWorkers={workers} />
-			</Stack>
-			<Stack gap={theme.spacing(3)}>
-				<Stack gap={theme.spacing(1)}>
-					<Typography
-						variant="eyebrow"
-						color={theme.palette.text.secondary}
+						color="text.secondary"
 					>
 						{t("pages.logs.jobQueue")}
 					</Typography>
-					<Typography color={theme.palette.text.secondary}>
+					<Typography
+						sx={{
+							fontSize: 13,
+							color: theme.palette.text.secondary,
+						}}
+					>
 						<Trans
 							i18nKey="pages.logs.jobQueueExplainer"
 							components={{
 								highlight: (
 									<Box
 										component="span"
-										bgcolor={theme.palette.rowStatus.running}
-										color={theme.palette.text.primary}
-										px={SPACING.SM}
-										py={SPACING.XXS}
-										borderRadius={theme.shape.borderRadius}
+										sx={{
+											backgroundColor:
+												theme.palette.mode === "dark"
+													? "rgba(19, 113, 91, 0.18)"
+													: "#ECF7F2",
+											color: theme.palette.text.primary,
+											px: 1,
+											py: 0.25,
+											borderRadius: 0.5,
+										}}
 									/>
 								),
 							}}
 						/>
 					</Typography>
 				</Stack>
-				<TableJobs
-					jobs={jobs}
-					count={jobsCount}
-					page={page}
-					rowsPerPage={rowsPerPage}
-					onPageChange={(_, newPage) => setPage(newPage)}
-					onRowsPerPageChange={(event) => {
-						setRowsPerPage(parseInt(event.target.value, 10));
-						setPage(0);
-					}}
-				/>
+				<TableJobs jobs={jobs} />
 			</Stack>
 			<Stack gap={theme.spacing(3)}>
 				<Stack gap={theme.spacing(1)}>
 					<Typography
 						variant="eyebrow"
-						color={theme.palette.text.secondary}
+						color="text.secondary"
 					>
 						{t("pages.logs.failedJobs")}
 					</Typography>
-					<Typography color={theme.palette.text.secondary}>
+					<Typography
+						sx={{
+							fontSize: 13,
+							color: theme.palette.text.secondary,
+						}}
+					>
 						{t("pages.logs.failedJobsExplainer")}
 					</Typography>
 				</Stack>
@@ -1,104 +0,0 @@
-import Box from "@mui/material/Box";
-import { StatBox, Gauge, Tooltip } from "@/Components/design-elements";
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-
-import { useTranslation } from "react-i18next";
-import prettyBytes from "pretty-bytes";
-import { useTheme } from "@mui/material";
-import type { Diagnostics } from "@/Types/Diagnostics";
-import { LAYOUT } from "@/Utils/Theme/constants";
-
-interface MongoStatsProps {
-	diagnostics: Diagnostics | null;
-}
-
-export const MongoCollectionStats = ({ diagnostics }: MongoStatsProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const mongoStats = diagnostics?.mongoStats;
-	if (!mongoStats) {
-		return null;
-	}
-
-	return (
-		<Box
-			display={"grid"}
-			gap={theme.spacing(LAYOUT.MD)}
-			sx={{
-				gridTemplateColumns: { xs: "1fr", md: "repeat(5, 1fr)" },
-				"& > *": { width: "100% !important" },
-			}}
-		>
-			{mongoStats.collections.map((colStat) => (
-				<StatBox
-					key={colStat.name}
-					title={colStat.name}
-					subtitle={""}
-				>
-					<Stack
-						direction={"row"}
-						alignItems={"center"}
-						justifyContent={"space-between"}
-					>
-						<Stack>
-							{/* <Typography variant="body2">{`Documents: ${colStat.documentCount}`}</Typography> */}
-							<Typography variant="body2">
-								{t("pages.logs.diagnostics.mongoDBCollectionStats.documents", {
-									count: colStat.documentCount,
-								})}
-							</Typography>
-							{colStat.bucketCount !== undefined && (
-								<Typography variant="body2">
-									{t("pages.logs.diagnostics.mongoDBCollectionStats.bucketCount", {
-										count: colStat.bucketCount,
-									})}
-								</Typography>
-							)}
-							<Typography variant="body2">
-								{t("pages.logs.diagnostics.mongoDBCollectionStats.storageSize", {
-									size: prettyBytes(colStat.storageSize),
-								})}
-							</Typography>
-							<Typography variant="body2">
-								{t("pages.logs.diagnostics.mongoDBCollectionStats.indexSize", {
-									size: prettyBytes(colStat.totalIndexSize),
-								})}
-							</Typography>
-							<Typography variant="body2">
-								{t("pages.logs.diagnostics.mongoDBCollectionStats.totalSize", {
-									size: prettyBytes(colStat.totalSize),
-								})}
-							</Typography>
-						</Stack>
-						<Stack alignItems={"center"}>
-							<Tooltip
-								title={t("pages.logs.diagnostics.mongoDBCollectionStats.dbUsageTooltip", {
-									percentage: ((colStat.totalSize / mongoStats.totalSize) * 100).toFixed(
-										2
-									),
-								})}
-								placement="top"
-								slotProps={{
-									popper: {
-										modifiers: [
-											{
-												name: "offset",
-												options: {
-													offset: [0, -10],
-												},
-											},
-										],
-									},
-								}}
-							>
-								<Gauge progress={(colStat.totalSize / mongoStats.totalSize) * 100} />
-							</Tooltip>
-						</Stack>
-					</Stack>
-				</StatBox>
-			))}
-		</Box>
-	);
-};
@@ -1,74 +0,0 @@
-import Box from "@mui/material/Box";
-import { StatBox } from "@/Components/design-elements";
-
-import { useTranslation } from "react-i18next";
-import prettyBytes from "pretty-bytes";
-import { useTheme } from "@mui/material";
-import type { Diagnostics } from "@/Types/Diagnostics";
-import { LAYOUT } from "@/Utils/Theme/constants";
-
-interface MongoStatsProps {
-	diagnostics: Diagnostics | null;
-}
-
-export const MongoStats = ({ diagnostics }: MongoStatsProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const mongoStats = diagnostics?.mongoStats;
-	if (!mongoStats) {
-		return null;
-	}
-
-	return (
-		<Box
-			display={"grid"}
-			gap={theme.spacing(LAYOUT.MD)}
-			sx={{
-				gridTemplateColumns: { xs: "1fr", md: "repeat(5, 1fr)" },
-				"& > *": { width: "100% !important" },
-			}}
-		>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.readyState")}
-				subtitle={mongoStats.readyState.toString()}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.readsPerSecond")}
-				subtitle={mongoStats.readsPerSecond.toFixed(0)}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.insertsPerSecond")}
-				subtitle={mongoStats.insertsPerSecond.toFixed(0)}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.updatesPerSecond")}
-				subtitle={mongoStats.updatesPerSecond.toFixed(0)}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.deletesPerSecond")}
-				subtitle={mongoStats.deletesPerSecond.toFixed(0)}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.writesPerSecond")}
-				subtitle={mongoStats.writesPerSecond.toFixed(0)}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.host")}
-				subtitle={mongoStats.host}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.port")}
-				subtitle={mongoStats.port.toString()}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.dbName")}
-				subtitle={mongoStats.dbName}
-			/>
-			<StatBox
-				title={t("pages.logs.diagnostics.mongoDBStats.storageSize")}
-				subtitle={prettyBytes(mongoStats.totalSize)}
-			/>
-		</Box>
-	);
-};
@@ -1,4 +1,4 @@
-import { Table, Pagination } from "@/Components/design-elements";
+import { Table } from "@/Components/design-elements";
 import { Typography, useTheme } from "@mui/material";
 import prettyMilliseconds from "pretty-ms";
 import { formatTimestamp } from "@/Utils/TimeUtils";
@@ -6,27 +6,14 @@ import { formatTimestamp } from "@/Utils/TimeUtils";
 import { useTranslation } from "react-i18next";
 import type { QueueJobFailure, QueueJobSummary, QueueMetrics } from "@/Types/Queue";
 import type { Header } from "@/Components/design-elements";
-import type { TablePaginationProps } from "@mui/material/TablePagination";

 type QueueJobWithId = QueueJobSummary & { id: string | number };

 interface TableJobsProps {
 	jobs: QueueJobSummary[];
-	count: number;
-	page: number;
-	rowsPerPage: number;
-	onPageChange: TablePaginationProps["onPageChange"];
-	onRowsPerPageChange: TablePaginationProps["onRowsPerPageChange"];
 }

-export const TableJobs = ({
-	jobs,
-	count,
-	page,
-	rowsPerPage,
-	onPageChange,
-	onRowsPerPageChange,
-}: TableJobsProps) => {
+export const TableJobs = ({ jobs }: TableJobsProps) => {
 	const { t } = useTranslation();
 	const theme = useTheme();

@@ -42,26 +29,7 @@ export const TableJobs = ({
 		maxWidth: 220,
 	};

-	const isRunning = (row: QueueJobWithId) =>
-		row.lockedBy !== null && row.lockedUntil !== null && row.lockedUntil > Date.now();
-
 	const headers: Header<QueueJobWithId>[] = [
-		{
-			id: "state",
-			content: t("pages.logs.table.headers.state"),
-			render: (row) => {
-				if (isRunning(row)) {
-					return t("common.labels.running");
-				}
-				if (row.monitorActive === true) {
-					return t("common.labels.active");
-				}
-				if (row.monitorActive === false) {
-					return t("common.labels.paused");
-				}
-				return t("common.labels.idle");
-			},
-		},
 		{
 			id: "id",
 			content: t("common.table.headers.monitorId"),
@@ -75,6 +43,15 @@ export const TableJobs = ({
 				</Typography>
 			),
 		},
+		{
+			id: "url",
+			content: t("common.table.headers.url"),
+			render: (row) => (
+				<Typography title={row.monitorUrl ?? ""} sx={cellSx}>
+					{row.monitorUrl}
+				</Typography>
+			),
+		},
 		{
 			id: "type",
 			content: t("common.table.headers.type"),
@@ -88,82 +65,52 @@ export const TableJobs = ({
 			),
 		},
 		{
-			id: "lastFinishedAt",
-			content: t("pages.logs.table.headers.lastFinishedAt"),
+			id: "lastRun",
+			content: t("pages.logs.table.headers.lastRunAt"),
 			render: (row) => {
-				const lastFinishedAt = formatTimestamp(row.lastFinishedAt) ?? "-";
+				const v = formatTimestamp(row.lastRunAt) ?? "-";
 				return (
-					<Typography
-						title={lastFinishedAt}
-						sx={cellSx}
-					>
-						{lastFinishedAt}
+					<Typography title={v} sx={cellSx}>
+						{v}
 					</Typography>
 				);
 			},
 		},
 		{
-			id: "nextScheduledAt",
-			content: t("pages.logs.table.headers.nextScheduledAt"),
+			id: "lastRunTook",
+			content: t("pages.logs.table.headers.lastRunTook"),
 			render: (row) => {
-				const nextScheduledAt = formatTimestamp(row.nextScheduledAt) ?? "-";
-				return (
-					<Typography
-						title={nextScheduledAt}
-						sx={cellSx}
-					>
-						{nextScheduledAt}
-					</Typography>
-				);
+				const value = row.lastRunTook ? prettyMilliseconds(row.lastRunTook) : "-";
+				return <Typography sx={cellSx}>{value}</Typography>;
 			},
 		},
 		{
-			id: "lockedBy",
-			content: t("pages.logs.table.headers.lockedBy"),
+			id: "lockedAt",
+			content: t("pages.logs.table.headers.lockedAt"),
 			render: (row) => {
-				const lockedBy = row.lockedBy;
-				if (!lockedBy) {
-					return <Typography sx={cellSx}>-</Typography>;
-				}
-
-				const workerId = lockedBy.split(":")[2];
-				const shortWorkerId = workerId.slice(workerId.length - 8);
+				const v = formatTimestamp(row.lockedAt) ?? "-";
 				return (
-					<Typography
-						title={workerId}
-						sx={cellSx}
-					>
-						{`...${shortWorkerId}`}
+					<Typography title={v} sx={cellSx}>
+						{v}
 					</Typography>
 				);
 			},
 		},
 	];

+	const isDark = theme.palette.mode === "dark";
+	const runningBg = isDark ? "rgba(19, 113, 91, 0.18)" : "#ECF7F2";
+
 	return (
-		<>
-			<Table
-				headers={headers}
-				data={jobsWithId}
-				getRowSx={(row) => ({
-					...(isRunning(row) && {
-						"& td": { backgroundColor: theme.palette.rowStatus.running },
-					}),
-					...(row.monitorActive === false && {
-						"& td": { backgroundColor: theme.palette.rowStatus.paused },
-					}),
-				})}
-			/>
-			<Pagination
-				component="div"
-				count={count}
-				page={page}
-				rowsPerPage={rowsPerPage}
-				onPageChange={onPageChange}
-				onRowsPerPageChange={onRowsPerPageChange}
-				itemsOnPage={jobs.length}
-			/>
-		</>
+		<Table
+			headers={headers}
+			data={jobsWithId}
+			getRowSx={(row) => ({
+				...(row.lockedAt && {
+					"& td": { backgroundColor: runningBg },
+				}),
+			})}
+		/>
 	);
 };

@@ -1,94 +0,0 @@
-import { Table } from "@/Components/design-elements";
-import { Typography, useTheme } from "@mui/material";
-import { formatTimestamp } from "@/Utils/TimeUtils";
-
-import { useTranslation } from "react-i18next";
-import type { QueueWorker } from "@/Types/Queue";
-import type { Header } from "@/Components/design-elements";
-
-type QueueWorkerWithId = QueueWorker & { id: number };
-
-interface TableWorkersProps {
-	queueWorkers: QueueWorkerWithId[];
-}
-
-export const TableWorkers = ({ queueWorkers }: TableWorkersProps) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-
-	const cellSx = {
-		whiteSpace: "nowrap" as const,
-		overflow: "hidden",
-		textOverflow: "ellipsis",
-		maxWidth: 220,
-	};
-
-	const headers: Header<QueueWorkerWithId>[] = [
-		{
-			id: "host",
-			content: t("pages.logs.table.headers.host"),
-			render: (row) => {
-				const host = row.workerId.split(":")[0];
-				return (
-					<Typography
-						fontFamily={theme.typography.fontFamilyMonospace}
-						sx={cellSx}
-					>
-						{host}
-					</Typography>
-				);
-			},
-		},
-		{
-			id: "processId",
-			content: t("pages.logs.table.headers.processId"),
-			render: (row) => {
-				const processId = row.workerId.split(":")[1];
-				return (
-					<Typography
-						fontFamily={theme.typography.fontFamilyMonospace}
-						sx={cellSx}
-					>
-						{processId}
-					</Typography>
-				);
-			},
-		},
-		{
-			id: "id",
-			content: t("pages.logs.table.headers.workerId"),
-			render: (row) => {
-				const workerId = row.workerId.split(":")[2];
-				const shortWorkerId = workerId.slice(workerId.length - 8);
-				return (
-					<Typography
-						fontFamily={theme.typography.fontFamilyMonospace}
-						title={workerId}
-						sx={cellSx}
-					>
-						{`...${shortWorkerId}`}
-					</Typography>
-				);
-			},
-		},
-		{
-			id: "mode",
-			content: t("pages.logs.table.headers.workerMode"),
-			render: (row) => <Typography sx={cellSx}>{row.mode}</Typography>,
-		},
-		{
-			id: "lastSeen",
-			content: t("pages.logs.table.headers.lastSeenAt"),
-			render: (row) => (
-				<Typography sx={cellSx}>{formatTimestamp(row.lastSeenAt)}</Typography>
-			),
-		},
-	];
-
-	return (
-		<Table
-			headers={headers}
-			data={queueWorkers}
-		/>
-	);
-};
@@ -22,7 +22,6 @@ import type { MaintenanceWindowFormData } from "@/Validation/maintenanceWindow";
 import { repeatOptions, durationUnitOptions } from "@/Validation/maintenanceWindow";
 import { useMaintenanceWindowForm } from "@/Hooks/useMaintenanceWindowForm";
 import { useGet, usePost, usePatch } from "@/Hooks/UseApi";
-import { mutate } from "swr";
 import { useParams, useNavigate } from "react-router-dom";
 import type { Monitor } from "@/Types/Monitor";
 import { useForm, Controller } from "react-hook-form";
@@ -86,6 +85,10 @@ const CreateMaintenanceWindowPage = () => {
 			repeat,
 		};

+		if (repeat === 0) {
+			payload.expiry = endDateTime.toISOString();
+		}
+
 		return payload;
 	};

@@ -100,9 +103,6 @@ const CreateMaintenanceWindowPage = () => {
 		}

 		if (result?.success) {
-			await mutate(
-				(key) => typeof key === "string" && key.startsWith("/maintenance-window")
-			);
 			navigate("/maintenance");
 		}
 	};
@@ -150,8 +150,7 @@ const NotificationsCreatePage = () => {
 			{watchedType !== "matrix" &&
 				watchedType !== "telegram" &&
 				watchedType !== "pushover" &&
-				watchedType !== "twilio" &&
-				watchedType !== "ntfy" && (
+				watchedType !== "twilio" && (
 					<ConfigBox
 						title={addressConfig.title}
 						subtitle={addressConfig.description}
@@ -175,48 +174,6 @@ const NotificationsCreatePage = () => {
 						}
 					/>
 				)}
-			{watchedType === "ntfy" && (
-				<ConfigBox
-					title={t("pages.notifications.form.ntfy.title")}
-					subtitle={t("pages.notifications.form.ntfy.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="address"
-								control={control}
-								defaultValue={"address" in defaults ? defaults.address : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.ntfy.optionServerUrl")}
-										placeholder={t("pages.notifications.form.ntfy.placeholderServerUrl")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="topic"
-								control={control}
-								defaultValue={"topic" in defaults ? defaults.topic : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.ntfy.optionTopic")}
-										placeholder={t("pages.notifications.form.ntfy.placeholderTopic")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
 			{watchedType === "telegram" && (
 				<ConfigBox
 					title={t("pages.notifications.form.telegram.title")}
@@ -1,14 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
-import {
-	Table,
-	Pagination,
-	StatusLabel,
-	StrategyBadge,
-	ColoredLabel,
-} from "@/Components/design-elements";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
+import { Table, Pagination, StatusLabel } from "@/Components/design-elements";
 import { HistogramPageSpeed } from "@/Components/monitors";
 import { ArrowDown, ArrowUp } from "lucide-react";
 import type { Header } from "@/Components/design-elements/Table";
@@ -21,12 +14,10 @@ import { useNavigate } from "react-router-dom";
 import { usePatch } from "@/Hooks/UseApi";

 import type { Monitor, MonitorWithChecks } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
 import type { ActionMenuItem } from "@/Components/actions-menu";

 export const PageSpeedMonitorsTable = ({
 	monitors,
-	tags,
 	refetch,
 	setSelectedMonitor,
 	sortField,
@@ -40,7 +31,6 @@ export const PageSpeedMonitorsTable = ({
 	setRowsPerPage,
 }: {
 	monitors: MonitorWithChecks[];
-	tags: Tag[];
 	refetch: Function;
 	setSelectedMonitor: Function;
 	sortField: string;
@@ -189,19 +179,7 @@ export const PageSpeedMonitorsTable = ({
 					</Stack>
 				),
 				render: (row) => {
-					return (
-						<Stack
-							direction="row"
-							alignItems="center"
-							gap={LAYOUT.XS}
-						>
-							<Typography>{row.name}</Typography>
-							<StrategyBadge
-								strategy={row.strategy}
-								variant="caption"
-							/>
-						</Stack>
-					);
+					return row.name;
 				},
 			},
 			{
@@ -237,32 +215,6 @@ export const PageSpeedMonitorsTable = ({
 					);
 				},
 			},
-			{
-				id: "tags",
-				content: t("common.table.headers.tags"),
-				render: (row) => {
-					if (row.tags.length === 0) return "-";
-					return (
-						<Stack
-							justifyContent={"center"}
-							direction={isSmall ? "column" : "row"}
-							gap={theme.spacing(SPACING.LG)}
-						>
-							{row.tags.map((tagId) => {
-								const fullTag = tags.find((tag) => tag.id === tagId);
-								if (!fullTag) return null;
-								return (
-									<ColoredLabel
-										key={fullTag.id}
-										text={fullTag.name}
-										color={fullTag.color}
-									/>
-								);
-							})}
-						</Stack>
-					);
-				},
-			},

 			{
 				id: "actions",
@@ -1,32 +1,22 @@
 import {
 	MonitorBasePageWithStates,
 	PageSpeedKeyPriorityFallback,
-	ColoredLabel,
 } from "@/Components/design-elements";
-import { Dialog, TextField } from "@/Components/inputs";
+import { Dialog } from "@/Components/inputs";
 import { HeaderCreate } from "@/Components/common";
 import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable";
 import type { Monitor } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import { useTheme } from "@mui/material";
-import { SPACING } from "@/Utils/Theme/constants";

 import { useTranslation } from "react-i18next";
-import { useCallback, useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import { useIsAdmin } from "@/Hooks/useIsAdmin";
 import { useGet, useDelete } from "@/Hooks/UseApi";
-import useDebounce from "@/Hooks/useDebounce";
 import type { MonitorsWithChecksResponse } from "@/Types/Monitor";
 import type { AppSettingsResponse } from "@/Types/Settings";
-import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/monitors";
+import { HeaderMonitorsSummary } from "@/Components/monitors";

 const PageSpeedMonitorsPage = () => {
 	const { t } = useTranslation();
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isAdmin = useIsAdmin();
 	const { deleteFn, loading: isDeleting } = useDelete();

@@ -43,50 +33,17 @@ const PageSpeedMonitorsPage = () => {
 	const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
-	const [selectedTags, setSelectedTags] = useState<string[]>([]);
-	const [selectedStatus, setSelectedStatus] = useState<string>("");
-	const [selectedState, setSelectedState] = useState<string>("");
-	const [search, setSearch] = useState<string>("");
-
-	const debouncedSearch = useDebounce<string>(search, 300);
-
-	// Status: pass "up"/"down" directly to the API
-	// State: "active" -> true, "paused" -> false
-	const toFilterStatus = useMemo(() => {
-		if (selectedStatus === "up") return "up";
-		if (selectedStatus === "down") return "down";
-		return undefined;
-	}, [selectedStatus]);
-
-	const toFilterActive = useMemo(() => {
-		if (selectedState === "active") return "true";
-		if (selectedState === "paused") return "false";
-		return undefined;
-	}, [selectedState]);
-
-	// Priority: status > isActive > search > sort
-	const filterLookup = new Map<string | undefined, string>([
-		[toFilterStatus, "status"],
-		[toFilterActive, "isActive"],
-	]);
-	const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
-	const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
-	const filter = activeFilter?.[0] || debouncedSearch;
-
-	const { data: tags } = useGet<Tag[]>("/tags/team");

 	const monitorsWithChecksUrl = useMemo(() => {
 		const params = new URLSearchParams();
 		params.append("type", "pagespeed");
-		selectedTags.forEach((tagId) => params.append("tags", tagId));
 		params.append("limit", "25");
 		if (page !== undefined) params.append("page", String(page));
 		if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
-		if (filter) params.append("filter", filter);
-		if (field) params.append("field", field);
+		if (sortField) params.append("field", sortField);
 		if (sortOrder) params.append("order", sortOrder);
 		return `/monitors/team/with-checks?${params.toString()}`;
-	}, [page, rowsPerPage, sortOrder, selectedTags, filter, field]);
+	}, [page, rowsPerPage, sortField, sortOrder]);

 	const {
 		data: monitorsData,
@@ -118,28 +75,12 @@ const PageSpeedMonitorsPage = () => {
 		setSelectedMonitor(null);
 	};

-	const handleClearFilters = useCallback(() => {
-		setSelectedStatus("");
-		setSelectedState("");
-		setSelectedTags([]);
-		setSearch("");
-	}, []);
-
-	const hasActiveFilters = Boolean(
-		selectedStatus || selectedState || selectedTags.length > 0 || search
-	);
-
-	const effectiveTotalCount =
-		hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
-			? 1
-			: (summary?.totalMonitors ?? 0);
-
 	return (
 		<MonitorBasePageWithStates
 			headerKey="pageSpeed"
 			loading={isLoading}
 			error={monitorsError || settingsError}
-			totalCount={effectiveTotalCount}
+			totalCount={summary?.totalMonitors ?? 0}
 			page="pageSpeed"
 			actionLink="/pagespeed/create"
 			priorityFallback={showApiKeyWarning ? <PageSpeedKeyPriorityFallback /> : undefined}
@@ -150,59 +91,8 @@ const PageSpeedMonitorsPage = () => {
 				isAdmin={isAdmin}
 			/>
 			<HeaderMonitorsSummary summary={summary} />
-
-			<Stack
-				direction={isSmall ? "column" : "row"}
-				justifyContent={isSmall ? "flex-start" : "space-between"}
-				gap={theme.spacing(4)}
-			>
-				<ControlsFilter
-					showTypes={false}
-					selectedStatus={selectedStatus}
-					setSelectedStatus={setSelectedStatus}
-					selectedState={selectedState}
-					setSelectedState={setSelectedState}
-					tagOptions={tags ?? []}
-					selectedTags={selectedTags}
-					setSelectedTags={setSelectedTags}
-					onClearFilters={handleClearFilters}
-				/>
-				<TextField
-					placeholder={t("pages.uptime.filters.search.placeholder")}
-					value={search}
-					onChange={(event) => {
-						setSearch(event.target.value);
-					}}
-				/>
-			</Stack>
-
-			{selectedTags.length > 0 && (
-				<Stack
-					direction={isSmall ? "column" : "row"}
-					alignItems={isSmall ? "flex-start" : "center"}
-					flexWrap="wrap"
-					gap={theme.spacing(SPACING.XL)}
-				>
-					<Typography color={theme.palette.text.secondary}>
-						{t("pages.uptime.filters.activeTags")}
-					</Typography>
-					{selectedTags.map((tagId) => {
-						const tag = tags?.find((t) => t.id === tagId);
-						if (!tag) return null;
-						return (
-							<ColoredLabel
-								key={tag.id}
-								text={tag.name}
-								color={tag.color}
-							/>
-						);
-					})}
-				</Stack>
-			)}
-
 			<PageSpeedMonitorsTable
 				monitors={monitors || []}
-				tags={tags ?? []}
 				refetch={refetch}
 				setSelectedMonitor={setSelectedMonitor}
 				sortField={sortField}
@@ -3,7 +3,6 @@ import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
 import { HeatmapResponseTime, HistogramResponseTime } from "@/Components/common";
 import type { CheckSnapshot } from "@/Types/Check";
-import { MAX_RECENT_CHECKS } from "@/Types/Monitor";

 interface DummyChartProps {
 	chartType: string;
@@ -11,14 +10,15 @@ interface DummyChartProps {

 const generateDummyChecks = (): CheckSnapshot[] => {
 	const checks: CheckSnapshot[] = [];
-	for (let i = 0; i < MAX_RECENT_CHECKS; i++) {
+	for (let i = 0; i < 25; i++) {
 		const isUp = Math.random() > 0.1;
-		const responseTime = Math.floor(Math.random() * 800) + 20;
+		const responseTime = Math.floor(Math.random() * 80) + 20;
 		checks.push({
 			id: `dummy-${i}`,
 			status: isUp,
 			statusCode: isUp ? 200 : 500,
 			responseTime: responseTime,
+			originalResponseTime: responseTime,
 			message: "",
 			createdAt: new Date(Date.now() - i * 60000).toISOString(),
 		});
@@ -1,4 +1,4 @@
-import { BasePage, ConfigBox, StepProgress } from "@/Components/design-elements";
+import { BasePage, ConfigBox } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import { logger } from "@/Utils/logger";
 import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
@@ -26,14 +26,12 @@ import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useStatusPageForm } from "@/Hooks/useStatusPageForm";
 import type { StatusPageFormData } from "@/Validation/statusPage";
-import { statusPageStepCount, statusPageStepFieldsFor } from "@/Validation/statusPage";
 import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
 import type { Monitor } from "@/Types/Monitor";
 import type { MonitorDisplayType, StatusPageResponse } from "@/Types/StatusPage";
 import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import timezones from "@/Utils/timezones.json";
 import { useNavigate, useParams } from "react-router-dom";
-import { mutate } from "swr";
 import axios from "axios";
 import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";
 import { ThemePicker } from "./Components/ThemePicker";
@@ -51,9 +49,6 @@ interface TimezoneOption {
 	name: string;
 }

-const buildStatusPageKey = (slug: string | null | undefined) =>
-	slug ? `/status-page/${slug}?type=uptime&type=infrastructure` : null;
-
 const CreateStatusPage = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -64,7 +59,9 @@ const CreateStatusPage = () => {

 	// Fetch existing status page data when configuring
 	const { data: statusPageData, isLoading: isLoadingStatusPage } =
-		useGet<StatusPageResponse>(isCreate ? null : buildStatusPageKey(url));
+		useGet<StatusPageResponse>(
+			isCreate ? null : `/status-page/${url}?type=uptime&type=infrastructure`
+		);

 	const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
 	const monitors = monitorsResponse ?? [];
@@ -87,27 +84,13 @@ const CreateStatusPage = () => {
 		defaultValues: defaults,
 	});

-	const { control, reset, handleSubmit, trigger } = form;
+	const { control, reset, handleSubmit } = form;

 	// Reset form when defaults change (from fetched data)
 	useEffect(() => {
 		reset(defaults);
 	}, [defaults, reset]);

-	// Multi-step wizard, create only. The configure (edit) flow keeps the flat
-	// form, where showStep() is always true.
-	const [currentStep, setCurrentStep] = useState(0);
-	const showStep = (step: number) => !isCreate || currentStep === step;
-	const totalSteps = statusPageStepCount();
-
-	const handleNext = async () => {
-		const isValid = await trigger(statusPageStepFieldsFor(currentStep));
-		if (isValid) {
-			setCurrentStep((step) => step + 1);
-		}
-	};
-	const handleBack = () => setCurrentStep((step) => step - 1);
-
 	const watchedMonitorIds: string[] = form.watch("monitors") ?? [];
 	const computedTypes: MonitorDisplayType[] = useMemo(() => {
 		const selectedMonitors = (watchedMonitorIds ?? [])
@@ -151,18 +134,12 @@ const CreateStatusPage = () => {
 		fd.append("isPublished", String(data.isPublished));
 		if (data.companyName) fd.append("companyName", data.companyName);
 		if (data.url) fd.append("url", data.url);
-		if (data.customDomain !== undefined && data.customDomain !== null) {
-			fd.append("customDomain", data.customDomain);
-		} else {
-			fd.append("customDomain", "");
-		}
 		if (data.timezone) fd.append("timezone", data.timezone);
 		if (data.color) fd.append("color", data.color);
 		fd.append("showCharts", String(data.showCharts));
 		fd.append("showUptimePercentage", String(data.showUptimePercentage));
 		fd.append("showAdminLoginLink", String(data.showAdminLoginLink));
 		fd.append("showInfrastructure", String(data.showInfrastructure));
-		fd.append("customCSS", data.customCSS ?? "");
 		if (data.theme) fd.append("theme", data.theme);
 		if (data.themeMode) fd.append("themeMode", data.themeMode);

@@ -204,10 +181,6 @@ const CreateStatusPage = () => {
 		}

 		if (result) {
-			await mutate(buildStatusPageKey(data.url));
-			if (!isCreate && url !== data.url) {
-				await mutate(buildStatusPageKey(url));
-			}
 			navigate(`/status/${data.url}`);
 		}
 	};
@@ -221,382 +194,315 @@ const CreateStatusPage = () => {
 			onSubmit={handleSubmit(onSubmit, onError)}
 		>
 			{!isCreate && <HeaderConfigStatusControls onDelete={handleDeleteClick} />}
-			{isCreate && (
-				<StepProgress
-					steps={totalSteps}
-					current={currentStep}
-				/>
-			)}
-			{showStep(0) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.access.title")}
-					subtitle={t("pages.statusPages.form.access.description")}
-					rightContent={
-						<Stack
-							direction="row"
-							alignItems="center"
-							spacing={theme.spacing(SPACING.MD)}
-						>
-							<Controller
-								name="isPublished"
-								control={control}
-								render={({ field }) => (
-									<SwitchComponent
-										checked={field.value ?? false}
-										onChange={(e) => field.onChange(e.target.checked)}
-									/>
-								)}
-							/>
-							<Typography>
-								{t("pages.statusPages.form.access.option.published.name")}
-							</Typography>
-						</Stack>
-					}
-				/>
-			)}
-			{showStep(0) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.basicInfo.title")}
-					subtitle={t("pages.statusPages.form.basicInfo.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(LAYOUT.MD)}>
-							<Controller
-								name="companyName"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										fieldLabel={t("pages.statusPages.form.basicInfo.option.name.label")}
-										placeholder={t(
-											"pages.statusPages.form.basicInfo.option.name.placeholder"
-										)}
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message}
-									/>
-								)}
-							/>
-							<Controller
-								name="url"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										fieldLabel={t("pages.statusPages.form.basicInfo.option.url.label")}
-										placeholder={t(
-											"pages.statusPages.form.basicInfo.option.url.placeholder"
-										)}
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message}
-									/>
-								)}
-							/>
-							<Controller
-								name="customDomain"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										value={field.value ?? ""}
-										fieldLabel={t(
-											"pages.statusPages.form.basicInfo.option.customDomain.label"
-										)}
-										placeholder={t(
-											"pages.statusPages.form.basicInfo.option.customDomain.placeholder"
-										)}
-										helperText={
-											fieldState.error?.message ||
-											t("pages.statusPages.form.basicInfo.option.customDomain.helper")
-										}
-										error={!!fieldState.error}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-			{showStep(0) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.monitors.title")}
-					subtitle={t("pages.statusPages.form.monitors.description")}
-					rightContent={
+			<ConfigBox
+				title={t("pages.statusPages.form.access.title")}
+				subtitle={t("pages.statusPages.form.access.description")}
+				rightContent={
+					<Stack
+						direction="row"
+						alignItems="center"
+						spacing={theme.spacing(SPACING.MD)}
+					>
 						<Controller
-							name="monitors"
-							control={control}
-							render={({ field, fieldState }) => {
-								const selectedMonitors = field.value
-									.map((id: string) => monitors.find((m) => m.id === id))
-									.filter((m): m is Monitor => m !== undefined);
-
-								const handleDragEnd = (result: DropResult) => {
-									if (!result.destination) return;
-									const reordered = Array.from(field.value);
-									const [removed] = reordered.splice(result.source.index, 1);
-									reordered.splice(result.destination.index, 0, removed);
-									field.onChange(reordered);
-								};
-
-								return (
-									<Stack spacing={theme.spacing(LAYOUT.MD)}>
-										<Autocomplete
-											multiple
-											options={monitors}
-											getOptionLabel={(option: Monitor) => option.name}
-											value={selectedMonitors}
-											onChange={(_, newValue) => {
-												field.onChange(newValue.map((m: Monitor) => m.id));
-											}}
-											fieldLabel={t(
-												"pages.statusPages.form.monitors.option.monitors.label"
-											)}
-											renderInput={(params) => (
-												<TextField
-													{...params}
-													placeholder={
-														selectedMonitors.length === 0
-															? t(
-																	"pages.statusPages.form.monitors.option.monitors.placeholder"
-																)
-															: ""
-													}
-													error={!!fieldState.error}
-													helperText={fieldState.error?.message}
-												/>
-											)}
-										/>
-										{selectedMonitors.length > 0 && (
-											<DragDropContext onDragEnd={handleDragEnd}>
-												<Droppable droppableId="monitors-list">
-													{(provided) => (
-														<Stack
-															{...provided.droppableProps}
-															ref={provided.innerRef}
-														>
-															{selectedMonitors.map((monitor, index) => (
-																<Draggable
-																	key={monitor.id}
-																	draggableId={monitor.id}
-																	index={index}
-																>
-																	{(provided) => (
-																		<Stack
-																			ref={provided.innerRef}
-																			{...provided.draggableProps}
-																			{...provided.dragHandleProps}
-																			direction="row"
-																			alignItems="center"
-																			spacing={theme.spacing(LAYOUT.XS)}
-																			padding={theme.spacing(LAYOUT.XS)}
-																			marginTop={theme.spacing(SPACING.LG)}
-																			borderRadius={1}
-																			sx={{
-																				border: `1px solid ${theme.palette.divider}`,
-																				cursor: "grab",
-																				"&:active": { cursor: "grabbing" },
-																			}}
-																		>
-																			<GripVertical size={20} />
-																			<Typography
-																				flexGrow={1}
-																			>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
-																			<IconButton
-																				size="small"
-																				onClick={() => {
-																					field.onChange(
-																						field.value.filter(
-																							(id: string) => id !== monitor.id
-																						)
-																					);
-																				}}
-																				aria-label="Remove monitor"
-																			>
-																				<Trash2 size={16} />
-																			</IconButton>
-																		</Stack>
-																	)}
-																</Draggable>
-															))}
-															{provided.placeholder}
-														</Stack>
-													)}
-												</Droppable>
-											</DragDropContext>
-										)}
-									</Stack>
-								);
-							}}
-						/>
-					}
-				/>
-			)}
-			{showStep(0) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.timezone.title")}
-					subtitle={t("pages.statusPages.form.timezone.description")}
-					rightContent={
-						<Controller
-							name="timezone"
+							name="isPublished"
 							control={control}
 							render={({ field }) => (
-								<Autocomplete
-									options={timezones}
-									getOptionLabel={(option: TimezoneOption) => option.name}
-									value={
-										timezones.find((tz: TimezoneOption) => tz._id === field.value) ?? null
-									}
-									onChange={(_, newValue: TimezoneOption | null) => {
-										field.onChange(newValue?._id ?? "");
-									}}
-									fieldLabel={t("pages.statusPages.form.timezone.option.timezone.label")}
-									renderInput={(params) => (
-										<TextField
-											{...params}
-											placeholder={t(
-												"pages.statusPages.form.timezone.option.timezone.placeholder"
-											)}
-										/>
-									)}
+								<SwitchComponent
+									checked={field.value ?? false}
+									onChange={(e) => field.onChange(e.target.checked)}
 								/>
 							)}
 						/>
-					}
-				/>
-			)}
-			{showStep(1) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.appearance.title")}
-					subtitle={t("pages.statusPages.form.appearance.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(LAYOUT.MD)}>
-							<Stack alignItems={"center"}>
-								<Controller
-									name="logo"
-									control={control}
-									render={({ field }) => (
-										<ImageUpload
-											src={field.value?.data}
-											onChange={(file) => {
-												if (file) {
-													field.onChange({
-														data: file.src,
-														contentType: file.file.type,
-													});
-												} else {
-													field.onChange(null);
-												}
-											}}
-										/>
-									)}
-								/>
-							</Stack>
-							<Controller
-								name="color"
-								control={control}
-								render={({ field }) => (
-									<ColorInput
-										format="hex"
-										value={field.value}
-										onChange={field.onChange}
-										fieldLabel={t("pages.statusPages.form.appearance.option.color.label")}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-			{showStep(1) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.theme.title")}
-					subtitle={t("pages.statusPages.form.theme.description")}
-					rightContent={
+						<Typography>
+							{t("pages.statusPages.form.access.option.published.name")}
+						</Typography>
+					</Stack>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.statusPages.form.basicInfo.title")}
+				subtitle={t("pages.statusPages.form.basicInfo.description")}
+				rightContent={
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
-							name="theme"
-							control={control}
-							render={({ field: themeField }) => (
-								<Controller
-									name="themeMode"
-									control={control}
-									render={({ field: modeField }) => (
-										<ThemePicker
-											theme={themeField.value ?? "refined"}
-											themeMode={modeField.value ?? "auto"}
-											onThemeChange={themeField.onChange}
-											onThemeModeChange={modeField.onChange}
-										/>
-									)}
-								/>
-							)}
-						/>
-					}
-				/>
-			)}
-			{showStep(1) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.customCSS.title")}
-					subtitle={t("pages.statusPages.form.customCSS.description")}
-					rightContent={
-						<Controller
-							name="customCSS"
+							name="companyName"
 							control={control}
 							render={({ field, fieldState }) => (
 								<TextField
 									{...field}
-									multiline
-									rows={8}
-									fieldLabel={t(
-										"pages.statusPages.form.customCSS.option.customCSS.label"
-									)}
+									fieldLabel={t("pages.statusPages.form.basicInfo.option.name.label")}
 									placeholder={t(
-										"pages.statusPages.form.customCSS.option.customCSS.placeholder"
+										"pages.statusPages.form.basicInfo.option.name.placeholder"
 									)}
 									error={!!fieldState.error}
 									helperText={fieldState.error?.message}
 								/>
 							)}
 						/>
-					}
-				/>
-			)}
-			{showStep(1) && (
-				<ConfigBox
-					title={t("pages.statusPages.form.features.title")}
-					subtitle={t("pages.statusPages.form.features.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(LAYOUT.MD)}>
-							<Controller
-								name="showCharts"
-								control={control}
-								render={({ field }) => (
-									<FormControlLabel
-										control={
-											<Checkbox
-												checked={field.value}
-												onChange={field.onChange}
+						<Controller
+							name="url"
+							control={control}
+							render={({ field, fieldState }) => (
+								<TextField
+									{...field}
+									fieldLabel={t("pages.statusPages.form.basicInfo.option.url.label")}
+									placeholder={t(
+										"pages.statusPages.form.basicInfo.option.url.placeholder"
+									)}
+									error={!!fieldState.error}
+									helperText={fieldState.error?.message}
+								/>
+							)}
+						/>
+					</Stack>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.statusPages.form.monitors.title")}
+				subtitle={t("pages.statusPages.form.monitors.description")}
+				rightContent={
+					<Controller
+						name="monitors"
+						control={control}
+						render={({ field, fieldState }) => {
+							const selectedMonitors = field.value
+								.map((id: string) => monitors.find((m) => m.id === id))
+								.filter((m): m is Monitor => m !== undefined);
+
+							const handleDragEnd = (result: DropResult) => {
+								if (!result.destination) return;
+								const reordered = Array.from(field.value);
+								const [removed] = reordered.splice(result.source.index, 1);
+								reordered.splice(result.destination.index, 0, removed);
+								field.onChange(reordered);
+							};
+
+							return (
+								<Stack spacing={theme.spacing(LAYOUT.MD)}>
+									<Autocomplete
+										multiple
+										options={monitors}
+										getOptionLabel={(option: Monitor) => option.name}
+										value={selectedMonitors}
+										onChange={(_, newValue) => {
+											field.onChange(newValue.map((m: Monitor) => m.id));
+										}}
+										fieldLabel={t(
+											"pages.statusPages.form.monitors.option.monitors.label"
+										)}
+										renderInput={(params) => (
+											<TextField
+												{...params}
+												placeholder={
+													selectedMonitors.length === 0
+														? t(
+																"pages.statusPages.form.monitors.option.monitors.placeholder"
+															)
+														: ""
+												}
+												error={!!fieldState.error}
+												helperText={fieldState.error?.message}
 											/>
-										}
-										label={t("pages.statusPages.form.features.option.showCharts.label")}
+										)}
 									/>
-								)}
-							/>
-							<Controller
-								name="showInfrastructure"
-								control={control}
-								render={({ field }) => (
-									<FormControlLabel
-										control={
-											<Checkbox
-												checked={field.value}
-												onChange={field.onChange}
-											/>
-										}
-										label={t(
-											"pages.statusPages.form.features.option.showInfrastructure.label"
+									{selectedMonitors.length > 0 && (
+										<DragDropContext onDragEnd={handleDragEnd}>
+											<Droppable droppableId="monitors-list">
+												{(provided) => (
+													<Stack
+														{...provided.droppableProps}
+														ref={provided.innerRef}
+													>
+														{selectedMonitors.map((monitor, index) => (
+															<Draggable
+																key={monitor.id}
+																draggableId={monitor.id}
+																index={index}
+															>
+																{(provided) => (
+																	<Stack
+																		ref={provided.innerRef}
+																		{...provided.draggableProps}
+																		{...provided.dragHandleProps}
+																		direction="row"
+																		alignItems="center"
+																		spacing={theme.spacing(LAYOUT.XS)}
+																		padding={theme.spacing(LAYOUT.XS)}
+																		marginTop={theme.spacing(SPACING.LG)}
+																		borderRadius={1}
+																		sx={{
+																			border: `1px solid ${theme.palette.divider}`,
+																			cursor: "grab",
+																			"&:active": { cursor: "grabbing" },
+																		}}
+																	>
+																		<GripVertical size={20} />
+																		<Typography
+																			flexGrow={1}
+																		>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
+																		<IconButton
+																			size="small"
+																			onClick={() => {
+																				field.onChange(
+																					field.value.filter(
+																						(id: string) => id !== monitor.id
+																					)
+																				);
+																			}}
+																			aria-label="Remove monitor"
+																		>
+																			<Trash2 size={16} />
+																		</IconButton>
+																	</Stack>
+																)}
+															</Draggable>
+														))}
+														{provided.placeholder}
+													</Stack>
+												)}
+											</Droppable>
+										</DragDropContext>
+									)}
+								</Stack>
+							);
+						}}
+					/>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.statusPages.form.timezone.title")}
+				subtitle={t("pages.statusPages.form.timezone.description")}
+				rightContent={
+					<Controller
+						name="timezone"
+						control={control}
+						render={({ field }) => (
+							<Autocomplete
+								options={timezones}
+								getOptionLabel={(option: TimezoneOption) => option.name}
+								value={
+									timezones.find((tz: TimezoneOption) => tz._id === field.value) ?? null
+								}
+								onChange={(_, newValue: TimezoneOption | null) => {
+									field.onChange(newValue?._id ?? "");
+								}}
+								fieldLabel={t("pages.statusPages.form.timezone.option.timezone.label")}
+								renderInput={(params) => (
+									<TextField
+										{...params}
+										placeholder={t(
+											"pages.statusPages.form.timezone.option.timezone.placeholder"
 										)}
 									/>
 								)}
 							/>
-							{/* <Controller
+						)}
+					/>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.statusPages.form.appearance.title")}
+				subtitle={t("pages.statusPages.form.appearance.description")}
+				rightContent={
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
+						<Stack alignItems={"center"}>
+							<Controller
+								name="logo"
+								control={control}
+								render={({ field }) => (
+									<ImageUpload
+										src={field.value?.data}
+										onChange={(file) => {
+											if (file) {
+												field.onChange({
+													data: file.src,
+													contentType: file.file.type,
+												});
+											} else {
+												field.onChange(null);
+											}
+										}}
+									/>
+								)}
+							/>
+						</Stack>
+						<Controller
+							name="color"
+							control={control}
+							render={({ field }) => (
+								<ColorInput
+									format="hex"
+									value={field.value}
+									onChange={field.onChange}
+									fieldLabel={t("pages.statusPages.form.appearance.option.color.label")}
+								/>
+							)}
+						/>
+					</Stack>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.statusPages.form.theme.title")}
+				subtitle={t("pages.statusPages.form.theme.description")}
+				rightContent={
+					<Controller
+						name="theme"
+						control={control}
+						render={({ field: themeField }) => (
+							<Controller
+								name="themeMode"
+								control={control}
+								render={({ field: modeField }) => (
+									<ThemePicker
+										theme={themeField.value ?? "refined"}
+										themeMode={modeField.value ?? "auto"}
+										onThemeChange={themeField.onChange}
+										onThemeModeChange={modeField.onChange}
+									/>
+								)}
+							/>
+						)}
+					/>
+				}
+			/>
+			<ConfigBox
+				title={t("pages.statusPages.form.features.title")}
+				subtitle={t("pages.statusPages.form.features.description")}
+				rightContent={
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
+						<Controller
+							name="showCharts"
+							control={control}
+							render={({ field }) => (
+								<FormControlLabel
+									control={
+										<Checkbox
+											checked={field.value}
+											onChange={field.onChange}
+										/>
+									}
+									label={t("pages.statusPages.form.features.option.showCharts.label")}
+								/>
+							)}
+						/>
+						<Controller
+							name="showInfrastructure"
+							control={control}
+							render={({ field }) => (
+								<FormControlLabel
+									control={
+										<Checkbox
+											checked={field.value}
+											onChange={field.onChange}
+										/>
+									}
+									label={t(
+										"pages.statusPages.form.features.option.showInfrastructure.label"
+									)}
+								/>
+							)}
+						/>
+						{/* <Controller
 							name="showUptimePercentage"
 							control={control}
 							render={({ field }) => (
@@ -630,46 +536,21 @@ const CreateStatusPage = () => {
 								/>
 							)}
 						/> */}
-						</Stack>
-					}
-				/>
-			)}
+					</Stack>
+				}
+			/>
 			<Stack
 				direction="row"
-				justifyContent={isCreate ? "space-between" : "flex-end"}
+				justifyContent="flex-end"
 			>
-				{isCreate && (
-					<Button
-						type="button"
-						variant="outlined"
-						color="secondary"
-						disabled={currentStep === 0}
-						onClick={handleBack}
-					>
-						{t("common.buttons.back")}
-					</Button>
-				)}
-				{isCreate && currentStep < totalSteps - 1 ? (
-					<Button
-						key="wizard-next"
-						type="button"
-						variant="contained"
-						color="primary"
-						onClick={handleNext}
-					>
-						{t("common.buttons.next")}
-					</Button>
-				) : (
-					<Button
-						key="wizard-save"
-						loading={isSubmitting}
-						type="submit"
-						variant="contained"
-						color="primary"
-					>
-						{t("common.buttons.save")}
-					</Button>
-				)}
+				<Button
+					loading={isSubmitting}
+					type="submit"
+					variant="contained"
+					color="primary"
+				>
+					{t("common.buttons.save")}
+				</Button>
 			</Stack>
 			<Dialog
 				open={isDeleteDialogOpen}
@@ -8,8 +8,7 @@ import { Settings, ExternalLink } from "lucide-react";
 import { useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
-import { type StatusPage } from "@/Types/StatusPage";
-import { getStatusPagePublicUrl } from "@/Utils/statusPageUrl";
+import { PUBLIC_STATUS_PAGE_PREFIX, type StatusPage } from "@/Types/StatusPage";

 interface HeaderStatusPageControlsProps {
 	isAdmin: boolean;
@@ -51,7 +50,7 @@ export const HeaderStatusPageControls = ({
 						<Typography
 							onClick={() => {
 								window.open(
-									getStatusPagePublicUrl(statusPage),
+									`${PUBLIC_STATUS_PAGE_PREFIX}/${statusPage.url}`,
 									"_blank",
 									"noopener,noreferrer"
 								);
@@ -2,76 +2,41 @@ import { BasePage, BaseFallback } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 import { Link } from "react-router-dom";
 import Stack from "@mui/material/Stack";
-import Box from "@mui/material/Box";

 import { useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { useIsAdmin } from "@/Hooks/useIsAdmin";
 import { useLocation, useParams } from "react-router-dom";
 import { useGet } from "@/Hooks/UseApi";
+import type { Monitor } from "@/Types/Monitor";
 import { resolveStatusPageTheme } from "@/Types/StatusPage";
 import {
 	PUBLIC_STATUS_PAGE_PREFIX,
+	type StatusPage,
 	type StatusPageResponse,
 	type StatusPageTheme,
 } from "@/Types/StatusPage";
-import {
-	buildStatusPageApiPath,
-	getStatusPagePreviewUrl,
-	getStatusPagePublicUrl,
-	isCustomDomainHost,
-} from "@/Utils/statusPageUrl";
-import { cssReferencesExternalResource } from "@/Utils/customCss";
-import { HeaderStatusPageControls } from "@/Pages/StatusPage/Status/Components/HeaderStatusPageControls";
-import { StatusPageThemeProvider } from "@/Pages/StatusPage/Status/themes/StatusPageThemeProvider";
-import {
-	BaseStatusPage,
-	type ThemeConfig,
-} from "@/Pages/StatusPage/Status/themes/shared/BaseStatusPage";
-import { BrowserFrame } from "@/Pages/StatusPage/Status/themes/BrowserFrame";
-import { refinedStyles } from "@/Pages/StatusPage/Status/themes/refined/styles";
-import { RefinedHeader } from "@/Pages/StatusPage/Status/themes/refined/RefinedHeader";
-import { RefinedHero } from "@/Pages/StatusPage/Status/themes/refined/RefinedHero";
-import { modernStyles } from "@/Pages/StatusPage/Status/themes/modern/styles";
-import { ModernHeader } from "@/Pages/StatusPage/Status/themes/modern/ModernHeader";
-import { ModernHero } from "@/Pages/StatusPage/Status/themes/modern/ModernHero";
-import { boldStyles } from "@/Pages/StatusPage/Status/themes/bold/styles";
-import { BoldHeader } from "@/Pages/StatusPage/Status/themes/bold/BoldHeader";
-import { BoldHero } from "@/Pages/StatusPage/Status/themes/bold/BoldHero";
-import { editorialStyles } from "@/Pages/StatusPage/Status/themes/editorial/styles";
-import { EditorialHeader } from "@/Pages/StatusPage/Status/themes/editorial/EditorialHeader";
-import { EditorialHero } from "@/Pages/StatusPage/Status/themes/editorial/EditorialHero";
-import { minimalStyles } from "@/Pages/StatusPage/Status/themes/minimal/styles";
+import { HeaderStatusPageControls } from "./Components/HeaderStatusPageControls";
+import { StatusPageThemeProvider } from "./themes/StatusPageThemeProvider";
+import { RefinedStatusPage } from "./themes/refined/RefinedStatusPage";
+import { ModernStatusPage } from "./themes/modern/ModernStatusPage";
+import { BoldStatusPage } from "./themes/bold/BoldStatusPage";
+import { EditorialStatusPage } from "./themes/editorial/EditorialStatusPage";
+import { BrowserFrame } from "./themes/BrowserFrame";

-const THEME_CONFIGS: Record<StatusPageTheme, ThemeConfig<any>> = {
-	refined: {
-		createStyles: refinedStyles,
-		HeaderSlot: RefinedHeader,
-		HeroSlot: RefinedHero,
-	},
-	modern: {
-		createStyles: modernStyles,
-		HeaderSlot: ModernHeader,
-		HeroSlot: ModernHero,
-		overallStatusOptions: { iconSize: 20 },
-	},
-	bold: {
-		createStyles: boldStyles,
-		HeaderSlot: BoldHeader,
-		HeroSlot: BoldHero,
-		overallStatusOptions: { iconSize: 18 },
-	},
-	editorial: {
-		createStyles: editorialStyles,
-		HeaderSlot: EditorialHeader,
-		HeroSlot: EditorialHero,
-		overallStatusOptions: { allUpKey: "pages.statusPages.editorial.allUp" },
-	},
-	minimal: {
-		createStyles: minimalStyles,
-		HeaderSlot: RefinedHeader,
-		HeroSlot: RefinedHero,
-	},
+type ThemedRendererProps = {
+	statusPage: StatusPage;
+	monitors: (Monitor & { checks?: Monitor["recentChecks"] })[];
+};
+
+const THEMED_RENDERERS: Record<
+	StatusPageTheme,
+	React.ComponentType<ThemedRendererProps>
+> = {
+	refined: RefinedStatusPage,
+	modern: ModernStatusPage,
+	bold: BoldStatusPage,
+	editorial: EditorialStatusPage,
 };

 const StatusPageView = () => {
@@ -81,14 +46,9 @@ const StatusPageView = () => {
 	const isAdmin = useIsAdmin();
 	const location = useLocation();

-	const onCustomDomainHost = isCustomDomainHost();
-	const isPublic =
-		onCustomDomainHost || location.pathname.startsWith(PUBLIC_STATUS_PAGE_PREFIX);
+	const isPublic = location.pathname.startsWith(PUBLIC_STATUS_PAGE_PREFIX);

-	const apiUrl = buildStatusPageApiPath({
-		url,
-		useCustomDomain: onCustomDomainHost,
-	});
+	const apiUrl = url ? `/status-page/${url}?type=uptime&type=infrastructure` : null;

 	const { data, isLoading, error } = useGet<StatusPageResponse>(
 		apiUrl,
@@ -130,33 +90,28 @@ const StatusPageView = () => {
 		);
 	}

+	const ThemedRenderer = THEMED_RENDERERS[resolveStatusPageTheme(statusPage.theme)];
+	const themedRenderer = (
+		<ThemedRenderer
+			statusPage={statusPage}
+			monitors={monitors}
+		/>
+	);
+
 	// Public route: render directly on the viewport, themed background covers everything.
 	if (isPublic) {
-		const themeConfig = THEME_CONFIGS[resolveStatusPageTheme(statusPage.theme)];
-		const customCss =
-			statusPage.customCSS && !cssReferencesExternalResource(statusPage.customCSS)
-				? statusPage.customCSS
-				: "";
 		return (
 			<StatusPageThemeProvider
 				theme={statusPage.theme}
 				themeMode={statusPage.themeMode}
-				timezone={statusPage.timezone}
-				brandColor={statusPage.color}
 				paintBody
 			>
-				{customCss && <style>{customCss}</style>}
-				<BaseStatusPage
-					statusPage={statusPage}
-					monitors={monitors}
-					config={themeConfig}
-				/>
+				{themedRenderer}
 			</StatusPageThemeProvider>
 		);
 	}

-	const publicUrl = getStatusPagePublicUrl(statusPage);
-	const previewUrl = getStatusPagePreviewUrl(statusPage);
+	const publicUrl = `${window.location.origin}${PUBLIC_STATUS_PAGE_PREFIX}/${statusPage.url}`;
 	return (
 		<BasePage
 			loading={isLoading}
@@ -172,19 +127,9 @@ const StatusPageView = () => {
 			<StatusPageThemeProvider
 				theme={statusPage.theme}
 				themeMode={statusPage.themeMode}
-				timezone={statusPage.timezone}
 				transparent
 			>
-				<BrowserFrame url={publicUrl}>
-					<Box
-						component="iframe"
-						src={previewUrl}
-						title={t("pages.statusPages.preview.title")}
-						flex={1}
-						width="100%"
-						border={0}
-					/>
-				</BrowserFrame>
+				<BrowserFrame url={publicUrl}>{themedRenderer}</BrowserFrame>
 			</StatusPageThemeProvider>
 		</BasePage>
 	);
@@ -64,13 +64,7 @@ export const BrowserFrame = ({ url, children }: Props) => {
 					{url}
 				</Box>
 			</Box>
-			<Box
-				display="flex"
-				flexDirection="column"
-				sx={{ flex: 1, minHeight: 0 }}
-			>
-				{children}
-			</Box>
+			<Box sx={{ flex: 1, minHeight: 0 }}>{children}</Box>
 		</Box>
 	);
 };
@@ -6,7 +6,6 @@ import {
 	useState,
 	type ReactNode,
 } from "react";
-import { alpha, darken } from "@mui/material/styles";
 import {
 	DEFAULT_STATUS_PAGE_THEME,
 	resolveStatusPageTheme,
@@ -14,7 +13,6 @@ import {
 	type StatusPageTheme,
 	type StatusPageThemeMode,
 } from "@/Types/StatusPage";
-import { resolveTimezone } from "@/Utils/TimeUtils";
 import { themeTokens, type StatusPageThemeTokens } from "./tokens";

 type ResolvedMode = "light" | "dark";
@@ -23,7 +21,6 @@ interface StatusPageThemeContextValue {
 	theme: StatusPageTheme;
 	mode: ResolvedMode;
 	tokens: StatusPageThemeTokens;
-	timezone: string;
 }

 const StatusPageThemeContext = createContext<StatusPageThemeContextValue | null>(null);
@@ -36,16 +33,6 @@ const resolveSystemMode = (): ResolvedMode => {
 interface Props {
 	theme?: StatusPageTheme;
 	themeMode?: StatusPageThemeMode;
-	timezone?: string;
-	/**
-	 * Brand color picked in the status-page appearance settings. When
-	 * provided, it feeds `tokens.brand` / `brandStrong` / `brandSoft`,
-	 * which theme styles use for accent surfaces (hero, active tabs,
-	 * links). It does NOT recolor the semantic `up`/OK status color, so
-	 * a red or orange brand cannot make the "all operational" indicator
-	 * signal downtime.
-	 */
-	brandColor?: string;
 	/**
 	 * When true, paint the document body with the theme background so it
 	 * covers beyond the provider's wrapper (useful on the public route
@@ -64,39 +51,15 @@ interface Props {
 	children: ReactNode;
 }

-const HEX_COLOR = /^#([0-9a-f]{3}|[0-9a-f]{6})$/i;
-
-// Resolve the brand triple that theme styles read from. A customer's
-// picked color (when valid) overrides the theme's default; otherwise
-// the theme's own `brand*` values win, and finally we fall back to the
-// `up*` triple so unmigrated theme styles have something to consume.
-const resolveBrandTokens = (
-	tokens: StatusPageThemeTokens,
-	brandColor: string | undefined
-): StatusPageThemeTokens => {
-	const validOverride = brandColor && HEX_COLOR.test(brandColor) ? brandColor : undefined;
-	const brand = validOverride ?? tokens.brand ?? tokens.up;
-	const brandStrong = validOverride
-		? darken(validOverride, 0.2)
-		: (tokens.brandStrong ?? tokens.upStrong);
-	const brandSoft = validOverride
-		? alpha(validOverride, 0.15)
-		: (tokens.brandSoft ?? tokens.upSoft);
-	return { ...tokens, brand, brandStrong, brandSoft };
-};
-
 export const StatusPageThemeProvider = ({
 	theme,
 	themeMode,
-	timezone,
-	brandColor,
 	paintBody = false,
 	transparent = false,
 	children,
 }: Props) => {
 	const resolvedTheme = resolveStatusPageTheme(theme);
 	const resolvedThemeMode = resolveStatusPageThemeMode(themeMode);
-	const resolvedTimezone = resolveTimezone(timezone);

 	const [systemMode, setSystemMode] = useState<ResolvedMode>(resolveSystemMode);

@@ -141,20 +104,11 @@ export const StatusPageThemeProvider = ({

 	const resolvedMode: ResolvedMode =
 		resolvedThemeMode === "auto" ? systemMode : resolvedThemeMode;
-	const baseTokens = themeTokens[resolvedTheme][resolvedMode];
-	const tokens = useMemo(
-		() => resolveBrandTokens(baseTokens, brandColor),
-		[baseTokens, brandColor]
-	);
+	const tokens = themeTokens[resolvedTheme][resolvedMode];

 	const value = useMemo(
-		() => ({
-			theme: resolvedTheme,
-			mode: resolvedMode,
-			tokens,
-			timezone: resolvedTimezone,
-		}),
-		[resolvedTheme, resolvedMode, tokens, resolvedTimezone]
+		() => ({ theme: resolvedTheme, mode: resolvedMode, tokens }),
+		[resolvedTheme, resolvedMode, tokens]
 	);

 	return (
@@ -182,7 +136,6 @@ export const useStatusPageTheme = (): StatusPageThemeContextValue => {
 			theme: DEFAULT_STATUS_PAGE_THEME,
 			mode: resolveSystemMode(),
 			tokens: themeTokens[DEFAULT_STATUS_PAGE_THEME][resolveSystemMode()],
-			timezone: resolveTimezone(),
 		};
 	}
 	return ctx;