chore(deps): update node.js to v24.14.0

2026-02-26 00:08:59 +00:00
82 changed files with 13841 additions and 5395 deletions
--- a/.gitea/workflows/release-image-gitea.yml
+++ b/.gitea/workflows/release-image-gitea.yml
@@ -0,0 +1,143 @@
+name: release-image-gitea
+
+on:
+  push:
+    tags:
+      - 2.*
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.x
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24.13.1
+          cache: pnpm
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Lint Code
+        run: pnpm lint
+
+      - name: Build Project
+        run: pnpm build
+
+  release:
+    runs-on: ubuntu-js
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.REPOSITORY_HOST }}
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.REPOSITORY_TOKEN }}
+
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.DH_REGISTRY }}
+          username: ${{ secrets.DH_USERNAME }}
+          password: ${{ secrets.DH_TOKEN }}
+
+      - name: Create Kubeconfig
+        run: |
+          mkdir $HOME/.kube
+          echo "${{ secrets.KUBECONFIG_BUILDX }}" > $HOME/.kube/config
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: kubernetes
+          driver-opts: |
+            namespace=gitea
+            qemu.install=true
+          buildkitd-config-inline: |
+            [registry."docker.io"]
+              mirrors = ["harbor.alexlebens.net/proxy-hub.docker/"]
+
+      - name: Available Platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Extract Metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
+            type=sha,format=long
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+          images: |
+            ${{ vars.REPOSITORY_HOST }}/${{ gitea.repository }}
+
+      - name: Get Version Info
+        id: version
+        run: |
+          echo "version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
+          echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          if git describe --tags --exact-match HEAD 2>/dev/null; then
+            echo "is_release=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_release=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ steps.version.outputs.version }}
+            COMMIT_SHA=${{ steps.version.outputs.commit }}
+            IS_RELEASE=${{ steps.version.outputs.is_release }}
+          file: ./Dockerfile
+
+      - name: ntfy Success
+        uses: niniyas/ntfy-action@master
+        if: success()
+        with:
+          url: '${{ secrets.NTFY_URL }}'
+          topic: '${{ secrets.NTFY_TOPIC }}'
+          title: 'Release Success - Site Profile'
+          priority: 3
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,successfully,completed
+          details: 'Image for Site Profile has been released!'
+          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+
+      - name: ntfy Failed
+        uses: niniyas/ntfy-action@master
+        if: failure()
+        with:
+          url: '${{ secrets.NTFY_URL }}'
+          topic: '${{ secrets.NTFY_TOPIC }}'
+          title: 'Release Failure - Site Profile'
+          priority: 4
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,failed
+          details: 'Image for Site Profile has failed to be released.'
+          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/actions?workflow=release-image.yml", "clear": true}]'
+          image: true
--- a/.gitea/workflows/release-image-harbor.yml
+++ b/.gitea/workflows/release-image-harbor.yml
@@ -0,0 +1,143 @@
+name: release-image-harbor
+
+on:
+  push:
+    tags:
+      - 2.*
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.x
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24.13.1
+          cache: pnpm
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Lint Code
+        run: pnpm lint
+
+      - name: Build Project
+        run: pnpm build
+
+  release:
+    runs-on: ubuntu-js
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.REGISTRY_HOST }}
+          username: ${{ vars.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_SECRET }}
+
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.DH_REGISTRY }}
+          username: ${{ secrets.DH_USERNAME }}
+          password: ${{ secrets.DH_TOKEN }}
+
+      - name: Create Kubeconfig
+        run: |
+          mkdir $HOME/.kube
+          echo "${{ secrets.KUBECONFIG_BUILDX }}" > $HOME/.kube/config
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: kubernetes
+          driver-opts: |
+            namespace=gitea
+            qemu.install=true
+          buildkitd-config-inline: |
+            [registry."docker.io"]
+              mirrors = ["harbor.alexlebens.net/proxy-hub.docker/"]
+
+      - name: Available Platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Extract Metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
+            type=sha,format=long
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+          images: |
+            ${{ vars.REGISTRY_HOST }}/images/site-profile
+
+      - name: Get Version Info
+        id: version
+        run: |
+          echo "version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
+          echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          if git describe --tags --exact-match HEAD 2>/dev/null; then
+            echo "is_release=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_release=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ steps.version.outputs.version }}
+            COMMIT_SHA=${{ steps.version.outputs.commit }}
+            IS_RELEASE=${{ steps.version.outputs.is_release }}
+          file: ./Dockerfile
+
+      - name: ntfy Success
+        uses: niniyas/ntfy-action@master
+        if: success()
+        with:
+          url: '${{ secrets.NTFY_URL }}'
+          topic: '${{ secrets.NTFY_TOPIC }}'
+          title: 'Release Success - Site Profile'
+          priority: 3
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,successfully,completed
+          details: 'Image for Site Profile has been released!'
+          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+
+      - name: ntfy Failed
+        uses: niniyas/ntfy-action@master
+        if: failure()
+        with:
+          url: '${{ secrets.NTFY_URL }}'
+          topic: '${{ secrets.NTFY_TOPIC }}'
+          title: 'Release Failure - Site Profile'
+          priority: 4
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,failed
+          details: 'Image for Site Profile has failed to be released.'
+          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/actions?workflow=release-image.yml", "clear": true}]'
+          image: true
--- a/.gitea/workflows/release-image.yaml
+++ b/.gitea/workflows/release-image.yaml
@@ -1,340 +0,0 @@
-name: release-image
-
-on:
-  push:
-    branches:
-      - release
-
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-js
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: release
-
-      - name: Set up Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24.14.0
-
-      - name: Set up Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: 1.3.10
-
-      - name: Install Dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Cache Astro Build Cache
-        uses: actions/cache@v5
-        with:
-          path: |
-            .astro
-            node_modules/.vite
-          key: ${{ runner.os }}-astro-${{ hashFiles('**/*.astro', 'astro.config.mjs') }}
-          restore-keys: |
-            ${{ runner.os }}-astro-
-
-      - name: Lint Code
-        run: bun run lint
-
-      - name: Build Project
-        run: bun run build
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Test Failure - Site Profile'
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: 'During release tests failed for building Site Profile'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/actions?workflow=release-image.yaml", "clear": true}]'
-          image: true
-
-  guarddog:
-    runs-on: ubuntu-js
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: release
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.12'
-
-      - name: Install GuardDog
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install guarddog
-
-      - name: Run GuardDog
-        run: |
-          guarddog npm scan ./
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Security Failure - Site Profile'
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: 'During release guarddog scan failed for Site Profile'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/actions?workflow=release-image.yaml", "clear": true}]'
-          image: true
-
-  semantic-release:
-    needs: [ build, guarddog ]
-    runs-on: ubuntu-js
-    outputs:
-      new-release-published: ${{ steps.semantic.outputs.new-release-published }}
-      new-release-version: ${{ steps.semantic.outputs.new-release-version }}
-      new-release-git-tag: ${{ steps.semantic.outputs.new-release-git-tag }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Set up Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24.14.0
-
-      - name: Set up Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: 1.3.10
-
-      - name: Install Dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Run Semantic Release
-        id: semantic
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-          NODE_PATH: ${{ github.workspace }}/node_modules
-        run: |
-          bun run semantic-release
-
-  release-harbor:
-    runs-on: ubuntu-js
-    needs: semantic-release
-    if: ${{ needs.semantic-release.outputs.new-release-published == 'true' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: release
-
-      - name: Login to Harbor Registry
-        uses: docker/login-action@v4
-        with:
-          registry: ${{ vars.REGISTRY_HOST }}
-          username: ${{ vars.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_SECRET }}
-
-      - name: Login to Docker
-        uses: docker/login-action@v4
-        with:
-          registry: ${{ vars.DH_REGISTRY }}
-          username: ${{ secrets.DH_USERNAME }}
-          password: ${{ secrets.DH_TOKEN }}
-
-      - name: Create Kubeconfig
-        run: |
-          mkdir $HOME/.kube
-          echo "${{ secrets.KUBECONFIG_BUILDX }}" > $HOME/.kube/config
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v4
-        with:
-          driver: kubernetes
-          driver-opts: |
-            namespace=gitea
-            qemu.install=true
-          buildkitd-config-inline: |
-            [registry."docker.io"]
-              mirrors = ["harbor.alexlebens.net/proxy-hub.docker/"]
-
-      - name: Available Platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
-
-      - name: Extract Metadata
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          images: |
-            ${{ vars.REGISTRY_HOST }}/images/site-profile
-          tags: |
-            type=ref,event=branch
-            type=sha,format=long
-            type=raw,value=latest,enable=${{ needs.semantic-release.outputs.new-release-published == 'true' }}
-            type=semver,pattern={{version}},value=${{ needs.semantic-release.outputs.new-release-version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ needs.semantic-release.outputs.new-release-version }}
-            type=semver,pattern={{major}},value=${{ needs.semantic-release.outputs.new-release-version }}
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            APP_VERSION=${{ needs.semantic-release.outputs.new-release-version }}
-            COMMIT_SHA=${{ github.sha }}
-            IS_RELEASE=true
-          file: ./Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: ntfy Success
-        uses: niniyas/ntfy-action@master
-        if: success()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Release Success - Site Profile'
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,successfully,completed
-          details: 'Harbor Image for Site Profile has been released!'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Release Failure - Site Profile'
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: 'Harbor Image for Site Profile has failed to be released.'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/actions?workflow=release-image.yml", "clear": true}]'
-          image: true
-
-  release-gitea:
-    runs-on: ubuntu-js
-    needs: [ semantic-release, release-harbor ]
-    if: |
-      always() && 
-      needs.semantic-release.outputs.new-release-published == 'true'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: release
-
-      - name: Login to Gitea Registry
-        uses: docker/login-action@v4
-        with:
-          registry: ${{ vars.REPOSITORY_HOST }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.REPOSITORY_TOKEN }}
-
-      - name: Login to Docker
-        uses: docker/login-action@v4
-        with:
-          registry: ${{ vars.DH_REGISTRY }}
-          username: ${{ secrets.DH_USERNAME }}
-          password: ${{ secrets.DH_TOKEN }}
-
-      - name: Create Kubeconfig
-        run: |
-          mkdir $HOME/.kube
-          echo "${{ secrets.KUBECONFIG_BUILDX }}" > $HOME/.kube/config
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v4
-        with:
-          driver: kubernetes
-          driver-opts: |
-            namespace=gitea
-            qemu.install=true
-          buildkitd-config-inline: |
-            [registry."docker.io"]
-              mirrors = ["harbor.alexlebens.net/proxy-hub.docker/"]
-
-      - name: Available Platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
-
-      - name: Extract Metadata
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          images: |
-            ${{ vars.REPOSITORY_HOST }}/${{ gitea.repository }}
-          tags: |
-            type=ref,event=branch
-            type=sha,format=long
-            type=raw,value=latest,enable=${{ needs.semantic-release.outputs.new-release-published == 'true' }}
-            type=semver,pattern={{version}},value=${{ needs.semantic-release.outputs.new-release-version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ needs.semantic-release.outputs.new-release-version }}
-            type=semver,pattern={{major}},value=${{ needs.semantic-release.outputs.new-release-version }}
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            APP_VERSION=${{ needs.semantic-release.outputs.new-release-version }}
-            COMMIT_SHA=${{ github.sha }}
-            IS_RELEASE=true
-          file: ./Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: ntfy Success
-        uses: niniyas/ntfy-action@master
-        if: success()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Release Success - Site Profile'
-          priority: 3
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,successfully,completed
-          details: 'Gitea Image for Site Profile has been released!'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-
-      - name: ntfy Failed
-        uses: niniyas/ntfy-action@master
-        if: failure()
-        with:
-          url: '${{ secrets.NTFY_URL }}'
-          topic: '${{ secrets.NTFY_TOPIC }}'
-          title: 'Release Failure - Site Profile'
-          priority: 4
-          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
-          tags: action,failed
-          details: 'Gitea Image for Site Profile has failed to be released.'
-          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
-          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/actions?workflow=release-image.yaml", "clear": true}]'
-          image: true
--- a/.gitea/workflows/test-build.yaml
+++ b/.gitea/workflows/test-build.yaml
@@ -4,9 +4,6 @@ on:
  push:
    branches:
      - main
-    paths-ignore:
-      - '.gitea/workflows/**'
-      - '**.md'

  pull_request:
    branches:
@@ -19,34 +16,25 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v6

-      - name: Set up Node
+      - name: Set up pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.x
+
+      - name: Set up Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: 24.14.0
-
-      - name: Set up Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: 1.3.10
+          node-version: 24.13.1
+          cache: pnpm

      - name: Install Dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Cache Astro Build Cache
-        uses: actions/cache@v5
-        with:
-          path: |
-            .astro
-            node_modules/.vite
-          key: ${{ runner.os }}-astro-${{ hashFiles('**/*.astro', 'astro.config.mjs') }}
-          restore-keys: |
-            ${{ runner.os }}-astro-
+        run: pnpm install

      - name: Lint Code
-        run: bun run lint
+        run: pnpm lint

      - name: Build Project
-        run: bun run build
+        run: pnpm build

      - name: ntfy Failed
        uses: niniyas/ntfy-action@master
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+

 # environment variables
 .env
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1,3 @@
+registry=https://registry.npmjs.org/
+engine-strict=true
+save-exact=true
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,17 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
-    hooks:
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-      - id: check-merge-conflict
-      - id: check-json
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.11
-    hooks:
-      - id: prettier
-        types_or: [javascript, typescript, css, scss, html, json, yaml, markdown]
-        additional_dependencies:
-          - prettier
-          - prettier-plugin-astro
-          - prettier-plugin-tailwindcss
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -1,18 +0,0 @@
-{
-  "branches": ["release"],
-  "tagFormat": "${version}",
-  "plugins": [
-    "@semantic-release/commit-analyzer",
-    "@semantic-release/release-notes-generator",
-    "@semantic-release/changelog",
-    "semantic-release-export-data",
-    ["@semantic-release/npm", { "npmPublish": false }],
-    ["@semantic-release/git", {
-      "assets": ["package.json", "CHANGELOG.md"],
-      "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-    }],
-    ["@saithodev/semantic-release-gitea", {
-      "giteaUrl": "https://gitea.alexlebens.dev"
-    }]
-  ]
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/31
+++ b/31
@@ -1,35 +1,32 @@
-ARG REGISTRY=dhi.io
-FROM ${REGISTRY}/bun:1.3.10-alpine3.22-dev AS builder
+FROM docker.io/node:24.14.0-alpine AS builder
+
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable

 WORKDIR /app
-
-COPY package.json bun.lock ./
+COPY package.json pnpm-lock.yaml ./

 FROM builder AS prod-deps
-RUN --mount=type=cache,id=bun,target=/root/.bun/install/cache \
-    bun install --production --frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile

-FROM builder AS build-deps
-RUN --mount=type=cache,id=bun,target=/root/.bun/install/cache \
-    bun install --frozen-lockfile
+FROM prod-deps AS build-deps
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile

 FROM build-deps AS build
 COPY . .
-RUN bun run build
+RUN pnpm run build

-FROM ${REGISTRY}/bun:1.3.10-alpine3.22 AS runtime
+FROM dhi.io/node:24.13.1 AS runtime
 WORKDIR /app
 COPY --from=prod-deps /app/node_modules /app/node_modules
 COPY --from=build /app/dist /app/dist

-ARG APP_VERSION=latest
+LABEL version="2.15.1"
+LABEL description="Astro based personal website"

-ENV NODE_ENV=production
 ENV HOST=0.0.0.0
 ENV PORT=4321

-LABEL version=$APP_VERSION
-LABEL description="Astro based personal website"
-
 EXPOSE $PORT
-CMD ["bun", "run", "./dist/server/entry.mjs"]
+CMD ["node", "./dist/server/entry.mjs"]
--- a/README.md
+++ b/README.md
@@ -2,23 +2,19 @@

 Personal site used for information about myself and blog.

-
 ## Development

 With dependencies installed, you can utilize the following npm scripts to manage your project's development lifecycle:

- `bun run build`: Bundles your site into static files for production.
- `bun run dev`: Starts a local development server with hot reloading enabled.
+- `pnpm build`: Bundles your site into static files for production.
+- `pnpm dev`: Starts a local development server with hot reloading enabled.
+- `pnpm preview`: Serves your build output locally for preview before deployment.

 For detailed help with Astro CLI commands, visit [Astro's documentation](https://docs.astro.build/en/reference/cli-reference/).

-
 ## Thanks

-Based the site on: [gblog-template](https://github.com/godruoyi/gblog/tree/gblog-template) and [ScrewFast](https://github.com/mearashadowfax/ScrewFast)
-
-Using Icons from [Icons8](https://icons8.com/)
-
+Thanks https://github.com/godruoyi/gblog/tree/gblog-template, https://github.com/mearashadowfax/ScrewFast, 

 ## License

--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -1,13 +1,15 @@
 import { defineConfig } from 'astro/config';

 import node from '@astrojs/node';
+import partytown from '@astrojs/partytown';
+import react from '@astrojs/react';
 import sitemap from '@astrojs/sitemap';

 import tailwindcss from '@tailwindcss/vite';
 import icon from 'astro-icon';
 import swup from '@swup/astro';

-import { getSiteURL } from './src/scripts/url';
+import { getSiteURL } from './src/support/url';

 export default defineConfig({
  site: getSiteURL(),
@@ -23,7 +25,11 @@ export default defineConfig({
    }
  },

+  prefetch: true,
+
  integrations: [
+    partytown(),
+    react(),
    sitemap(),
    icon({
      include: {
@@ -41,16 +47,17 @@ export default defineConfig({
    }),
    (await import('@playform/compress')).default({
      CSS: true,
-      JavaScript: false,
+      JavaScript: true,
      HTML: {
        'html-minifier-terser': {
          collapseWhitespace: true,
          minifyCSS: false,
-          minifyJS: false,
+          minifyJS: true,
        },
      },
      Image: false,
      SVG: true,
+      Logger: 2,
    }),
  ],

@@ -71,4 +78,13 @@ export default defineConfig({
  adapter: node({
    mode: 'standalone',
  }),
+
+  build: {
+    // Specifies the directory in the build output where Astro-generated assets (bundled JS and CSS for example) should live.
+    // see https://docs.astro.build/en/reference/configuration-reference/#buildassets
+    assets: 'assets',
+    // see https://docs.astro.build/en/reference/configuration-reference/#buildassetsprefix
+    assetsPrefix:
+      !!import.meta.env.S3_ENABLE || !!process.env.S3_ENABLE ? 'https://digitalocean.com' : '',
+  },
 });
--- a/bun.lock
+++ b/bun.lock
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "site-profile",
  "type": "module",
-  "version": "0.0.0",
+  "version": "2.15.1",
  "homepage": "https://www.alexlebens.dev",
  "bugs": {
    "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",
@@ -19,66 +19,62 @@
  },
  "scripts": {
    "dev": "astro dev",
-    "full-dev": "rm -rf dist node_modules .astro && bun install && astro build && astro dev",
    "build": "astro build",
    "preview": "astro preview",
-    "full-preview": "rm -rf dist node_modules .astro && bun install && astro build && astro preview",
    "astro": "astro",
    "format": "prettier --write  \"**/*.{js,jsx,ts,tsx,md,mdx,astro}\"",
    "lint": "eslint \"src/**/*.{js,ts,jsx,tsx,astro}\"",
    "lint:fix": "eslint --fix \"src/**/*.{js,ts,jsx,tsx,astro}\""
  },
  "dependencies": {
-    "@astrojs/check": "^0.9.7",
-    "@astrojs/node": "^10.0.0",
-    "@astrojs/rss": "^4.0.17",
-    "@astrojs/sitemap": "^3.7.1",
-    "@directus/sdk": "^21.2.0",
+    "@astrojs/check": "^0.9.6",
+    "@astrojs/node": "^9.5.3",
+    "@astrojs/partytown": "^2.1.4",
+    "@astrojs/react": "^4.4.2",
+    "@astrojs/rss": "^4.0.15",
+    "@astrojs/sitemap": "^3.7.0",
+    "@directus/sdk": "^21.1.0",
+    "@giscus/react": "^3.1.0",
    "@iconify-json/mdi": "^1.2.3",
    "@iconify-json/pajamas": "^1.2.15",
-    "@iconify-json/simple-icons": "^1.2.74",
-    "@playform/compress": "^0.2.2",
+    "@iconify-json/simple-icons": "^1.2.70",
+    "@playform/compress": "^0.2.1",
    "@swup/astro": "^1.8.0",
-    "@tailwindcss/postcss": "^4.2.1",
-    "@tailwindcss/vite": "^4.2.1",
+    "@tailwindcss/postcss": "^4.1.18",
+    "@tailwindcss/vite": "^4.1.18",
+    "@types/react": "^19.2.14",
    "@types/unist": "^3.0.3",
-    "astro": "^6.0.0",
-    "astro-compress": "^2.4.0",
+    "astro": "^5.17.2",
    "astro-icon": "^1.1.5",
-    "dayjs": "^1.11.20",
-    "markdown-it": "^14.1.1",
-    "marked": "^17.0.4",
+    "marked": "^17.0.2",
    "marked-shiki": "^1.2.1",
    "mdast-util-to-string": "^4.0.0",
-    "photoswipe": "^5.4.4",
-    "preline": "^4.1.2",
+    "preline": "^4.0.1",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
    "reading-time": "^1.5.0",
    "sharp": "^0.34.5",
    "sharp-ico": "^0.1.5",
-    "shiki": "^4.0.2",
-    "tailwindcss": "^4.2.1",
+    "shiki": "^3.22.0",
+    "tailwindcss": "^4.1.18",
    "ultrahtml": "^1.6.0"
  },
  "devDependencies": {
-    "@saithodev/semantic-release-gitea": "^2.1.0",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^13.0.1",
-    "@semantic-release/git": "^10.0.1",
-    "@semantic-release/npm": "^13.1.5",
-    "@semantic-release/release-notes-generator": "^14.1.0",
+    "@eslint-react/eslint-plugin": "^2.13.0",
    "@tailwindcss/forms": "^0.5.11",
    "@tailwindcss/typography": "^0.5.19",
-    "@types/markdown-it": "^14.1.2",
-    "eslint": "^10.0.3",
+    "eslint": "^10.0.0",
    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-astro": "^1.6.0",
-    "eslint-plugin-format": "^2.0.1",
+    "eslint-plugin-format": "^1.4.0",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-refresh": "^0.5.0",
    "prettier": "^3.8.1",
    "prettier-plugin-astro": "^0.14.1",
    "prettier-plugin-tailwindcss": "^0.7.2",
-    "semantic-release": "^25.0.3",
-    "semantic-release-export-data": "^1.2.0",
+    "timeago.js": "^4.0.2",
    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.0"
+    "typescript-eslint": "^8.55.0"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - swup
--- a/public/i.jpg
+++ b/public/i.jpg
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -0,0 +1,4 @@
+User-agent: *
+Allow: /
+
+Sitemap: https://www.alexlebens.dev/sitemap-index.xml
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -12,7 +12,7 @@ const currentPath = pathname.slice(1);
  class="fixed flex flex-wrap md:flex-nowrap md:justify-start inset-x-0 top-0 w-full z-50"
 >
  <nav
-    class="nav-base relative md:flex md:items-center md:justify-between rounded-[36px] transition-all duration-300 w-full px-4 py-3 mx-2 md:mx-8 mt-4"
+    class="nav-base relative md:flex md:items-center md:justify-between rounded-[36px] w-full px-4 mx-2 py-3 mt-4"
    aria-label="Global"
  >
    <div class="flex items-center justify-between ml-0">
@@ -95,3 +95,5 @@ const currentPath = pathname.slice(1);
    </div>
  </nav>
 </header>
+
+<script is:inline src="/vendor/preline/collapse2.1.0.min.js"></script>
--- a/src/components/buttons/ReadMoreButton.astro
+++ b/src/components/buttons/ReadMoreButton.astro
@@ -1,15 +0,0 @@
---
-import { Icon } from 'astro-icon/components';
---
-
-<div class="button-base button-bg-teal inline-flex shrink-0 rounded-lg gap-x-2">
-  <div class="button-text-title flex relative items-center text-center">
-    <span class="mr-2">
-      Read More
-    </span>
-    <Icon
-      name="mdi:keyboard-arrow-right"
-      class="button-hover-arrow"
-    />
-  </div>
-</div>
--- a/src/components/buttons/ThemeToggleButton.astro
+++ b/src/components/buttons/ThemeToggleButton.astro
@@ -43,93 +43,106 @@
 </button>

 <script is:inline>
-  (() => {
+  const applyTheme = () => {
    const isDark =
      localStorage.theme === 'dark' ||
      (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
    document.documentElement.classList.toggle('dark', isDark);
-  })();
+  };
+
+  applyTheme();
+
+  document.addEventListener('astro:after-swap', applyTheme);
 </script>

 <script>
-  if (!document.querySelector('.theme-switch-overlay')) {
-    const overlay = document.createElement('div');
-    overlay.className = 'theme-switch-overlay fixed inset-0 pointer-events-none z-50';
-    overlay.style.opacity = '0';
-    overlay.style.transition = 'opacity 0.15s ease-out';
-    document.body.appendChild(overlay);
-  }
-  ['click', 'touchend'].forEach((eventType) => {
-    document.addEventListener(
-      eventType,
-      (e) => {
-        const target = e.target as HTMLElement;
-        const toggle = target.closest('[data-theme-toggle]');
-        
-        if (!toggle) return;
+  function setupThemeToggle() {
+    const themeToggles = document.querySelectorAll('[data-theme-toggle]');

-        e.preventDefault();
+    // Create theme switch overlay element
+    if (!document.querySelector('.theme-switch-overlay')) {
+      const overlay = document.createElement('div');
+      overlay.className = 'theme-switch-overlay fixed inset-0 pointer-events-none z-50';
+      overlay.style.opacity = '0';
+      overlay.style.transition = 'opacity 0.3s ease-out';
+      document.body.appendChild(overlay);
+    }

-        let x, y;
-        const rect = toggle.getBoundingClientRect();
-        
-        if (eventType === 'touchend') {
-          const touchEvent = e as TouchEvent;
-          if (touchEvent.changedTouches && touchEvent.changedTouches[0]) {
-            x = touchEvent.changedTouches[0].clientX - rect.left;
-            y = touchEvent.changedTouches[0].clientY - rect.top;
-          }
-        } else {
-          const mouseEvent = e as MouseEvent;
-          x = mouseEvent.clientX - rect.left;
-          y = mouseEvent.clientY - rect.top;
-        }
+    themeToggles.forEach((toggle) => {
+      ['click', 'touchend'].forEach((eventType) => {
+        toggle.addEventListener(
+          eventType,
+          (e) => {
+            e.preventDefault();
+            e.stopPropagation();

-        document.documentElement.style.setProperty('--x', `${x}px`);
-        document.documentElement.style.setProperty('--y', `${y}px`);
-
-        const overlay = document.querySelector('.theme-switch-overlay') as HTMLElement;
-        const isDark = document.documentElement.classList.contains('dark');
-        const newTheme = isDark ? 'light' : 'dark';
-
-        if (overlay) {
-          overlay.style.backgroundColor =
-            newTheme === 'dark' ? 'rgba(24, 24, 27, 0.3)' : 'rgba(255, 255, 255, 0.3)';
-          overlay.style.opacity = '1';
-        }
-
-        document.documentElement.classList.add('theme-switching');
-
-        document.body.offsetHeight;
-
-        setTimeout(() => {
-          if (isDark) {
-            document.documentElement.classList.remove('dark');
-          } else {
-            document.documentElement.classList.add('dark');
-          }
-
-          localStorage.setItem('theme', newTheme);
-          document.dispatchEvent(
-            new CustomEvent('themeChanged', {
-              detail: { isDark: newTheme === 'dark' },
-            })
-          );
-
-          document.body.offsetHeight;
-
-          setTimeout(() => {
-            if (overlay) {
-              overlay.style.opacity = '0';
+            // Get click/touch position for radial animation
+            let x, y;
+            if (e.type === 'touchend' && e.changedTouches && e.changedTouches[0]) {
+              const rect = toggle.getBoundingClientRect();
+              x = e.changedTouches[0].clientX - rect.left;
+              y = e.changedTouches[0].clientY - rect.top;
+            } else {
+              const rect = toggle.getBoundingClientRect();
+              x = e.clientX - rect.left;
+              y = e.clientY - rect.top;
            }
-            document.documentElement.classList.remove('theme-switching');
-          }, 150);
-        }, 50);
-      },
-      { passive: false }
-    );
-  });

+            document.documentElement.style.setProperty('--x', `${x}px`);
+            document.documentElement.style.setProperty('--y', `${y}px`);
+
+            const overlay = document.querySelector('.theme-switch-overlay');
+            const isDark = document.documentElement.classList.contains('dark');
+            const newTheme = isDark ? 'light' : 'dark';
+
+            // Show overlay during transition
+            if (overlay) {
+              overlay.style.backgroundColor =
+                newTheme === 'dark' ? 'rgba(24, 24, 27, 0.3)' : 'rgba(255, 255, 255, 0.3)';
+              overlay.style.opacity = '1';
+            }
+
+            document.documentElement.classList.add('theme-switching');
+
+            // Force a reflow to ensure all elements update
+            document.body.offsetHeight;
+
+            // Toggle dark mode with a slight delay to allow overlay to appear
+            setTimeout(() => {
+              if (isDark) {
+                document.documentElement.classList.remove('dark');
+              } else {
+                document.documentElement.classList.add('dark');
+              }
+
+              localStorage.setItem('theme', newTheme);
+              document.dispatchEvent(
+                new CustomEvent('themeChanged', {
+                  detail: { isDark: newTheme === 'dark' },
+                })
+              );
+
+              // Force another reflow to ensure all elements update
+              document.body.offsetHeight;
+
+              setTimeout(() => {
+                if (overlay) {
+                  overlay.style.opacity = '0';
+                }
+                document.documentElement.classList.remove('theme-switching');
+              }, 300);
+            }, 50);
+          },
+          { passive: false }
+        );
+      });
+    });
+  }
+
+  // Run setup on load
+  document.addEventListener('astro:page-load', setupThemeToggle);
+
+  // Also run on page visibility change to ensure theme is consistent
  document.addEventListener('visibilitychange', () => {
    if (document.visibilityState === 'visible') {
      const currentTheme = localStorage.getItem('theme');
@@ -141,6 +154,7 @@
    }
  });

+  // Listen for system preference changes
  window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', ({ matches }) => {
    if (!localStorage.getItem('theme')) {
      if (matches) {
--- a/src/components/cards/BlogCard.astro
+++ b/src/components/cards/BlogCard.astro
@@ -1,10 +1,11 @@
 ---
+import { Icon } from 'astro-icon/components';
 import { Image } from 'astro:assets';

 import type { Post } from '@lib/directusTypes';

-import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
-import { getDirectusImageURL } from '@/scripts/url';
+import { formatDate } from '@support/time';
+import { getDirectusImageURL } from '@/support/url';

 interface Props {
  post: Post;
@@ -15,13 +16,13 @@ const { post } = Astro.props;

 <div class="smooth-reveal-cards group flex flex-col">
  <a
-    class="card-base border-none! h-full flex flex-col"
+    class="card-base border-none!"
    href={`/blog/${post.slug}/`}
    data-astro-prefetch
  >
    <div class="relative shrink-0 rounded-t-xl w-full overflow-hidden before:absolute before:inset-x-0 before:z-1 before:size-full">
      <Image
-        class="rounded-t-xl h-64 w-full object-cover"
+        class="rounded-t-xl h-auto w-full"
        src={getDirectusImageURL(post.image)}
        alt={post.image_alt}
        draggable="false"
@@ -30,17 +31,25 @@ const { post } = Astro.props;
        inferSize={true}
      />
    </div>
-    <div class="flex flex-col flex-1 rounded-xl p-4 md:p-5 mx-1 mb-2">
-      <div class="flex flex-row items-center mb-8">
-        <h3 class="card-text-title card-hover-text-title text-2xl">
-          {post.title}
-        </h3>
-      </div>
-      <div class="mt-auto">
-        <PostMetadataSnippet
-          enableCategoryLink={false}
-          post={post}
-        />
+    <div class="rounded-xl p-4 md:p-5">
+      <h3 class="card-text-title text-xl">
+        {post.title}
+      </h3>
+      <div class="ml-6 flex">
+        <div class="relative inline-block w-full">
+          <div class="card-text-title card-hover-text-title flex relative items-center mx-auto min-h-11 sm:mx-0 sm:mt-4">
+            <span class="relative inline-block overflow-hidden ml-2">
+              Read more
+            </span>
+            <Icon
+              name="mdi:keyboard-arrow-right"
+              class="translate-y-0.5 transition duration-300 group-hover:translate-x-1"
+            />
+            <p class="card-text-description text-sm ml-auto">
+              {formatDate(post.published_date)}
+            </p>
+          </div>
+        </div>
      </div>
    </div>
  </a>
--- a/src/components/cards/CategoryCard.astro
+++ b/src/components/cards/CategoryCard.astro
@@ -1,18 +1,13 @@
 ---
-import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/scripts/url';
-
 interface Props {
  slug: string;
  title: string;
  description: string;
-  logoLight: string;
-  logoDark?: string;
  count: number;
  publishDate: string;
 }

-const { slug, title, description, logoLight, logoDark, count, publishDate } = Astro.props;
+const { slug, title, description, count, publishDate } = Astro.props;
 ---

 <div class="smooth-reveal-cards group h-full">
@@ -22,25 +17,16 @@ const { slug, title, description, logoLight, logoDark, count, publishDate } = As
    data-astro-prefetch
  >
    <div class="relative grow overflow-hidden">
-      <div class="mask-fade-edges absolute inset-1 flex flex-col p-3 md:p-4 lg:p-5">
-        <div class="flex flex-row items-center mb-4 shrink-0">
-          <div class="card-hover-icon-scale shrink-0 mr-3">
-            <Logo
-              srcLight={getDirectusImageURL(logoLight)}
-              srcDark={getDirectusImageURL(logoDark!)}
-              alt={`Logo of ${title}`}
-            />
-          </div>
-          <h3 class="card-text-title-major card-hover-text-title whitespace-nowrap">
+      <div class="absolute inset-1 flex flex-col p-3 md:p-4 lg:p-5">
+        <div class="overflow-hidden">
+          <h3 class="card-text-title-major card-hover-text-title whitespace-nowrap mb-4">
            {title}
          </h3>
-        </div>
-        <div class="overflow-hidden">
-          <p class="card-text-description line-clamp-3">
+          <p class="card-text-description mb-4">
            {description}
          </p>
        </div>
-        <div class="card-text-description flex shrink-0 items-center justify-between text-xs mt-auto pt-1 md:pt-2">
+        <div class="card-text-description flex items-center justify-between text-xs mt-auto pt-1 md:pt-2">
          <span class="inline-flex items-center">
            <svg
              xmlns="http://www.w3.org/2000/svg"
@@ -55,7 +41,7 @@ const { slug, title, description, logoLight, logoDark, count, publishDate } = As
            </svg>
            {count}
          </span>
-          <div class="inline-flex items-center">
+          <span class="inline-flex items-center">
            <svg
              xmlns="http://www.w3.org/2000/svg"
              width="16"
@@ -68,10 +54,8 @@ const { slug, title, description, logoLight, logoDark, count, publishDate } = As
              <circle cx="12" cy="12" r="10"></circle>
              <polyline points="12 6 12 12 16 14"></polyline>
            </svg>
-            <span>
-              {publishDate}
-            </span>
-          </div>
+            {publishDate}
+          </span>
        </div>
      </div>
    </div>
--- a/src/components/cards/EducationCard.astro
+++ b/src/components/cards/EducationCard.astro
@@ -2,7 +2,7 @@
 import { Icon } from 'astro-icon/components';

 import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/scripts/url';
+import { getDirectusImageURL } from '@/support/url';

 interface Props {
  topic: string;
--- a/src/components/cards/LargeBlogLeftCard.astro
+++ b/src/components/cards/LargeBlogLeftCard.astro
@@ -1,50 +1,53 @@
 ---
+import { Icon } from 'astro-icon/components';
 import { Image } from 'astro:assets';

-import type { Post } from '@lib/directusTypes';
-
-import ReadMoreButton from '@components/buttons/ReadMoreButton.astro';
-import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
-import { getDirectusImageURL } from '@/scripts/url';
+import { getDirectusImageURL } from '@/support/url';

 interface Props {
-  post: Post;
+  title: string;
+  subTitle: string;
+  url: string;
+  img: string;
+  imgAlt: string;
 }

-const { post } = Astro.props;
+const { title, subTitle, url, img, imgAlt } = Astro.props;
 ---

-<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto w-full">
+<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto">
  <a
-    class="md:card-base-hidden group md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 gap-8 xl:gap-16 w-full md:px-8 md:py-8"
-    href={`/blog/${post.slug}`}
+    class="md:card-base-hidden group items-center md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 gap-8 xl:gap-16 max-w-340 2xl:max-w-full md:px-8 md:py-8"
+    href={url}
    data-astro-prefetch
  >
-    <div class="h-full">
+    <div>
      <Image
-        class="rounded-2xl rounded-b-none md:rounded-2xl md:shadow-2xl w-full h-full object-cover"
-        src={getDirectusImageURL(post.image)}
-        alt={post.image_alt}
+        class="rounded-2xl rounded-b-none md:rounded-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
+        src={getDirectusImageURL(img)}
+        alt={imgAlt}
        draggable="false"
        loading="lazy"
+        width="850"
+        height="420"
        inferSize={true}
      />
    </div>
-    <div class="flex flex-col justify-center bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6 gap-4">
-      <h2 class="card-text-header">
-        {post.title}
+    <div class="bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6">
+      <h2 class="card-text-header mb-2">
+        {title}
      </h2>
-      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose">
-        {post.description}
+      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-8">
+        {subTitle}
      </p>
-      <div class="flex md:flex-col-reverse lg:flex-row items-center md:items-start lg:items-center justify-between w-full md:gap-4">
-        <div class="hidden md:block shrink-0 mt-4">
-          <ReadMoreButton/>
-        </div>
-        <div class="mt-2 lg:mt-4">
-          <PostMetadataSnippet
-            post={post}
-            enableCategoryLink={false}
+      <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
+        <div class="button-text-title flex relative items-center text-center">
+          <span class="mr-2">
+            Read More
+          </span>
+          <Icon
+            name="mdi:keyboard-arrow-right"
+            class="button-hover-arrow"
          />
        </div>
      </div>
--- a/src/components/cards/LargeBlogRightCard.astro
+++ b/src/components/cards/LargeBlogRightCard.astro
@@ -1,85 +1,85 @@
 ---
+import { Icon } from 'astro-icon/components';
 import { Image } from 'astro:assets';

-import type { Post } from '@lib/directusTypes';
-
-import ReadMoreButton from '@components/buttons/ReadMoreButton.astro';
-import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
-import { getDirectusImageURL } from '@/scripts/url';
+import { getDirectusImageURL } from '@/support/url';

 interface Props {
-  post: Post;
+  title: string;
+  subTitle: string;
+  url: string;
+  single?: boolean;
+  imgOne: any;
+  imgOneAlt: any;
+  imgTwo?: any;
+  imgTwoAlt?: any;
 }

-const { post } = Astro.props;
+const { title, subTitle, url, single, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = Astro.props;
 ---

-<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto w-full">
+<div class="smooth-reveal flex flex-col px-5 py-10 mx-auto">
  <a
-    class="md:card-base-hidden group flex flex-col-reverse md:grid md:items-center md:grid-cols-2 lg:grid lg:grid-cols-2 md:gap-8 xl:gap-16 w-full md:px-8 md:py-8"
-    href={`/blog/${post.slug}`}
+    class="md:card-base-hidden group flex flex-col-reverse md:items-center md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 md:gap-8 xl:gap-16 max-w-340 2xl:max-w-full md:px-8 md:py-8"
+    href={url}
    data-astro-prefetch
  >
-    <div class="flex flex-col bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6 gap-4">
-      <h2 class="card-text-header">
-        {post.title}
+    <div class="bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6">
+      <h2 class="card-text-header mb-2">
+        {title}
      </h2>
-      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose">
-        {post.description}
+      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-8">
+        {subTitle}
      </p>
-      <div class="flex md:flex-col-reverse lg:flex-row items-center md:items-start lg:items-center justify-between w-full md:gap-4">
-        <div class="hidden md:block shrink-0 mt-4">
-          <ReadMoreButton/>
-        </div>
-        <div class="mt-2 lg:mt-4">
-          <PostMetadataSnippet
-            post={post}
-            enableCategoryLink={false}
+      <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
+        <div class="button-text-title flex relative items-center text-center">
+          <span class="mr-2">
+            Read More
+          </span>
+          <Icon
+            name="mdi:keyboard-arrow-right"
+            class="button-hover-arrow"
          />
        </div>
      </div>
    </div>
-    {!post.image_second ? (
-    <div class="h-full">
+    {single ? (
+    <div>
      <Image
-        class="rounded-2xl rounded-b-none md:rounded-2xl md:shadow-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
-        src={getDirectusImageURL(post.image)}
-        alt={post.image_alt}
-        draggable="false"
+        class="rounded-2xl rounded-b-none md:rounded-2xl w-full"
+        src={getDirectusImageURL(imgOne)}
+        alt={imgOneAlt}
+        format="webp"
        loading="lazy"
+        width="850"
+        height="420"
        inferSize={true}
      />
    </div>
    ) : (
-    <div class="h-full">
-      <div class="md:hidden">
-        <Image
-          class="rounded-2xl rounded-b-none shadow-2xl w-full h-full sm:max-h-80 object-cover"
-          src={getDirectusImageURL(post.image)}
-          alt={post.image_alt}
-          draggable="false"
-          loading="lazy"
-          inferSize={true}
-        />
-      </div>
-      <div class="hidden md:flex md:items-start">
-        <Image
-          class="rounded-xl z-10 shadow-2xl w-3/5 h-full object-cover"
-          src={getDirectusImageURL(post.image)}
-          alt={post.image_alt}
-          draggable="false"
-          loading="lazy"
-          inferSize={true}
-        />
-        <Image
-          class="rounded-xl shadow-2xl w-3/5 h-full -ml-16 mt-12 object-cover"
-          src={getDirectusImageURL(post.image_second)}
-          alt={post.image_second_alt}
-          draggable="false"
-          loading="lazy"
-          inferSize={true}
-        />
-      </div>
+    <div class="grid grid-cols-2 gap-4">
+      <Image
+        class="rounded-xl w-full"
+        src={getDirectusImageURL(imgOne)}
+        alt={imgOneAlt}
+        draggable="false"
+        format="webp"
+        loading="lazy"
+        width="400"
+        height="230"
+        inferSize={true}
+      />
+      <Image
+        class="rounded-xl w-full mt-4 lg:mt-10"
+        src={getDirectusImageURL(imgTwo)}
+        alt={imgTwoAlt}
+        draggable="false"
+        format="webp"
+        loading="lazy"
+        width="400"
+        height="230"
+        inferSize={true}
+      />
    </div>
    )}
  </a>
--- a/src/components/cards/LargeCategoryCard.astro
+++ b/src/components/cards/LargeCategoryCard.astro
@@ -1,77 +0,0 @@
---
-import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/scripts/url';
-
-interface Props {
-  url: string;
-  title: string;
-  description: string;
-  logoLight: string;
-  logoDark?: string;
-  count: number;
-  publishDate: string;
-}
-
-const { url, title, description, logoLight, logoDark, count, publishDate } = Astro.props;
---
-
-<div class="smooth-reveal-cards flex flex-col mx-auto w-full">
-  <a
-    class="card-base flex flex-col h-full min-h-55"
-    href={url}
-    data-astro-prefetch
-  >
-    <div class="relative grow overflow-hidden">
-      <div class="absolute inset-1 flex flex-col p-3 md:p-4 lg:p-5">
-        <div class="flex flex-row items-center mb-4">
-          <div class="card-hover-icon-scale shrink-0 mr-3">
-            <Logo
-              srcLight={getDirectusImageURL(logoLight)}
-              srcDark={getDirectusImageURL(logoDark!)}
-              alt={`Logo of ${title}`}
-            />
-          </div>
-          <h3 class="card-text-title-major card-hover-text-title whitespace-nowrap">
-            {title}
-          </h3>
-        </div>
-        <div>
-          <p class="card-text-description mb-4">
-            {description}
-          </p>
-        </div>
-        <div class="card-text-description flex items-center justify-between text-xs mt-auto pt-1 md:pt-2">
-          <span class="inline-flex items-center">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="none"
-              stroke="currentColor"
-              class="mr-1"
-            >
-              <path d="M4 19.5v-15A2.5 2.5 0 0 1 6.5 2H20v20H6.5a2.5 2.5 0 0 1 0-5H20"></path>
-            </svg>
-            {count}
-          </span>
-          <span class="inline-flex items-center">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="none"
-              stroke="currentColor"
-              class="mr-1"
-            >
-              <circle cx="12" cy="12" r="10"></circle>
-              <polyline points="12 6 12 12 16 14"></polyline>
-            </svg>
-            {publishDate}
-          </span>
-        </div>
-      </div>
-    </div>
-  </a>
-</div>
--- a/src/components/cards/LargeInvisibleCard.astro
+++ b/src/components/cards/LargeInvisibleCard.astro
@@ -1,59 +0,0 @@
---
-import { Icon } from 'astro-icon/components';
-import { Image } from 'astro:assets';
-
-import { getDirectusImageURL } from '@/scripts/url';
-
-interface Props {
-  title: string;
-  subTitle: string;
-  url: string;
-  img?: string;
-  imgAlt?: string;
-}
-
-const { title, subTitle, url, img, imgAlt } = Astro.props;
---
-
-<div class="smooth-reveal flex flex-col mx-auto w-full">
-  <a
-    class="md:card-base-hidden group items-center md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 gap-8 xl:gap-16 w-full md:px-8 md:py-8"
-    href={url}
-    data-astro-prefetch
-  >
-    {img && (
-    <div>
-      <Image
-        class="rounded-2xl rounded-b-none md:rounded-2xl md:shadow-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
-        src={getDirectusImageURL(img)}
-        alt={imgAlt}
-        draggable="false"
-        loading="lazy"
-        width="850"
-        height="420"
-        inferSize={true}
-      />
-    </div>
-    )}
-    <div class="bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6">
-      <h2 class="card-text-header mb-2">
-        {title}
-      </h2>
-      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-8">
-        {subTitle}
-      </p>
-      <div class="flex items-center justify-between w-full">
-        <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
-          <div class="button-text-title flex relative items-center text-center">
-            <span class="mr-2">
-              Read More
-            </span>
-            <Icon
-              name="mdi:keyboard-arrow-right"
-              class="button-hover-arrow"
-            />
-          </div>
-        </div>
-      </div>
-  </a>
-</div>
--- a/src/components/cards/LargeLinkCard.astro
+++ b/src/components/cards/LargeLinkCard.astro
@@ -1,44 +0,0 @@
---
-import ReadMoreButton from '@components/buttons/ReadMoreButton.astro';
-import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/scripts/url';
-
-interface Props {
-  title: string;
-  subTitle: string;
-  url: string;
-  logoLight: string;
-  logoDark?: string;
-}
-
-const { title, subTitle, url, logoLight, logoDark} = Astro.props;
---
-
-<div class="smooth-reveal w-full mx-auto">
-  <a
-    class="card-base group flex flex-row items-center justify-between w-full p-8 gap-6 md:gap-8"
-    href={url}
-    data-astro-prefetch
-  >
-    <div class="flex flex-row items-center ml-4">
-      <div class="card-hover-icon-scale shrink-0 mr-3">
-        <Logo
-          srcLight={getDirectusImageURL(logoLight)}
-          srcDark={getDirectusImageURL(logoDark!)}
-          alt={`Logo of ${title}`}
-        />
-      </div>
-      <div class="flex flex-col gap-3 text-left ml-4">
-        <h2 class="card-text-header text-2xl md:text-3xl">
-          {title}
-        </h2>
-        <p class="card-text-title font-light text-pretty text-lg max-w-3xl">
-          {subTitle}
-        </p>
-      </div>
-    </div>
-    <div class="hidden md:block shrink-0 mr-4">
-      <ReadMoreButton/>
-    </div>
-  </a>
-</div>
--- a/src/components/cards/WeatherCard.astro
+++ b/src/components/cards/WeatherCard.astro
@@ -10,7 +10,7 @@ const { dayName, label, icon, temp } = Astro.props;
 ---

 <div class="smooth-reveal-2 group flex flex-col">
-  <div class="card-base w-32 sm:w-40">
+  <div class="card-base w-32 md:w-40">
    <div class="p-5 text-center">
      <span class="card-text-description block font-bold text-xs uppercase tracking-widest">
        {dayName}
--- a/src/components/images/ImageTheme.astro
+++ b/src/components/images/ImageTheme.astro
@@ -4,11 +4,12 @@ import { Image } from 'astro:assets';
 const { srcLight, srcDark, alt, style, width, height } = Astro.props;
 ---

-<div class="grid grid-cols-1 grid-rows-1">
+<div class="themed-image-container">
  <Image
    src={srcLight}
    alt={alt}
-    class:list={['col-start-1 row-start-1 transition-all duration-300 ease-in-out opacity-100 scale-100 dark:opacity-0 dark:scale-65', style]}
+    class={`light-logo ${style}`}
+    inferSize={true}
    width={width}
    height={height}
    inferSize={true}
@@ -17,9 +18,29 @@ const { srcLight, srcDark, alt, style, width, height } = Astro.props;
  <Image
    src={srcDark}
    alt={alt}
-    class:list={['col-start-1 row-start-1 transition-all duration-300 ease-in-out opacity-0 scale-65 dark:opacity-100 dark:scale-100', style]}
+    class={`dark-logo ${style}`}
+    inferSize={true}
    width={width}
    height={height}
    inferSize={true}
  />
 </div>
+
+<style>
+  .themed-image-container {
+    display: grid;
+    grid-template-areas: "stack";
+  }
+
+  .themed-image-container :global(img) {
+    grid-area: stack;
+  }
+
+  :global(.dark) .light-logo {
+    display: none !important;
+  }
+
+  :global(.dark) .dark-logo {
+    display: block !important;
+  }
+</style>
--- a/src/components/sections/CategorySection.astro
+++ b/src/components/sections/CategorySection.astro
@@ -1,19 +1,17 @@
 ---
-import { readItems, readSingleton } from '@directus/sdk';
+import { getCollection } from 'astro:content';
+import { readItems } from '@directus/sdk';

 import type { Post } from '@lib/directusTypes';

 import CategoryCard from '@components/cards/CategoryCard.astro';
-import LargeCategoryCard from '@components/cards/LargeCategoryCard.astro';
 import directus from '@lib/directus';
-import { formatFromNow } from '@/scripts/time';
-
-const global = await directus.request(readSingleton('site_global'));
+import { timeago } from '@support/time';

 const posts = await directus.request(
  readItems('posts', {
    filter: { published: { _eq: true } },
-    fields: ['*', { category: ['*'] }],
+    fields: ['*'],
    sort: ['-published_date'],
  })
 );
@@ -34,21 +32,18 @@ const layoutPattern = [
 const postMap: Map<string, Post[]> = posts
  .sort((a: Post, b: Post) => b.published_date.valueOf() - a.published_date.valueOf())
  .reduce((acc, obj) => {
-    const categorySlug = obj.category?.slug;
-    if (!categorySlug) return acc;
-
-    let posts = acc.get(categorySlug);
+    let posts = acc.get(obj.category);
    if (!posts) {
      posts = [];
    }
    posts.push(obj);

-    acc.set(categorySlug, posts);
+    acc.set(obj.category, posts);

    return acc;
  }, new Map<string, Post[]>());

-const categories = (await directus.request(readItems('categories')))
+const categories = (await getCollection('categories'))
  .sort((a, b) => {
    const aCount = postMap.get(a.slug)?.length ?? 0;
    const bCount = postMap.get(b.slug)?.length ?? 0;
@@ -57,12 +52,11 @@ const categories = (await directus.request(readItems('categories')))
  .map((c, index) => {
    const posts = postMap.get(c.slug);
    const pattern = layoutPattern[index % layoutPattern.length];
-    const smColSpan = Math.min(pattern.col, 1);
-    const mdColSpan = Math.min(pattern.col, 2);
-    const lgColSpan = Math.min(pattern.col, 4);
+    const smColSpan = Math.min(pattern.col, 2);
+    const mdColSpan = Math.min(pattern.col, 4);
    const rowSpan = pattern.row;
    const rowSpanClass = rowSpan > 1 ? `row-span-${rowSpan}` : 'row-span-1';
-    const gridItemClass = `col-span-${smColSpan} md:col-span-${mdColSpan} lg:col-span-${lgColSpan} ${rowSpanClass}`;
+    const gridItemClass = `col-span-${smColSpan} md:col-span-${mdColSpan} ${rowSpanClass}`;
    return {
      ...c,
      posts,
@@ -70,7 +64,6 @@ const categories = (await directus.request(readItems('categories')))
      layoutPattern: {
        smCol: smColSpan,
        mdCol: mdColSpan,
-        lgCol: lgColSpan,
        row: rowSpan,
        index,
      },
@@ -79,7 +72,7 @@ const categories = (await directus.request(readItems('categories')))
 ---

 <section class="mx-auto px-4 py-10 sm:px-6 lg:px-8 lg:py-14 lg:pt-10 2xl:max-w-full">
-  <div class="grid grid-flow-row-dense grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+  <div class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 gap-4">
    {categories.map((category) => {
    return (
    <div
@@ -88,26 +81,13 @@ const categories = (await directus.request(readItems('categories')))
    >
      <CategoryCard
        slug={category.slug}
-        title={category.title}
-        description={category.description}
-        logoLight={category.logoLight}
-        logoDark={category.logoDark}
+        title={category.data.title}
+        description={category.data.description}
        count={postMap.get(category.slug)?.length ?? 0}
-        publishDate={formatFromNow(postMap.get(category.slug)?.[0]?.published_date)}
+        publishDate={timeago(postMap.get(category.slug)?.[0]?.published_date)}
      />
    </div>
    );
    })}
-    <div class="col-span-full mt-8">
-      <LargeCategoryCard
-        title="All Posts"
-        description="Here you can forgoe the organization and browse everything I've posted"
-        url="/all"
-        logoLight={global.all_logoLight}
-        logoDark={global.all_logoDark}
-        count={posts.length}
-        publishDate={formatFromNow(posts[0]?.published_date)}
-      />
-    </div>
  </div>
 </section>
--- a/src/components/sections/FeatureSection.astro
+++ b/src/components/sections/FeatureSection.astro
@@ -7,37 +7,33 @@ import directus from '@lib/directus';
 const global = await directus.request(readSingleton('site_global'));
 ---

-<section class="max-w-340 2xl:max-w-full px-4 py-10 mx-auto mb-2 md:mb-8">
-  <div class="flex items-center justify-center">
-    <div class="max-w-5xl">
-      <div class="grid grid-cols-1 md:grid-cols-2 gap-4 lg:gap-6">
+<section class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-8">
+  <div class="flex flex-col sm:flex-row items-center justify-center gap-y-2 sm:gap-x-12 sm:gap-y-0 lg:gap-x-24">
+    <div class="max-w-5xl sm:px-6 lg:px-8">
+      <div class="flex flex-wrap gap-6 sm:grid-cols-2 sm:gap-6 lg:grid-cols-3 justify-center">
        <FeaturesCard
          title="Cloud Engineer"
          description="Full stack and cloud engineer."
          url="/about"
-          logoUrlLight="https://directus.alexlebens.net/assets/8e674299-2dfc-4ea3-8193-a1c4050bf06f?key=system-large-contain&v=2026-02-26T21%3A23%3A22.457Z"
-          logoUrlDark="https://directus.alexlebens.net/assets/cdd6efce-3231-4213-8b1e-cae9c1b3a18f?key=system-large-contain&v=2026-03-03T19%3A30%3A01.263Z"
+          logoUrlLight="https://img.icons8.com/cotton/64/cloud-development--v2.png"
        />
        <FeaturesCard
          title="Homelab"
          description="Tinkering, testing, deploying, etc, etc ..."
          url="/categories/homelab/"
-          logoUrlLight="https://directus.alexlebens.net/assets/4ccb3d9f-e203-4c2b-bfad-600f1aa5b7a4?key=system-large-contain&v=2026-02-26T21%3A25%3A30.853Z"
-          logoUrlDark="https://directus.alexlebens.net/assets/33fb6b45-1834-44a0-bc04-692be4f6d4ce?key=system-large-contain&v=2026-03-03T19%3A30%3A37.961Z"
+          logoUrlLight="https://img.icons8.com/cotton/64/smart-home-connection.png"
        />
        <FeaturesCard
          title="Documentation"
          description="Reference and guides for my homelab."
          url="https://docs.alexlebens.dev"
-          logoUrlLight="https://directus.alexlebens.net/assets/5f5faad9-2c36-40a5-a519-f631d39ab388?key=system-large-contain&v=2026-03-03T19%3A49%3A43.620Z"
-          logoUrlDark="https://directus.alexlebens.net/assets/c49b40a9-ddf2-4fa2-ba35-6039682b93de?key=system-large-contain&v=2026-03-03T19%3A50%3A14.893Z"
+          logoUrlLight="https://img.icons8.com/cotton/64/bookmarked-document--v1.png"
        />
        <FeaturesCard
          title="Email"
          description={`Send me a message.`}
          url=`mailto:${global.email}`
-          logoUrlLight="https://directus.alexlebens.net/assets/4b1c771e-c709-4094-b018-0197b4747829?key=system-large-contain&v=2026-03-03T19%3A48%3A36.432Z"
-          logoUrlDark="https://directus.alexlebens.net/assets/cdf2ea11-fcfc-41f1-a701-43084fb06efa?key=system-large-contain&v=2026-03-03T19%3A47%3A28.109Z"
+          logoUrlLight="https://img.icons8.com/cotton/64/secured-letter--v3.png"
        />
      </div>
    </div>
--- a/src/components/sections/HeaderSection.astro
+++ b/src/components/sections/HeaderSection.astro
@@ -1,39 +1,23 @@
 ---
 import GoLinkPrimaryButton from '@components/buttons/GoLinkPrimaryButton.astro';
-import Logo from '@components/images/Logo.astro';
-import { getDirectusImageURL } from '@/scripts/url';

 interface Props {
  title: string;
  subTitle: string;
-  logoExists?: boolean;
-  logoLight?: string;
-  logoDark?: string;
  btnExists?: boolean;
  btnTitle?: string;
  btnURL?: string;
 }

-const { title, subTitle, logoExists, logoLight, logoDark, btnExists, btnTitle, btnURL } = Astro.props;
+const { title, subTitle, btnExists, btnTitle, btnURL } = Astro.props;
 ---

 <section class="mx-auto mt-10 px-4 sm:px-6 lg:px-8 lg:pt-10 2xl:max-w-full">
  <div class="flex-wrap md:flex md:items-center md:justify-between">
    <div class="w-full md:w-auto">
-      <div class="smooth-reveal flex flex-row items-center mb-4">
-        {logoExists ? (
-        <div class="shrink-0 mr-5">
-          <Logo
-            srcLight={getDirectusImageURL(logoLight!)}
-            srcDark={getDirectusImageURL(logoDark!)}
-            alt={`Logo of ${title}`}
-          />
-        </div>
-        ) : null}
-        <h1 class="card-text-header block lg:text-6xl">
-          {title}
-        </h1>
-      </div>
+      <h1 class="smooth-reveal card-text-header block lg:text-6xl">
+        {title}
+      </h1>
      <p class="smooth-reveal card-text-header-description mt-4">
        {subTitle}
      </p>
--- a/src/components/sections/HeroSection.astro
+++ b/src/components/sections/HeroSection.astro
@@ -1,13 +1,8 @@
 ---
 import { Image } from 'astro:assets';
-import { readItems } from '@directus/sdk';
-
-import type { HeaderImage } from '@lib/directusTypes';

 import GoLinkPrimaryButton from '@components/buttons/GoLinkPrimaryButton.astro';
 import GoLinkSecondaryButton from '@components/buttons/GoLinkSecondaryButton.astro';
-import directus from '@lib/directus';
-import { getDirectusImageURL } from '@/scripts/url';

 interface Props {
  title: string;
@@ -16,24 +11,18 @@ interface Props {
  primaryBtnURL?: string;
  secondaryBtn?: string;
  secondaryBtnURL?: string;
+  src?: any;
+  alt?: string;
+  rounded?: boolean;
 }

-const { title, subTitle, primaryBtn, primaryBtnURL, secondaryBtn, secondaryBtnURL } = Astro.props;
+const { title, subTitle, primaryBtn, primaryBtnURL, secondaryBtn, secondaryBtnURL, src, alt } = Astro.props;

-const imagesData = ((await directus.request(
-  readItems('header_images', {
-    fields: ['*'],
-  })
-)) as unknown) as HeaderImage[];
-
-const images = await Promise.all(imagesData.map(async (img) => ({
-  ...img,
-  src: await getDirectusImageURL(img.image)
-})));
+const roundedClasses = Astro.props.rounded ? "rounded-2xl" : null;
 ---

-<section class="grid md:grid-cols-2 md:items-center gap-4 md:gap-8 max-w-340 2xl:max-w-full px-4 py-14 sm:px-6 lg:px-8">
-  <div class="md:ml-12">
+<section class="mx-auto grid max-w-340 gap-4 px-4 py-14 sm:px-6 md:grid-cols-2 md:items-center md:gap-8 lg:px-8 2xl:max-w-full">
+  <div>
    <h1 class="smooth-reveal card-text-header block lg:text-7xl">
      <Fragment set:html={title} />
    </h1>
@@ -47,62 +36,22 @@ const images = await Promise.all(imagesData.map(async (img) => ({
      {secondaryBtn && <GoLinkSecondaryButton title={secondaryBtn} url={secondaryBtnURL} />}
    </div>
  </div>
-  <div class="smooth-reveal-fade md:block w-full hidden md:mr-12">
-    <div
-      class="flex justify-center w-full top-12 md:ml-4 overflow-hidden no-js-fallback"
-      id="hero-image-container"
-    >
-      {images.map((img, index) => (
-      <div
-        class="hero-image hidden justify-center w-full h-full"
-        data-index={index}
-      >
-        <Image
-          class="h-full w-105 scale-100 object-cover object-center"
-          src={img.src}
-          alt={img.image_alt}
-          draggable="false"
-          loading="eager"
-          format="webp"
-          widths={[840]}
-          inferSize={true}
-        />
-      </div>
-      ))}
+
+  <div class="smooth-reveal-fade md:block w-full hidden">
+    <div class="flex justify-center w-full top-12 md:ml-4 overflow-hidden">
+      {src && alt && (
+      <Image
+        src={src}
+        alt={alt}
+        class={`h-full w-105 scale-100 object-cover object-center ${roundedClasses}`}
+        draggable="false"
+        loading="eager"
+        format="webp"
+        quality="low"
+        widths={[840]}
+        inferSize={true}
+      />
+      )}
    </div>
-    <style>
-      .no-js-fallback .hero-image:first-child {
-        display: flex !important;
-      }
-    </style>
-    <script is:inline>
-      document.getElementById('hero-image-container')?.classList.remove('no-js-fallback');
-    </script>
  </div>
 </section>
-
-<script>
-  function initHeroImage() {
-    const container = document.getElementById('hero-image-container');
-    if (container) {
-      const images = container.querySelectorAll('.hero-image');
-      images.forEach(img => {
-        img.classList.remove('flex');
-        img.classList.add('hidden');
-      });
-      if (images.length > 0) {
-        const randomIndex = Math.floor(Math.random() * images.length);
-        images[randomIndex].classList.remove('hidden');
-        images[randomIndex].classList.add('flex');
-      }
-    }
-  }
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', initHeroImage);
-  } else {
-    initHeroImage();
-  }
-  if ((window as any).swup) {
-    (window as any).swup.hooks.on('page:view', initHeroImage); 
-  }
-</script>
--- a/src/components/sections/RecentPostsSection.astro
+++ b/src/components/sections/RecentPostsSection.astro
@@ -1,11 +1,7 @@
 ---
-import { readSingleton } from '@directus/sdk';
-
 import type { Post } from '@lib/directusTypes';

 import BlogCard from '@components/cards/BlogCard.astro';
-import LargeLinkCard from '@components/cards/LargeLinkCard.astro';
-import directus from '@lib/directus';

 interface Props {
  posts: Post[];
@@ -13,12 +9,10 @@ interface Props {
  subTitle?: string;
 }

-const global = await directus.request(readSingleton('site_global'));
-
 const { posts, title, subTitle } = Astro.props;
 ---

-<section class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-4">
+<section class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-8">
  <div class="text-center max-w-2xl mx-auto mb-10 lg:mb-14">
    <h1 class="smooth-reveal card-text-header block">
      {title}
@@ -29,18 +23,7 @@ const { posts, title, subTitle } = Astro.props;
      </span>
    </div>
  </div>
-    <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
-      {posts.map((b) => 
-      <BlogCard post={b} />
-      )}
-      <div class="col-span-full">
-        <LargeLinkCard
-          title="All Posts"
-          subTitle="Catch up on everything I've written"
-          url="/all"
-          logoLight={global.all_logoLight}
-          logoDark={global.all_logoDark}
-        />
-      </div>
-    </div>
+  <div class="grid gap-6 sm:grid-cols-2 lg:grid-cols-3">
+    {posts.map((b) => <BlogCard post={b} />)}
+  </div>
 </section>
--- a/src/components/sections/SelectedPostsSection.astro
+++ b/src/components/sections/SelectedPostsSection.astro
@@ -11,10 +11,25 @@ interface Props {
 const { posts } = Astro.props;
 ---

-<section class="smooth-reveal-cards flex flex-col gap-4 md:mb-20">
+<section class="smooth-reveal flex flex-col gap-4">
  {posts.map((post, index) => index % 2 === 0 ? (
-  <LargeBlogLeftCard post={post}/>
+  <LargeBlogLeftCard
+    title={post.title}
+    subTitle={post.description}
+    url={`/blog/${post.slug}`}
+    img={post.image}
+    imgAlt={post.image_alt}
+  />
  ) : (
-  <LargeBlogRightCard post={post}/>
+  <LargeBlogRightCard
+    title={post.title}
+    subTitle={post.description}
+    url={`/blog/${post.slug}`}
+    single={!post.image_second}
+    imgOne={post.image}
+    imgOneAlt={post.image_alt}
+    imgTwo={post?.image_second}
+    imgTwoAlt={post?.image_second_alt}
+  />
  ))}
 </section>
--- a/src/components/sections/WeatherSection.astro
+++ b/src/components/sections/WeatherSection.astro
@@ -1,13 +1,13 @@
 ---
 import WeatherCard from '@components/cards/WeatherCard.astro';
-import { getFiveDayForecast } from '@/scripts/weather';
+import { getFiveDayForecast } from '@support/weather';

 const { latitude = "44.95", longitude = "-93.09", cityName = "St. Paul, Minnesota", timezone = "America/Chicago" } = Astro.props;

 const { forecastDays, error } = await getFiveDayForecast(latitude, longitude, timezone);
 ---

-<section class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-8">
+<section class="max-w-340 2xl:max-w-fullpx-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-8">
  <div class="text-center max-w-2xl mx-auto mb-10 lg:mb-14">
    <h1 class="smooth-reveal card-text-header block">
      Weather in my Area 
@@ -19,24 +19,18 @@ const { forecastDays, error } = await getFiveDayForecast(latitude, longitude, ti
    </div>
  </div>
  {error ? (
-  <div class="smooth-reveal flex flex-wrap justify-center gap-4 lg:gap-6">
-    <div class="card-base flex flex-col justify-center items-center p-10 w-48 h-56">
-      <h1 class="card-text-header block text-accent text-center">
-        Sorry, {error.toLowerCase()}
-      </h1>
-    </div>
+  <div class="card-base p-10 text-accent text-center">
+    {error}
  </div>
  ) : (
  <div class="flex flex-wrap justify-center gap-4 lg:gap-6">
-    {forecastDays.map((forecastDay, index) => (
-    <div class={index === 3 ? "hidden min-[800px]:block" : index >= 4 ? "hidden min-[1100px]:block" : ""}>
-      <WeatherCard
-        dayName={forecastDay.dayName}
-        label={forecastDay.label}
-        icon={forecastDay.icon}
-        temp={forecastDay.temp}
-      />
-    </div>
+    {forecastDays.map((forecastDay) => (
+    <WeatherCard
+      dayName={forecastDay.dayName}
+      label={forecastDay.label}
+      icon={forecastDay.icon}
+      temp={forecastDay.temp}
+    />
    ))}
  </div>
  )}
--- a/src/components/snippets/PostMetadataSnippet.astro
+++ b/src/components/snippets/PostMetadataSnippet.astro
@@ -1,81 +0,0 @@
---
-import getReadingTime from 'reading-time';
-
-import type { Post } from '@lib/directusTypes';
-
-import Logo from '@components/images/Logo.astro';
-import { formatShortDate, formatDate } from '@/scripts/time';
-import { getDirectusImageURL } from '@/scripts/url';
-
-interface Props {
-  post: Post;
-  enableCategoryLink?: boolean;
-  dateFormat?: 'short' | 'long';
-}
-
-const { post, enableCategoryLink = true, dateFormat = 'short' } = Astro.props;
-
-const readingTime = getReadingTime(post.content || '');
---
-
-<ol class="flex items-center justify-start card-text-description text-sm whitespace-nowrap gap-2 sm:gap-0 overflow-hidden">
-  {post.category && (
-  <li class="inline-flex items-center">
-    {enableCategoryLink ? (
-    <a
-      class="inline-flex items-center hover:card-hover-text-description overflow-hidden"
-      href={`/categories/${post.category.slug}`}
-      data-astro-prefetch
-    >
-      <div class="flex flex-row items-center shrink-0">
-        <div class="mr-2">
-          <Logo
-            srcLight={getDirectusImageURL(post.category.logoLight)}
-            srcDark={getDirectusImageURL(post.category.logoDark)}
-            alt={`Logo of ${post.category.title}`}
-            width={18}
-            height={18}
-          />
-        </div>
-        {post.category.title}
-      </div>
-    </a>
-    ) : (
-    <div class="inline-flex items-center overflow-hidden">
-      <div class="flex flex-row items-center shrink-0">
-        <div class="mr-2">
-          <Logo
-            srcLight={getDirectusImageURL(post.category.logoLight)}
-            srcDark={getDirectusImageURL(post.category.logoDark)}
-            alt={`Logo of ${post.category.title}`}
-            width={18}
-            height={18}
-          />
-        </div>
-        {post.category.title}
-      </div>
-    </div>
-    )}
-  </li>
-  )}
-  <li class="inline-flex items-center">
-    <span class="shrink-0 mx-2">
-      /
-    </span>
-  </li>
-  <li class="inline-flex items-center">
-    <span class="shrink-0 overflow-hidden">
-      {dateFormat === 'short' ? formatShortDate(post.published_date) : formatDate(post.published_date)}
-    </span>
-  </li>
-  <li class="inline-flex items-center">
-    <span class="shrink-0 mx-2">
-      /
-    </span>
-  </li>
-  <li class="inline-flex items-center">
-    <span class="shrink-0 overflow-hidden">
-      {readingTime.minutes.toPrecision(1)} minutes
-    </span>
-  </li>
-</ol>
--- a/src/content/categories/books.md
+++ b/src/content/categories/books.md
@@ -0,0 +1,4 @@
+---
+title: 'Books 📖'
+description: 'Books I have read or listened to'
+---
--- a/src/content/categories/cloud.md
+++ b/src/content/categories/cloud.md
@@ -0,0 +1,4 @@
+---
+title: 'Cloud ☁️'
+description: "Its just someone else's server"
+---
--- a/src/content/categories/homelab.md
+++ b/src/content/categories/homelab.md
@@ -0,0 +1,4 @@
+---
+title: 'Homelab 🏠'
+description: 'What happens when rack servers find a home'
+---
--- a/src/content/categories/kubernetes.md
+++ b/src/content/categories/kubernetes.md
@@ -0,0 +1,4 @@
+---
+title: 'Kubernetes ☸️'
+description: 'The container orchestration system'
+---
--- a/src/content/categories/life.md
+++ b/src/content/categories/life.md
@@ -0,0 +1,4 @@
+---
+title: 'Life 🏃🏻'
+description: 'Just random musings on everyday stuff'
+---
--- a/src/content/categories/minnesota.md
+++ b/src/content/categories/minnesota.md
@@ -0,0 +1,4 @@
+---
+title: 'Minnesota 🌳'
+description: 'Land of 10,000 Lakes'
+---
--- a/src/content/categories/postgresql.md
+++ b/src/content/categories/postgresql.md
@@ -0,0 +1,4 @@
+---
+title: 'PostgreSQL'
+description: 'PostgreSQL is an open-source relational database management system (RDBMS)'
+---
--- a/src/content/categories/python.md
+++ b/src/content/categories/python.md
@@ -0,0 +1,4 @@
+---
+title: 'Python 🐍'
+description: 'Generally my go to language'
+---
--- a/src/content/categories/tool.md
+++ b/src/content/categories/tool.md
@@ -0,0 +1,4 @@
+---
+title: 'Tool 🪜'
+description: 'Usually just the software kind'
+---
--- a/src/content/categories/whatis.md
+++ b/src/content/categories/whatis.md
@@ -0,0 +1,4 @@
+---
+title: 'What Is?'
+description: 'A series on discovery'
+---
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -0,0 +1,12 @@
+import { defineCollection, z } from 'astro:content';
+
+const categoryCollection = defineCollection({
+  type: 'content',
+  schema: () =>
+    z.object({
+      title: z.string(),
+      description: z.string(),
+    }),
+});
+
+export const collections = { categories: categoryCollection };
--- a/src/images/autumn_bench.png
+++ b/src/images/autumn_bench.png
--- a/src/images/autumn_mountain.png
+++ b/src/images/autumn_mountain.png
--- a/src/images/autumn_tree.png
+++ b/src/images/autumn_tree.png
--- a/src/images/cedar_tree.png
+++ b/src/images/cedar_tree.png
--- a/src/images/portrait.avif
+++ b/src/images/portrait.avif
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -1,4 +1,5 @@
 ---
+import { ClientRouter } from 'astro:transitions';
 import { readSingleton } from '@directus/sdk';

 import BaseHead from '@components/BaseHead.astro';
@@ -38,7 +39,8 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
      structuredData={structuredData}
    />

-    <!-- Set Theme -->
+    <ClientRouter fallback="swap" />
+
    <script is:inline>
      const theme = (() => {
        if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
@@ -58,12 +60,6 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
      window.localStorage.setItem('theme', theme);
    </script>

-    <!-- Preline -->
-    <script
-      src="/vendor/preline/collapse2.1.0.min.js"
-      is:inline
-    />
-
    <!-- Rybbit Tracking Snippet -->
    <script
      src="https://rybbit.alexlebens.dev/api/script.js"
@@ -72,123 +68,90 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
    />
  </head>

-  <body class="bg-background selection:bg-yellow-400 m-0 p-0 overflow-hidden">
+  <body class="bg-background selection:bg-yellow-400 m-0 p-0 overflow-x-hidden">

    <!-- Sliding backgrounds -->
    <div class="bg"/>
    <div class="bg bg2"/>
    <div class="bg bg3"/>

-    <!-- Fixed header -->
-    <Header />
+    <!-- Layout -->
+    <div class="grow w-full max-w-(--breakpoint-2xl) px-4 sm:px-6 lg:px-8 py-20 mx-auto">

-    <!-- Main body -->
-    <div id="reset-scroll" class="mask-container w-screen h-screen overflow-y-auto overflow-x-hidden">
-      <main>
-
-        <!-- Content -->
-        <div class="grow w-full max-w-(--breakpoint-2xl) px-4 sm:px-6 lg:px-8 py-20 mx-auto">
-          <slot />
-        </div>
-
-        <!-- Footer -->
-        <Footer />
+      <Header />

+      <main class="has-js scroll-fade-container min-h-screen">
+        <slot />
      </main>
+
    </div>

+    <Footer />
+
  </body>
 </html>

 <script>
-  import { initPhotoSwipe } from '@/scripts/photoswipe';
-  import { animateContent } from '@/scripts/animations';
+  document.addEventListener('astro:page-load', () => {
+    const onScroll = () => {
+      document.documentElement.style.setProperty('--scroll-offset', `${window.scrollY}px`);
+      document.documentElement.classList.add('has-js');
+    };

-  const resetScroll = () => {
-    const scrollContainer = document.getElementById('reset-scroll');
-    if (scrollContainer) scrollContainer.scrollTop = 0;
-  };
+    window.removeEventListener('scroll', onScroll);
+    window.addEventListener('scroll', onScroll, { passive: true });

-  resetScroll();
-  initPhotoSwipe();
-  animateContent();
-
-  const observer = new MutationObserver((mutations) => {
-    const hasNewNodes = mutations.some(
-      (mutation) => mutation.type === 'childList' && mutation.addedNodes.length > 0
-    );
-
-    if (hasNewNodes) {
-      animateContent();
-      if (typeof (window as any).HSStaticMethods !== 'undefined') {
-        (window as any).HSStaticMethods.autoInit();
-      }
-    }
-  });
-
-  const targetNode = document.getElementById('reset-scroll');
-  if (targetNode) {
-    observer.observe(targetNode, { childList: true, subtree: true });
-  }
-
-  document.addEventListener('swup:page:view', () => {
-    resetScroll();
-    initPhotoSwipe();
-    animateContent();
-    if (typeof (window as any).HSStaticMethods !== 'undefined') {
-      (window as any).HSStaticMethods.autoInit();
-    }
-    if (typeof (window as any).rybbit === 'function') {
-      (window as any).rybbit('trackPageview');
-    }
+    onScroll();
  });
 </script>

 <style>
  /* Fade away content below header when scrolling */
-  .mask-container {
+  .has-js .scroll-fade-container {
    -webkit-mask-image: linear-gradient(
      to bottom,
      transparent 0px,
-      transparent 90px,
-      black 140px,
+      transparent 16px,
+      black 80px,
      black 100%
    );

    mask-image: linear-gradient(
      to bottom,
      transparent 0px,
-      transparent 90px,
-      black 140px,
+      transparent 16px,
+      black 80px,
      black 100%
    );

    -webkit-mask-size: 100vw 100vh;
    -webkit-mask-repeat: no-repeat;
+
+    -webkit-mask-position-y: var(--scroll-offset);
+    mask-position-y: var(--scroll-offset);
  }

  /* Background that creates the "glimmer" effect */
  .bg {
-    animation: slide 25s ease-in-out infinite alternate;
-    will-change: transform;
-    background-image: linear-gradient(-55deg, var(--bg-primary) 33.3%, var(--bg-secondary) 33.3%, var(--bg-secondary) 66.6%, var(--bg-tertiary) 66.6%);
-    filter: blur(40px);
+    animation: slide 20s ease-in-out infinite alternate;
+    background-image: linear-gradient(-60deg, var(--bg-primary) 33.3%, var(--bg-secondary) 33.3%, var(--bg-secondary) 66.6%, var(--bg-tertiary) 66.6%);
+    filter: blur(80px);
    top: 0;
    bottom: 0;
-    left: -70%;
-    right: -70%;
+    left: -50%;
+    right: -50%;
    opacity: .5;
    position: fixed;
    z-index: -1;
    --bg-primary: #e5e5e5;
-    --bg-secondary: #dce3eb;
-    --bg-tertiary: #f4f6f8;
+    --bg-secondary: #d9d9d9;
+    --bg-tertiary: #ededed;
  }

  :global(.dark) .bg {
-    --bg-primary: #3b3836;
-    --bg-secondary: #332f2e;
-    --bg-tertiary: #44403c;
+    --bg-primary: #292524;
+    --bg-secondary: #44403c;
+    --bg-tertiary: #57534e;
  }

  .bg2 {
@@ -197,15 +160,15 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
  }

  .bg3 {
-    animation-duration: 20s;
+    animation-duration: 25s;
  }

  @keyframes slide {
    0% {
-      transform: translateX(-30%);
+      transform:translateX(-25%);
    }
    100% {
-      transform: translateX(30%);
+      transform:translateX(25%);
    }
  }
 </style>
--- a/src/lib/directus.ts
+++ b/src/lib/directus.ts
@@ -4,8 +4,6 @@ import type {
  Global,
  Weather,
  Post,
-  Category,
-  HeaderImage,
  Application,
  Experience,
  Education,
@@ -14,14 +12,12 @@ import type {
  Skill,
 } from '@lib/directusTypes';

-import { getDirectusURL } from '@/scripts/url';
+import { getDirectusURL } from '@/support/url';

 type Schema = {
  site_global: Global;
  site_weather: Weather;
  posts: Post[];
-  categories: Category[];
-  header_images: HeaderImage[];
  site_applications: Application;
  site_experience: Experience;
  site_education: Education;
--- a/src/lib/directusTypes.ts
+++ b/src/lib/directusTypes.ts
@@ -10,10 +10,16 @@ export type Global = {
  site_url: string;
  rybbit_site_id: string;
  logo: string;
-  all_logoLight: string;
-  all_logoDark: string;
  portrait: string;
  portrait_alt: string;
+  home_image: string;
+  home_image_alt: string;
+  blog_image: string;
+  blog_image_alt: string;
+  categories_image: string;
+  categories_image_alt: string;
+  applications_image: string;
+  applications_image_alt: string;
  footer_image: string;
  footer_image_alt: string;
 };
@@ -31,7 +37,7 @@ export type Post = {
  title: string;
  description: string;
  tags: string[];
-  category: Category;
+  category: string;
  selected: boolean;
  published: boolean;
  content: string;
@@ -43,20 +49,6 @@ export type Post = {
  updated_date: Date;
 };

-export type Category = {
-  slug: string;
-  title: string;
-  description: string;
-  logoLight: string;
-  logoDark: string;
-};
-
-export type HeaderImage = {
-  id: string;
-  image: string;
-  image_alt: string;
-};
-
 export type Application = {
  id: string;
  name: string;
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -86,6 +86,24 @@ const global = await directus.request(readSingleton('site_global'));
    const randomFact = funFacts[Math.floor(Math.random() * funFacts.length)];
    funFactElement.textContent = randomFact;
  }
+
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      // Animate group 1
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          100 + index * 150
+        );
+      });
+    };
+
+    animateContent();
+  });
 </script>

 <style>
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@@ -9,6 +9,8 @@ import SkillsSliderSection from '@components/sections/SkillsSliderSection.astro'
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';

+import portraitImg from '@images/portrait.avif';
+
 const global = await directus.request(readSingleton('site_global'));
 ---

@@ -35,6 +37,9 @@ const global = await directus.request(readSingleton('site_global'));
  <HeroSection
    title="About Me"
    subTitle={global.about}
+    src={portraitImg}
+    alt={global.portrait_alt}
+    rounded={true}
  />

  <section class="max-w-7xl px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto">
@@ -47,3 +52,33 @@ const global = await directus.request(readSingleton('site_global'));
  </section>

 </BaseLayout>
+
+<script>
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          50 + index * 100
+        );
+      });
+
+      // Animate with just fade in with staggered delay
+      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+      smoothRevealFade.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal-fade');
+          },
+          100 + index * 250
+        );
+      });
+    };
+
+    animateContent();
+  });
+</script>
--- a/src/pages/all.astro
+++ b/src/pages/all.astro
@@ -1,54 +0,0 @@
---
-import { readItems, readSingleton } from '@directus/sdk';
-
-import HeaderSection from '@components/sections/HeaderSection.astro';
-import BlogCard from '@components/cards/BlogCard.astro';
-import BaseLayout from '@layouts/BaseLayout.astro';
-import directus from '@lib/directus';
-
-const global = await directus.request(readSingleton('site_global'));
-const posts = await directus.request(
-  readItems('posts', {
-    filter: { published: { _eq: true } },
-    fields: ['*', { category: ['*'] }],
-    sort: ['-published_date'],
-  })
-);
---
-
-<BaseLayout
-  title="All Posts"
-  description="Browse all articles from every category."
-  structuredData={{
-    '@context': 'https://schema.org',
-    '@type': 'WebPage',
-    inLanguage: 'en-US',
-    '@id': Astro.url.href,
-    url: Astro.url.href,
-    name: `All Posts | ${global.name}`,
-    description: "Browse all articles from every category.",
-    isPartOf: {
-      url: `${global.site_url}`,
-      name: global.name,
-      description: global.about,
-    },
-  }}
->
-
-  <HeaderSection
-    title="All Posts"
-    subTitle="Browse all posts from every category."
-    btnExists
-    btnTitle="To Categories"
-    btnURL="/categories"
-  />
-
-  <section class="max-w-340 2xl:max-w-full mb-10 px-4 sm:px-6 lg:px-8 py-8 mx-auto mt-10">
-    <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
-      {posts.map((b) => 
-      <BlogCard post={b} />
-      )}
-    </div>
-  </section>
-
-</BaseLayout>
--- a/src/pages/apps.astro
+++ b/src/pages/apps.astro
@@ -6,6 +6,8 @@ import ApplicationSection from '@components/sections/ApplicationSection.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';

+import applicationImg from '@images/cedar_tree.png';
+
 const global = await directus.request(readSingleton('site_global'));
 ---

@@ -32,8 +34,30 @@ const global = await directus.request(readSingleton('site_global'));
  <HeroSection
    title="Applications"
    subTitle={global.about_applications}
+    src={applicationImg}
+    alt={global.applications_image_alt}
  />

  <ApplicationSection className="smooth-reveal-2" />

 </BaseLayout>
+
+<script>
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      // Animate group 1
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          50 + index * 100
+        );
+      });
+    };
+
+    animateContent();
+  });
+</script>
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -1,64 +1,54 @@
 ---
+import { type CollectionEntry, getCollection } from 'astro:content';
 import { Image } from 'astro:assets';
+import getReadingTime from 'reading-time';
 import { marked } from 'marked';
 import markedShiki from 'marked-shiki';
 import { createHighlighter } from 'shiki';
 import { readItems, readSingleton } from '@directus/sdk';
-import "photoswipe/style.css";
-
-import type { Post } from '@/lib/directusTypes'

 import SocialShareButton from '@components/buttons/SocialShareButton.astro';
-import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
-import { getDirectusImageURL } from '@/scripts/url';
+import { formatDate } from '@support/time';
+import { getDirectusImageURL } from '@/support/url';
+
+const post = Astro.props;

 export async function getStaticPaths() {
-  const posts = await directus.request(readItems('posts', {
-    fields: ['*', { category: ['*'] }],
-  }));
-  const globalData = await directus.request(readSingleton('site_global'));
-  const highlighter = await createHighlighter({
-    themes: ['github-light', 'github-dark'],
-    langs: ['typescript', 'python', 'css', 'html', 'yaml', 'bash', 'json'],
-  });
-  const renderer = {
-    image({ href, title, text }: { href: string; title: string | null; text: string }) {
-      return `
-        <a 
-          href="${href}" 
-          class="pswp-link" 
-          data-pswp-src="${href}" 
-          target="_blank"
-        >
-          <img src="${href}" alt="${text}" title="${title || ''}" loading="lazy" />
-        </a>
-      `;
-    },
-  };
-  marked.use({ renderer });
-  marked.use(markedShiki({
-    highlight(code, lang) {
-      return highlighter.codeToHtml(code, {
-        lang: lang || 'plaintext',
-        themes: { light: 'github-light', dark: 'github-dark' },
-        defaultColor: false,
-      });
-    }
-  }));
-
-  return posts.map((post: Post) => ({
+  const posts = await directus.request(readItems('posts'));
+  return posts.map((post) => ({
    params: { slug: post.slug },
-    props: {
-      post,
-      global: globalData,
-      content: marked.parse(post.content || ''),
-    },
+    props: post,
  }));
 }

-const { post, global, content } = Astro.props;
+const global = await directus.request(readSingleton('site_global'));
+const category: CollectionEntry<'categories'> = (await getCollection('categories'))
+  .filter((c) => c.slug === post.category)
+  .pop() as CollectionEntry<'categories'>;
+
+const readingTime = getReadingTime(post.content);
+
+const highlighter = await createHighlighter({
+  themes: ['github-light', 'github-dark'],
+  langs: ['typescript', 'python', 'css', 'html', 'yaml', 'bash', 'json'],
+});
+
+marked.use(markedShiki({
+  highlight(code, lang) {
+    return highlighter.codeToHtml(code, {
+      lang: lang || 'plaintext',
+      themes: {
+        light: 'github-light',
+        dark: 'github-dark',
+      },
+      defaultColor: false,
+    });
+  }
+}));
+
+const content = marked.parse(post.content);
 ---

 <BaseLayout
@@ -78,7 +68,7 @@ const { post, global, content } = Astro.props;
      name: global.name,
      description: global.about,
    },
-    image: [getDirectusImageURL(post.image)],
+    image: [],
    headline: post.title,
    datePublished: post.published_date,
    dateModified: post.updated_date,
@@ -98,7 +88,7 @@ const { post, global, content } = Astro.props;
        <Image
          class="rounded-2xl sm:rounded-b-none w-full max-h-150 object-cover"
          src={getDirectusImageURL(post.image)}
-          alt={post.image_alt || post.title}
+          alt={post.image_alt}
          draggable="false"
          format="webp"
          loading="lazy"
@@ -109,12 +99,33 @@ const { post, global, content } = Astro.props;
            <h2 class="card-text-header block">
              {post.title}
            </h2>
-            <div class="mt-4 sm:mt-6">
-              <PostMetadataSnippet
-                post={post}
-                dateFormat='long'
-              />
-            </div>
+            <ol class="flex items-center justify-center sm:justify-start whitespace-nowrap gap-2 sm:gap-0 mt-6 sm:mt-4">
+              <li class="inline-flex items-center">
+                <a
+                  class="inline-flex items-center text-secondary hover:text-secondary-hover text-sm transition-all duration-300"
+                  href=`/categories/${category.slug}`
+                  data-astro-prefetch
+                >
+                  {category?.data?.title}
+                </a>
+                <span class="shrink-0 text-secondary text-sm mx-2 sm:mx-4">
+                  /
+                </span>
+              </li>
+              <li class="inline-flex items-center">
+                <span class="shrink-0 text-secondary text-sm">
+                  {formatDate(post.published_date)}
+                </span>
+                <span class="shrink-0 text-secondary text-sm mx-2 sm:mx-4">
+                  /
+                </span>
+              </li>
+              <li class="inline-flex items-center">
+                <span class="shrink-0 text-secondary text-sm">
+                  {readingTime.minutes.toPrecision(1)} minutes to read
+                </span>
+              </li>
+            </ol>
          </div>
          <div class="border-t border-divider mt-10 mb-10"/>

@@ -123,15 +134,13 @@ const { post, global, content } = Astro.props;
          </article>

          <div class="grid sm:flex sm:items-center sm:justify-between gap-y-5 sm:gap-y-0 max-w-5xl mx-auto mt-10 md:mt-14">
-            {post.tags && post.tags.length > 0 && (
-              <div class="flex flex-wrap sm:flex-nowrap sm:items-center gap-x-2 gap-y-1 sm:gap-y-0">
-                {post.tags.map((tag: string) => (
-                <span class="inline-flex items-center button-base bg-cobalt dark:bg-turquoise text-neutral-100 text-xs font-bold rounded-lg gap-x-1.5 px-3 py-1.5">
-                  {tag}
-                </span>
-                ))}
-              </div>
-            )}
+            <div class="flex flex-wrap sm:flex-nowrap sm:items-center gap-x-2 gap-y-1 sm:gap-y-0">
+              {post.tags.map((tag: string) => (
+              <span class="inline-flex items-center button-base bg-cobalt dark:bg-turquoise text-neutral-100 text-xs font-bold rounded-lg gap-x-1.5 px-3 py-1.5">
+                {tag}
+              </span>
+              ))}
+            </div>
            <SocialShareButton pageTitle={post.title}/>
          </div>
        </div>
@@ -154,3 +163,22 @@ const { post, global, content } = Astro.props;
  </style>

 </BaseLayout>
+
+<script>
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          100 + index * 100
+        );
+      });
+    };
+
+    animateContent();
+  });
+</script>
--- a/src/pages/blog/index.astro
+++ b/src/pages/blog/index.astro
@@ -9,16 +9,18 @@ import RecentPostsSection from '@components/sections/RecentPostsSection.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';

+import blogImg from '@images/autumn_tree.png';
+
 const global = await directus.request(readSingleton('site_global'));
 const posts = await directus.request(
  readItems('posts', {
    filter: { published: { _eq: true } },
-    fields: ['*', { category: ['*'] }],
+    fields: ['*'],
    sort: ['-published_date'],
  })
 );

-const selectedPosts: Post[] = posts.filter((p) => p.selected).slice(0, 4);
+const selectedPosts: Post[] = posts.filter((p) => p.selected).slice(0, 3);
 const recentPosts: Post[] = posts.filter(
  (p) => !selectedPosts.some((selected) => selected.slug === p.slug)
  ).slice(0, 9);
@@ -47,6 +49,8 @@ const recentPosts: Post[] = posts.filter(
  <HeroSection
    title="Blog"
    subTitle={global.about_blog}
+    src={blogImg}
+    alt={global.blog_image_alt}
  />

  <SelectedPostsSection posts={selectedPosts} />
@@ -57,3 +61,56 @@ const recentPosts: Post[] = posts.filter(
  />

 </BaseLayout>
+
+<script>
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      // Animate group 1
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          200 + index * 300
+        );
+      });
+
+      // Animate group 2
+      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
+      smoothReveal2.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          500 + index * 100
+        );
+      });
+
+      // Animate topic cards with staggered delay
+      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
+      smoothRevealCards.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          1000 + index * 250
+        );
+      });
+
+      // Animate with just fade in with staggered delay
+      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+      smoothRevealFade.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal-fade');
+          },
+          100 + index * 250
+        );
+      });
+    };
+
+    animateContent();
+  });
+</script>
--- a/src/pages/categories/[...slug].astro
+++ b/src/pages/categories/[...slug].astro
@@ -1,4 +1,5 @@
 ---
+import { getCollection } from 'astro:content';
 import { readItems, readSingleton } from '@directus/sdk';

 import type { Post } from '@lib/directusTypes';
@@ -8,13 +9,13 @@ import BlogCard from '@components/cards/BlogCard.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';

-const category = Astro.props;
+const { category } = Astro.props;

 export async function getStaticPaths() {
-  const categories = await directus.request(readItems('categories'));
+  const categories = await getCollection('categories');
  return categories.map((category) => ({
    params: { slug: category.slug },
-    props: category,
+    props: { category },
  }));
 }

@@ -22,7 +23,7 @@ const global = await directus.request(readSingleton('site_global'));
 const posts = await directus.request(
  readItems('posts', {
    filter: { published: { _eq: true } },
-    fields: ['*', { category: ['*'] }],
+    fields: ['*'],
    sort: ['-published_date'],
  })
 );
@@ -30,21 +31,21 @@ const posts = await directus.request(
 const categoriesPosts = posts
  .sort((a: Post, b: Post) => b.published_date.valueOf() - a.published_date.valueOf())
  .filter((b) => {
-    return b.category?.slug === category.slug;
+    return b.category === category.slug;
  });
 ---

 <BaseLayout
-  title={category.title}
-  description={category.description}
+  title={category.data.title}
+  description={category.data.description}
  structuredData={{
    '@context': 'https://schema.org',
    '@type': 'WebPage',
    inLanguage: 'en-US',
    '@id': Astro.url.href,
    url: Astro.url.href,
-    name: `${category.title} | ${global.name}`,
-    description: category.description,
+    name: `${category.data.title} | ${global.name}`,
+    description: category.data.description,
    isPartOf: {
      url: `${global.site_url}/categories`,
      name: global.name,
@@ -54,22 +55,17 @@ const categoriesPosts = posts
 >

  <HeaderSection
-    title=`${category.title}`
-    subTitle={category.description}
-    logoExists
-    logoLight={category.logoLight}
-    logoDark={category.logoDark}
+    title={category.data.title}
+    subTitle={category.data.description}
    btnExists
    btnTitle="Back to Categories"
    btnURL="/categories"
  />

  <section class="max-w-340 2xl:max-w-full mb-10 px-4 sm:px-6 lg:px-8 py-8 mx-auto mt-10">
-    <div class="columns-1 sm:columns-2 lg:columns-3 gap-6">
+    <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
      {categoriesPosts.map((b) => 
-      <div class="break-inside-avoid mb-6">
-        <BlogCard post={b} />
-      </div>
+      <BlogCard post={b} />
      )}
    </div>
  </section>
--- a/src/pages/categories/index.astro
+++ b/src/pages/categories/index.astro
@@ -6,6 +6,8 @@ import CategorySection from '@components/sections/CategorySection.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';

+import categoryImg from '@images/autumn_bench.png';
+
 const global = await directus.request(readSingleton('site_global'));
 ---

@@ -32,8 +34,63 @@ const global = await directus.request(readSingleton('site_global'));
  <HeroSection
    title="Categories"
    subTitle={global.about_categories}
+    src={categoryImg}
+    alt={global.categories_image_alt}
  />

  <CategorySection />

 </BaseLayout>
+
+<script>
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      // Animate group 1
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          50 + index * 100
+        );
+      });
+
+      // Animate group 2
+      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
+      smoothReveal2.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          200 + index * 150
+        );
+      });
+
+      // Animate topic cards with staggered delay
+      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
+      smoothRevealCards.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          500 + index * 100
+        );
+      });
+
+      // Animate with just fade in with staggered delay
+      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+      smoothRevealFade.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal-fade');
+          },
+          100 + index * 250
+        );
+      });
+    };
+
+    animateContent();
+  });
+</script>
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -11,12 +11,14 @@ import GiteaSection from '@components/sections/GiteaSection.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';

+import homeImg from '@images/autumn_mountain.png';
+
 const global = await directus.request(readSingleton('site_global'));
 const weather = await directus.request(readSingleton('site_weather'));
 const posts = await directus.request(
  readItems('posts', {
    filter: { published: { _eq: true } },
-    fields: ['*', { category: ['*'] }],
+    fields: ['*'],
    sort: ['-published_date'],
  })
 );
@@ -51,39 +53,25 @@ const recentPosts = posts
    subTitle={global.about_description}
    primaryBtn="About Me"
    primaryBtnURL="/about"
+    src={homeImg}
+    alt={global.home_image_alt}
  />

  <FeatureSection />

-  <RecentPostsSection
-    posts={recentPosts}
-    title="Latest Posts"
-    subTitle="Checkout my most recent thoughts here"
-  />
-
  <WeatherSection
    server:defer
    latitude={weather.latitude}
    longitude={weather.longitude}
    cityName={weather.location}
    timezone={weather.timezone}
-  >
-    <div slot="fallback" class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-8">
-      <div class="text-center max-w-2xl mx-auto mb-10 lg:mb-14">
-        <h1 class="smooth-reveal card-text-header block">
-          Loading weather...
-        </h1>
-        <div class="smooth-reveal mx-auto mt-5 max-w-3xl text-center flex justify-center">
-          <div class="h-6 w-64"></div>
-        </div>
-      </div>
-      <div class="flex flex-wrap justify-center gap-4 lg:gap-6">
-        {Array.from({ length: 5 }).map((_, index) => (
-          <div class={`card-base h-62.5 w-40 animate-pulse bg-neutral-200 dark:bg-neutral-800 ${index === 3 ? "hidden min-[800px]:block" : index >= 4 ? "hidden min-[1100px]:block" : ""}`}></div>
-        ))}
-      </div>
-    </div>
-  </WeatherSection>
+  />
+
+  <RecentPostsSection
+    posts={recentPosts}
+    title="Latest Posts"
+    subTitle="Checkout my most recent thoughts here"
+  />

  <GiteaSection
    title="Follow me on Gitea"
@@ -92,3 +80,62 @@ const recentPosts = posts
  />

 </BaseLayout>
+
+<script>
+  // Add smooth reveal animations for content after loading
+  document.addEventListener('astro:page-load', () => {
+    const animateContent = () => {
+      // Animate group 1
+      const smoothReveal = document.querySelectorAll('.smooth-reveal');
+      smoothReveal.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          50 + index * 100
+        );
+      });
+
+      // Animate group 2
+      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
+      smoothReveal2.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          200 + index * 250
+        );
+      });
+
+      // Animate topic cards with staggered delay
+      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
+      smoothRevealCards.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal');
+          },
+          400 + index * 250
+        );
+      });
+
+      // Animate with just fade in with staggered delay
+      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+      smoothRevealFade.forEach((el, index) => {
+        setTimeout(
+          () => {
+            el.classList.add('animate-reveal-fade');
+          },
+          100 + index * 250
+        );
+      });
+    };
+
+    animateContent();
+
+    const observer = new MutationObserver(() => {
+      animateContent();
+    });
+
+    observer.observe(document.body, { childList: true, subtree: true });
+  });
+</script>
--- a/src/pages/rss.xml.ts
+++ b/src/pages/rss.xml.ts
@@ -4,8 +4,6 @@ import rss, { type RSSFeedItem } from '@astrojs/rss';
 import type { APIContext } from 'astro';
 import { transform, walk } from 'ultrahtml';
 import sanitize from 'ultrahtml/transformers/sanitize';
-import MarkdownIt from 'markdown-it';
-
 import { readItems, readSingleton } from '@directus/sdk';

 import directus from '@lib/directus';
@@ -14,8 +12,6 @@ const global = await directus.request(readSingleton('site_global'));

 export async function GET(context: APIContext) {
  let baseUrl = context.site?.href || global.site_url;
-  const parser = new MarkdownIt();
-
  if (baseUrl.at(-1) === '/') {
    baseUrl = baseUrl.slice(0, -1);
  }
@@ -30,7 +26,7 @@ export async function GET(context: APIContext) {

  const feedItems: RSSFeedItem[] = [];
  for (const post of posts) {
-    const content = await transform(parser.render(post.content), [
+    const content = await transform(post.content.replace(/^<!DOCTYPE html>/, ''), [
      async (node) => {
        await walk(node, (node) => {
          if (node.name === 'a' && node.attributes.href?.startsWith('/')) {
--- a/src/scripts/animations.ts
+++ b/src/scripts/animations.ts
@@ -1,31 +0,0 @@
-const animateContent = () => {
-  const smoothReveal = document.querySelectorAll('.smooth-reveal');
-  smoothReveal.forEach((el, index) => {
-    setTimeout(() => {
-      el.classList.add('animate-reveal');
-    }, 50 + index * 100);
-  });
-
-  const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-  smoothReveal2.forEach((el, index) => {
-    setTimeout(() => {
-      el.classList.add('animate-reveal');
-    }, 200 + index * 250);
-  });
-
-  const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-  smoothRevealCards.forEach((el, index) => {
-    setTimeout(() => {
-      el.classList.add('animate-reveal');
-    }, 400 + index * 250);
-  });
-
-  const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-  smoothRevealFade.forEach((el, index) => {
-    setTimeout(() => {
-      el.classList.add('animate-reveal-fade');
-    }, 100 + index * 250);
-  });
-};
-
-export { animateContent  };
--- a/src/scripts/photoswipe.ts
+++ b/src/scripts/photoswipe.ts
@@ -1,38 +0,0 @@
-import PhotoSwipeLightbox from 'photoswipe/lightbox';
-import PhotoSwipe from "photoswipe";
-
-let lightbox: PhotoSwipeLightbox | null = null;
-
-function initPhotoSwipe() {
-  const links = document.querySelectorAll<HTMLAnchorElement>('a.pswp-link');
-  
-  links.forEach((link) => {
-    const img = link.querySelector('img');
-    if (img) {
-      const applyDimensions = () => {
-        link.dataset.pswpWidth = (img.naturalWidth || 1920).toString();
-        link.dataset.pswpHeight = (img.naturalHeight || 1080).toString();
-      };
-      if (img.complete) {
-        applyDimensions();
-      } else {
-        img.addEventListener('load', applyDimensions);
-      }
-    }
-  });
-
-  if (lightbox) {
-    lightbox.destroy();
-  }
-
-  lightbox = new PhotoSwipeLightbox({
-    gallery: '.prose',
-    children: 'a.pswp-link',
-    pswpModule: PhotoSwipe,
-    allowPanToNext: true,
-  });
-  
-  lightbox.init();
-}
-
-export { initPhotoSwipe };
--- a/src/scripts/time.ts
+++ b/src/scripts/time.ts
@@ -1,28 +0,0 @@
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-
-dayjs.extend(relativeTime);
-
-function formatFromNow(date: Date | null): string {
-  if (!date) {
-    return 'none';
-  }
-  return dayjs(date).fromNow()
-}
-
-function formatDate(date: Date): string {
-  return new Date(date).toLocaleDateString('en-US', {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-  })
-}
-
-function formatShortDate(date: Date): string {
-  return new Date(date).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-  })
-}
-
-export { formatFromNow, formatDate, formatShortDate,  };
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -1,7 +1,6 @@
@import 'tailwindcss';
-@import './utilities-buttons.css';
-@import './utilities-cards.css';
-@import './utilities-misc.css';
+@import 'preline/variants.css';
+@import './utilities.css';

@plugin '@tailwindcss/typography';
@plugin '@tailwindcss/forms';
@@ -41,33 +40,10 @@

  /* Object colors */
  --color-background: light-dark(var(--color-neutral-200), var(--color-stone-700));
-  --color-background-accent: light-dark(color-mix(in srgb, var(--color-slate-300) 40%, transparent), color-mix(in srgb, var(--color-stone-800) 20%, transparent));
+  --color-background-accent: light-dark(color-mix(in srgb, var(--color-neutral-300) 40%, transparent), color-mix(in srgb, var(--color-stone-800) 20%, transparent));
  --color-background-card: light-dark(color-mix(in srgb, var(--color-neutral-100) 80%, transparent), color-mix(in srgb, var(--color-neutral-800) 60%, transparent));

-  --color-divider: light-dark(color-mix(in srgb, var(--color-slate-400) 40%, transparent), color-mix(in srgb, var(--color-neutral-500) 50%, transparent));
-
-  /* Typography */
-  --color-prose-blog-body: var(--color-neutral-700);
-  --color-prose-blog-headings: var(--color-neutral-900);
-  --color-prose-blog-links: var(--color-orange-300);
-  
-  --color-prose-blog-invert-body: var(--color-neutral-400);
-  --color-prose-blog-invert-headings: var(--color-neutral-200);
-
-  --radius-markdown-img: 0.5rem;
-
-  /* Reveal Animations */
-  --animate-reveal: reveal 0.8s ease forwards;
-  --animate-reveal-fade: reveal-fade 1.8s ease forwards;
-
-  @keyframes reveal {
-    from { opacity: 0; transform: translateY(20px); }
-    to { opacity: 1; transform: translateY(0); }
-  }
-  @keyframes reveal-fade {
-    from { opacity: 0; }
-    to { opacity: 1; }
-  }
+  --color-divider: light-dark(color-mix(in srgb, var(--color-neutral-400) 50%, transparent), color-mix(in srgb, var(--color-neutral-500) 50%, transparent));
 }

@layer base {
@@ -76,6 +52,7 @@
    -moz-osx-font-smoothing: grayscale;
    
    --theme-transition: 0.3s ease;
+    --scroll-offset: 0px;
  }

  :root:where(.dark, .dark *) {
@@ -114,54 +91,7 @@
      border-color var(--theme-transition);
  }

-  /* Typography */
-  .prose blockquote {
-    font-style: normal;
-    quotes: none;
-  }
-
-  .prose img {
-    @apply rounded-lg;
-  }
-
-  .prose-blog {
-    --tw-prose-body: var(--color-neutral-700);
-    --tw-prose-headings: var(--color-neutral-900);
-    --tw-prose-lead: var(--color-neutral-700);
-    --tw-prose-links: var(--color-orange-300);
-    --tw-prose-bold: var(--color-neutral-900);
-    --tw-prose-counters: var(--color-neutral-600);
-    --tw-prose-bullets: var(--color-neutral-400);
-    --tw-prose-hr: var(--color-neutral-300);
-    --tw-prose-quotes: var(--color-neutral-500);
-    --tw-prose-quote-borders: var(--color-neutral-300);
-    --tw-prose-captions: var(--color-neutral-700);
-    --tw-prose-code: var(--color-neutral-700);
-    --tw-prose-pre-code: var(--color-neutral-900);
-    --tw-prose-pre-bg: var(--color-white);
-    --tw-prose-th-borders: var(--color-neutral-300);
-    --tw-prose-td-borders: var(--color-neutral-200);
-
-    &:where(.dark, .dark *) {
-      --tw-prose-body: var(--color-neutral-400);
-      --tw-prose-headings: var(--color-neutral-200);
-      --tw-prose-lead: var(--color-neutral-300);
-      --tw-prose-links: var(--color-orange-300);
-      --tw-prose-bold: var(--color-neutral-300);
-      --tw-prose-counters: var(--color-neutral-400);
-      --tw-prose-bullets: var(--color-neutral-600);
-      --tw-prose-hr: var(--color-neutral-700);
-      --tw-prose-quotes: var(--color-neutral-500);
-      --tw-prose-quote-borders: var(--color-neutral-500);
-      --tw-prose-captions: var(--color-neutral-400);
-      --tw-prose-code: var(--color-neutral-350);
-      --tw-prose-pre-code: var(--color-neutral-300);
-      --tw-prose-th-borders: var(--color-neutral-600);
-      --tw-prose-td-borders: var(--color-neutral-700);
-    }
-  }
-
-  /* Shiki */
+  /* Shiki syntax highlighting */
  :root {
    --shiki-fg: var(--shiki-light);
    --shiki-bg: var(--color-neutral-200);
@@ -185,3 +115,32 @@
    color: var(--shiki-dark) !important;
  }
 }
+
+/* Content reveal animations */
+.smooth-reveal,
+.smooth-reveal-2,
+.smooth-reveal-cards {
+  opacity: 0;
+  transform: translateY(20px);
+  transition:
+    opacity 0.8s ease,
+    transform 0.8s ease;
+}
+
+.animate-reveal {
+  opacity: 1 !important;
+  transform: translateY(0) !important;
+}
+
+.smooth-reveal-fade {
+  opacity: 0;
+  transform: translateY(0px);
+  transition:
+    opacity 1.8s ease,
+    transform 0.8s ease;
+}
+
+.animate-reveal-fade {
+  opacity: 1 !important;
+  transform: translateY(0) !important;
+}
--- a/src/styles/utilities-buttons.css
+++ b/src/styles/utilities-buttons.css
@@ -1,51 +0,0 @@
-@utility button-base {
-  @apply transition-all duration-300
-         border border-transparent
-         shadow-sm hover:shadow-md dark:shadow-md dark:hover:shadow-lg
-         px-4 py-3
-}
-
-@utility button-base-hidden {
-  @apply transition-all duration-300
-         border border-transparent
-         hover:bg-neutral-200 dark:hover:bg-neutral-700
-         p-2
-}
-
-@utility button-hover-arrow {
-  @apply translate-y-px transition duration-300
-         group-hover:translate-x-1
-         h-3 w-3 md:h-5 md:w-5
-}
-
-@utility button-text-title {
-  @apply text-neutral-200 2xl:text-base
-         text-sm font-bold
-}
-
-@utility button-text-title-hidden {
-  @apply transition-all duration-300
-         text-neutral-600 group-hover:text-neutral-700 dark:text-neutral-400 dark:group-hover:text-neutral-300 2xl:text-base
-         text-sm font-medium
-}
-
-@utility button-bg-blue {
-  @apply transition-all duration-300
-         bg-cobalt hover:bg-steel dark:bg-steel dark:hover:bg-cobalt
-}
-
-@utility button-bg-teal {
-  @apply transition-all duration-300
-         bg-bermuda hover:bg-turquoise group-hover:bg-turquoise dark:bg-turquoise dark:hover:bg-bermuda dark:group-hover:bg-bermuda 
-}
-
-@utility button-bg-neutral {
-  @apply transition-all duration-300
-         border border-neutral-100 dark:border-stone-500/20
-         bg-background-card hover:bg-neutral-100 dark:hover:bg-neutral-800/90
-}
-
-@utility button-bg-gitea {
-  @apply transition-all duration-300
-         bg-gitea-primary hover:bg-gitea-secondary dark:bg-gitea-secondary dark:hover:bg-gitea-primary
-}
--- a/src/styles/utilities-misc.css
+++ b/src/styles/utilities-misc.css
@@ -1,44 +0,0 @@
-/* Nav */
-@utility nav-base {
-  @apply border border-neutral-100 dark:border-stone-500/20
-         bg-neutral-100 dark:bg-neutral-800
-         shadow-xs dark:shadow-md
-}
-
-/* Fade edges of a div */
-@utility mask-fade-edges {
-  -webkit-mask-image: 
-    linear-gradient(to right, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent),
-    linear-gradient(to bottom, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent);
-  mask-image: 
-    linear-gradient(to right, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent),
-    linear-gradient(to bottom, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent);
-
-  -webkit-mask-composite: source-in;
-  mask-composite: intersect;
-}
-
-/* Animations */
-@utility smooth-reveal {
-  opacity: 0;
-  transform: translateY(20px);
-  transition: opacity 0.8s ease, transform 0.8s ease;
-}
-
-@utility smooth-reveal-2 {
-  opacity: 0;
-  transform: translateY(20px);
-  transition: opacity 0.8s ease, transform 0.8s ease;
-}
-
-@utility smooth-reveal-cards {
-  opacity: 0;
-  transform: translateY(20px);
-  transition: opacity 0.8s ease, transform 0.8s ease;
-}
-
-@utility smooth-reveal-fade {
-  opacity: 0;
-  transform: translateY(0px);
-  transition: opacity 1.8s ease, transform 0.8s ease;
-}
--- a/src/styles/utilities-cards.css
+++ b/src/styles/utilities-cards.css
@@ -1,3 +1,57 @@
+/* Button classes */
+@utility button-base {
+  @apply transition-all duration-300
+         border border-transparent
+         shadow-sm hover:shadow-md dark:shadow-md dark:hover:shadow-lg
+         px-4 py-3
+}
+
+@utility button-base-hidden {
+  @apply transition-all duration-300
+         border border-transparent
+         hover:bg-neutral-200 dark:hover:bg-neutral-700
+         p-2
+}
+
+@utility button-hover-arrow {
+  @apply translate-y-px transition duration-300
+         group-hover:translate-x-1
+         h-3 w-3 md:h-5 md:w-5
+}
+
+@utility button-text-title {
+  @apply text-neutral-200 2xl:text-base
+         text-sm font-bold
+}
+
+@utility button-text-title-hidden {
+  @apply transition-all duration-300
+         text-neutral-600 group-hover:text-neutral-700 dark:text-neutral-400 dark:group-hover:text-neutral-300 2xl:text-base
+         text-sm font-medium
+}
+
+@utility button-bg-blue {
+  @apply transition-all duration-300
+         bg-cobalt hover:bg-steel dark:bg-steel dark:hover:bg-cobalt
+}
+
+@utility button-bg-teal {
+  @apply transition-all duration-300
+         bg-bermuda hover:bg-turquoise group-hover:bg-turquoise dark:bg-turquoise dark:hover:bg-bermuda dark:group-hover:bg-bermuda 
+}
+
+@utility button-bg-neutral {
+  @apply transition-all duration-300
+         border border-neutral-100 dark:border-stone-500/20
+         bg-background-card hover:bg-neutral-100 dark:hover:bg-neutral-800/90
+}
+
+@utility button-bg-gitea {
+  @apply transition-all duration-300
+         bg-gitea-primary hover:bg-gitea-secondary dark:bg-gitea-secondary dark:hover:bg-gitea-primary
+}
+
+/* Card classes */
@utility card-base {
  @apply transition-all duration-300
         rounded-xl
@@ -22,7 +76,7 @@
@utility card-hover-icon-scale {
  @apply transition-transform duration-300 will-change-transform 
         drop-shadow-md dark:drop-shadow-xl dark:drop-shadow-neutral-500/60
-         group-hover:scale-3d group-hover:scale-105
+         group-hover:scale-3d group-hover:scale-110
 }

@utility card-text-header {
@@ -73,7 +127,9 @@
  @apply text-secondary
 }

-@utility card-hover-text-description {
-  @apply transition-all duration-300
-       text-secondary-hover
+/* Misc */
+@utility nav-base {
+  @apply border border-neutral-100 dark:border-stone-500/20
+         bg-neutral-100 dark:bg-neutral-800
+         shadow-xs dark:shadow-md
 }
--- a/src/support/animation.ts
+++ b/src/support/animation.ts
@@ -0,0 +1,50 @@
+// Add smooth reveal animations for content after loading
+document.addEventListener('astro:page-load', () => {
+  const animateContent = () => {
+    // Animate group 1
+    const smoothReveal = document.querySelectorAll('.smooth-reveal');
+    smoothReveal.forEach((el, index) => {
+      setTimeout(
+        () => {
+          el.classList.add('animate-reveal');
+        },
+        50 + index * 100
+      );
+    });
+
+    // Animate group 2
+    const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
+    smoothReveal2.forEach((el, index) => {
+      setTimeout(
+        () => {
+          el.classList.add('animate-reveal');
+        },
+        200 + index * 250
+      );
+    });
+
+    // Animate topic cards with staggered delay
+    const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
+    smoothRevealCards.forEach((el, index) => {
+      setTimeout(
+        () => {
+          el.classList.add('animate-reveal');
+        },
+        400 + index * 250
+      );
+    });
+
+    // Animate with just fade in with staggered delay
+    const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+    smoothRevealFade.forEach((el, index) => {
+      setTimeout(
+        () => {
+          el.classList.add('animate-reveal-fade');
+        },
+        100 + index * 250
+      );
+    });
+  };
+
+  animateContent();
+});
--- a/src/support/paths.ts
+++ b/src/support/paths.ts
@@ -0,0 +1,21 @@
+import { join } from 'node:path';
+
+function resolveFilePath(path: string) {
+  if (path.startsWith('/')) {
+    return resolveFilePathPublic(path);
+  }
+
+  return resolveFilePathInternal(path);
+}
+
+function resolveFilePathPublic(path: string) {
+  return join(process.cwd(), path);
+}
+
+function resolveFilePathInternal(path: string) {
+  const normalizePath = path.startsWith('@') ? path.replace('@', '') : path;
+
+  return join(process.cwd(), 'src/', normalizePath);
+}
+
+export { resolveFilePath, resolveFilePathPublic, resolveFilePathInternal };
--- a/src/support/time.ts
+++ b/src/support/time.ts
@@ -0,0 +1,42 @@
+import { format, register } from 'timeago.js';
+
+const TimeAgoConfiguration: string[][] = [
+  ['today', 'today'],
+  ['%s seconds ago', 'in %s seconds'],
+  ['1 minute ago', 'in 1 minute'],
+  ['%s minutes ago', 'in %s minutes'],
+  ['1 hour ago', 'in 1 hour'],
+  ['%s hours ago', 'in %s hours'],
+  ['1 day ago', 'in 1 day'],
+  ['%s days ago', 'in %s days'],
+  ['1 week ago', 'in 1 week'],
+  ['%s weeks ago', 'in %s weeks'],
+  ['1 month ago', 'in 1 month'],
+  ['%s months ago', 'in %s months'],
+  ['1 year ago', 'in 1 year'],
+  ['%s years ago', 'in %s years'],
+];
+
+function timeago(date?: Date): string {
+  if (!date) {
+    return 'today';
+  }
+
+  const localeFunc = (number: number, index: number, _?: number): [string, string] => {
+    return TimeAgoConfiguration[index] as [string, string];
+  };
+
+  register('timeago', localeFunc);
+
+  return format(date, 'timeago');
+}
+
+function formatDate(date: Date): string {
+  return new Date(date).toLocaleDateString('en-US', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })
+}
+
+export { formatDate, timeago };
--- a/src/support/url.ts
+++ b/src/support/url.ts
@@ -6,7 +6,7 @@ const getSiteURL = () => {
  return 'https://www.alexlebens.dev';
 };

-function getDirectusImageURL(image: string) {
+async function getDirectusImageURL(image: string) {
  return `${getDirectusURL()}/assets/${image}`;
 }

--- a/src/support/weather.ts
+++ b/src/support/weather.ts
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,6 +1,64 @@
 /** @type {import('tailwindcss').Config} */

 export default {
-  content: ['./node_modules/preline/preline.js'],
-  plugins: [require('preline/plugin')],
+  content: [
+    './src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}',
+    './node_modules/preline/preline.js',
+  ],
+  darkMode: 'class',
+  theme: {
+    extend: {
+      typography: ({ theme }) => ({
+        blog: {
+          css: {
+            '--tw-prose-body': theme('colors.neutral[700]'),
+            '--tw-prose-headings': theme('colors.neutral[900]'),
+            '--tw-prose-lead': theme('colors.neutral[700]'),
+            '--tw-prose-links': theme('colors.orange[300]'),
+            '--tw-prose-bold': theme('colors.neutral[900]'),
+            '--tw-prose-counters': theme('colors.neutral[600]'),
+            '--tw-prose-bullets': theme('colors.neutral[400]'),
+            '--tw-prose-hr': theme('colors.neutral[300]'),
+            '--tw-prose-quotes': theme('colors.neutral[500]'),
+            '--tw-prose-quote-borders': theme('colors.neutral[300]'),
+            '--tw-prose-captions': theme('colors.neutral[700]'),
+            '--tw-prose-code': theme('colors.neutral[700]'),
+            '--tw-prose-pre-code': theme('colors.neutral[900]'),
+            '--tw-prose-pre-bg': theme('colors.white'),
+            '--tw-prose-th-borders': theme('colors.neutral[300]'),
+            '--tw-prose-td-borders': theme('colors.neutral[200]'),
+
+            '--tw-prose-invert-body': theme('colors.neutral[400]'),
+            '--tw-prose-invert-headings': theme('colors.neutral[200]'),
+            '--tw-prose-invert-lead': theme('colors.neutral[300]'),
+            '--tw-prose-invert-links': theme('colors.orange[300]'),
+            '--tw-prose-invert-bold': theme('colors.neutral[300]'),
+            '--tw-prose-invert-counters': theme('colors.neutral[400]'),
+            '--tw-prose-invert-bullets': theme('colors.neutral[600]'),
+            '--tw-prose-invert-hr': theme('colors.neutral[700]'),
+            '--tw-prose-invert-quotes': theme('colors.neutral[500]'),
+            '--tw-prose-invert-quote-borders': theme('colors.neutral[500]'),
+            '--tw-prose-invert-captions': theme('colors.neutral[400]'),
+            '--tw-prose-invert-code': theme('colors.neutral[350]'),
+            '--tw-prose-invert-pre-code': theme('colors.neutral[300]'),
+            '--tw-prose-invert-th-borders': theme('colors.neutral[600]'),
+            '--tw-prose-invert-td-borders': theme('colors.neutral[700]'),
+          },
+        },
+        DEFAULT: {
+          css: {
+            blockquote: {
+              fontStyle: 'normal',
+              quotes: 'none',
+            },
+          },
+        },
+      }),
+    },
+  },
+  plugins: [
+    require('tailwindcss/nesting'),
+    require('preline/plugin'),
+    require('@tailwindcss/typography'),
+  ],
 };
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,19 +4,20 @@
  "exclude": ["dist"],
  "compilerOptions": {
    "strictNullChecks": true,
-    "baseUrl": ".",
+    "baseUrl": "src",
+    "jsx": "react-jsx",
    "types": ["astro/client"],
    "paths": {
-      "@/*": ["src/*"],
+      "@/*": ["*"],
      "@src/*": ["src/*"],
-      "@lib/*": ["src/lib/*"],
-      "@components/*": ["src/components/*"],
-      "@content/*": ["src/content/*"],
-      "@layouts/*": ["src/layouts/*"],
-      "@styles/*": ["src/styles/*"],
-      "@pages/*": ["src/pages/*"],
-      "@support/*": ["src/scripts/*"],
-      "@images/*": ["src/images/*"]
+      "@lib/*": ["lib/*"],
+      "@components/*": ["components/*"],
+      "@content/*": ["content/*"],
+      "@layouts/*": ["layouts/*"],
+      "@styles/*": ["styles/*"],
+      "@pages/*": ["pages/*"],
+      "@support/*": ["support/*"],
+      "@images/*": ["images/*"]
    }
  }
 }