Merge pull request #77 from fccview/develop

Lift off

.gitignore

@@ -14,4 +14,5 @@ node_modules
 .idea
 tsconfig.tsbuildinfo
 docker-compose.test.yml
-/data
+/data
+claude.md

CONTRIBUTING.md

@@ -0,0 +1,37 @@
+# How to contribute
+
+Hi, it's amazing having a community willing to push new feature to the app, and I am VERY open to contributors pushing their idea, it's what makes open source amazing.
+
+That said for the sake of sanity let's all follow the same structure:
+
+- When creating a new branch, do off from the develop branch, this will always be ahead of main and it's what gets released
+- When creating a pull request, direct it back into develop, I'll then review it and merge it. Your code will end up in the next release that way and we all avoid conflicts!
+- Please bear with on reviews, it may take a bit of time for me to go through it all on top of life/work/hobbies :)
+
+## Some best practices
+
+### Code Quality
+
+- Follow the existing code style and structure
+- Keep files modular and under 250-300 (split into smaller components if needed) lines unless it's a major server action, these can get intense I know 
+- Avoid code duplication - reuse existing functions and UI components, don't hardcode html when a component already exists (e.g. <button> vs <Button>)
+- All imports should be at the top of the file unless it's for specific server actions
+- Avoid using `any` 
+- Don't hardcode colors! Use the theme variables to make sure light/dark mode keep working well
+- Make sure the UI is consistent with the current one, look for spacing issues, consistent spacing really makes a difference
+
+### Pull Requests
+
+- Keep PRs focused on a single feature or fix
+- Update documentation if your changes affect user-facing features
+- Test your changes locally before submitting
+
+### Getting Started
+
+1. Fork the repository
+2. Create a feature branch from `develop`
+3. Make your changes
+4. Test thoroughly
+5. Submit a pull request to `develop`
+
+Thank you for contributing! <3

Dockerfile

@@ -1,22 +1,7 @@
-FROM node:20-slim AS base
-
-RUN apt-get update && apt-get install -y \
-    pciutils \
-    curl \
-    iputils-ping \
-    util-linux \
-    ca-certificates \
-    gnupg \
-    lsb-release \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update \
-    && apt-get install -y docker-ce-cli \
-    && rm -rf /var/lib/apt/lists/*
+FROM node:20-alpine AS base
 
 FROM base AS deps
+RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
@@ -42,26 +27,27 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 
-RUN groupadd --system --gid 1001 nodejs
-RUN useradd --system --uid 1001 nextjs
+RUN apk add --no-cache su-exec docker-cli pciutils curl iputils util-linux ca-certificates
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
 
 RUN mkdir -p /app/scripts /app/data /app/snippets && \
     chown -R nextjs:nodejs /app/scripts /app/data /app/snippets
 
+RUN mkdir -p /app/.next/cache && \
+    chown -R nextjs:nodejs /app/.next
+
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
 COPY --from=builder /app/public ./public
 
-COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
-
-COPY --from=builder --chown=nextjs:nodejs /app/app ./app
-
-COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /app/yarn.lock ./yarn.lock
-
-COPY --from=deps --chown=nextjs:nodejs /app/node_modules ./node_modules
-
 EXPOSE 3000
 
 ENV PORT=3000
 ENV HOSTNAME="0.0.0.0"
 
-CMD ["yarn", "start"]
+USER nextjs
+
+CMD ["node", "server.js"]

README.md

@@ -2,7 +2,7 @@
   <img src="public/heading.png" width="400px">
 </p>
 
-## Table of Contents
+## Quick links
 
 - [Features](#features)
 - [Quick Start](#quick-start)
@@ -13,22 +13,26 @@
   - [Local Development](#local-development)
   - [Environment Variables](howto/ENV_VARIABLES.md)
 - [Authentication](#authentication)
-- [REST API](#rest-api)
 - [Usage](#usage)
   - [Viewing System Information](#viewing-system-information)
   - [Managing Cron Jobs](#managing-cron-jobs)
   - [Job Execution Logging](#job-execution-logging)
   - [Managing Scripts](#managing-scripts)
-- [Technologies Used](#technologies-used)
-- [Contributing](#contributing)
-- [License](#license)
 
----
+
+<div align="center">
+
+| Desktop | Mobile |
+|---------|--------|
+| ![Dark Mode Desktop](screenshots/home-dark.png) | ![Dark Mode Mobile](screenshots/home-dark-mobile.png) |
+| ![Light Mode Desktop](screenshots/home-light.png) | ![Light Mode Mobile](screenshots/home-light-mobile.png) |
+
+</div>
 
 ## Features
 
 - **Modern UI**: Beautiful, responsive interface with dark/light mode.
-- **System Information**: Display hostname, IP address, uptime, memory, network and CPU info.
+- **System Information**: Display uptime, memory, network, CPU, and GPU info.
 - **Cron Job Management**: View, create, and delete cron jobs with comments.
 - **Script management**: View, create, and delete bash scripts on the go to use within your cron jobs.
 - **Job Execution Logging**: Optional logging for cronjobs with automatic cleanup, capturing stdout, stderr, exit codes, and timestamps.
@@ -52,26 +56,13 @@
   <br />
 </p>
 
----
-
-<br />
-
-## Before we start
-
-Hey there! 👋 Just a friendly heads-up: I'm a big believer in open source and love sharing my work with the community. Everything you find in my GitHub repos is and always will be 100% free. If someone tries to sell you a "premium" version of any of my projects while claiming to be me, please know that this is not legitimate. 🚫
-
-If you find my projects helpful and want to fuel my late-night coding sessions with caffeine, I'd be super grateful for any support! ☕
-
 <p align="center">
   <a href="https://www.buymeacoffee.com/fccview">
-    <img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy me a coffee" width="150">
+    <img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy me a coffee" width="120">
   </a>
 </p>
 
-<div align="center">
-  <img width="500px" src="screenshots/home.png">
-  <img width="500px" src="screenshots/live-running.png" />
-</div>
+---
 
 <a id="quick-start"></a>
 
@@ -94,7 +85,6 @@ services:
       - "40123:3000"
     environment:
       - NODE_ENV=production
-      - DOCKER=true
       - NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL=30000
       - AUTH_PASSWORD=very_strong_password
       - HOST_CRONTAB_USER=root
@@ -115,7 +105,7 @@ services:
 
 ## API
 
-`cr*nmaster` includes a REST API for programmatic access to your checklists and notes. This is perfect for integrations.
+`cr*nmaster` includes a REST API for programmatic access to your cron jobs and system information. This is perfect for integrations.
 
 📖 **For the complete API documentation, see [howto/API.md](howto/API.md)**
 
@@ -131,7 +121,7 @@ services:
 
 ## Localization
 
-`cr*nmaster` officially support [some languages](app/_transations) and allows you to create your custom translations locally on your own machine.
+`cr*nmaster` officially support [some languages](app/_translations) and allows you to create your custom translations locally on your own machine.
 
 📖 **For the complete Translations documentation, see [howto/TRANSLATIONS.md](howto/TRANSLATIONS.md)**
 
@@ -229,82 +219,11 @@ Cr\*nMaster supports SSO via OIDC (OpenID Connect), compatible with providers li
 - Entra ID (Azure AD)
 - And many more!
 
-For detailed setup instructions, see **[README_SSO.md](README_SSO.md)**
-
-Quick example:
-
-```yaml
-environment:
-  - SSO_MODE=oidc
-  - OIDC_ISSUER=https://your-sso-provider.com
-  - OIDC_CLIENT_ID=your_client_id
-  - APP_URL=https://your-cronmaster-domain.com
-```
-
-### Combined Authentication
-
 You can enable **both** password and SSO authentication simultaneously:
 
-```yaml
-environment:
-  - AUTH_PASSWORD=your_password
-  - SSO_MODE=oidc
-  - OIDC_ISSUER=https://your-sso-provider.com
-  - OIDC_CLIENT_ID=your_client_id
-```
-
 The login page will display both options, allowing users to choose their preferred method.
 
-### Security Features
-
-- ✅ **Secure session management** with cryptographically random session IDs
-- ✅ **30-day session expiration** with automatic cleanup
-- ✅ **HTTP-only cookies** to prevent XSS attacks
-- ✅ **Proper JWT verification** for OIDC tokens using provider's public keys (JWKS)
-- ✅ **PKCE support** for OIDC authentication (or confidential client mode)
-
-<a id="rest-api"></a>
-
-## REST API
-
-Cr\*nMaster provides a full REST API for programmatic access. Perfect for:
-
-- External monitoring tools
-- Automation scripts
-- CI/CD integrations
-- Custom dashboards
-
-### API Authentication
-
-Protect your API with an optional API key:
-
-```yaml
-environment:
-  - API_KEY=your-secret-api-key-here
-```
-
-Use the API key in your requests:
-
-```bash
-curl -H "Authorization: Bearer YOUR_API_KEY" \
-  https://your-domain.com/api/cronjobs
-```
-
-For complete API documentation with examples, see **[howto/API.md](howto/API.md)**
-
-### Available Endpoints
-
-- `GET /api/cronjobs` - List all cron jobs
-- `POST /api/cronjobs` - Create a new cron job
-- `GET /api/cronjobs/:id` - Get a specific cron job
-- `PATCH /api/cronjobs/:id` - Update a cron job
-- `DELETE /api/cronjobs/:id` - Delete a cron job
-- `POST /api/cronjobs/:id/execute` - Manually execute a job
-- `GET /api/scripts` - List all scripts
-- `POST /api/scripts` - Create a new script
-- `GET /api/system-stats` - Get system statistics
-- `GET /api/logs/stream?runId=xxx` - Stream job logs
-- `GET /api/events` - SSE stream for real-time updates
+**For detailed setup instructions, see **[howto/SSO.md](howto/SSO.md)**
 
 <a id="usage"></a>
 
@@ -337,125 +256,7 @@ The application automatically detects your operating system and displays:
 
 ### Job Execution Logging
 
-CronMaster includes an optional logging feature that captures detailed execution information for your cronjobs:
-
-#### How It Works
-
-When you enable logging for a cronjob, CronMaster automatically wraps your command with a log wrapper script. This wrapper:
-
-- Captures **stdout** and **stderr** output
-- Records the **exit code** of your command
-- Timestamps the **start and end** of execution
-- Calculates **execution duration**
-- Stores all this information in organized log files
-
-#### Enabling Logs
-
-1. When creating or editing a cronjob, check the "Enable Logging" checkbox
-2. The wrapper is automatically added to your crontab entry
-3. Jobs run independently - they continue to work even if CronMaster is offline
-
-#### Log Storage
-
-Logs are stored in the `./data/logs/` directory with descriptive folder names:
-
-- If a job has a **description/comment**: `{sanitized-description}_{jobId}/`
-- If a job has **no description**: `{jobId}/`
-
-Example structure:
-
-```
-./data/logs/
-├── backup-database_root-0/
-│   ├── 2025-11-10_14-30-00.log
-│   ├── 2025-11-10_15-30-00.log
-│   └── 2025-11-10_16-30-00.log
-├── daily-cleanup_root-1/
-│   └── 2025-11-10_14-35-00.log
-├── root-2/  (no description provided)
-│   └── 2025-11-10_14-40-00.log
-```
-
-**Note**: Folder names are sanitized to be filesystem-safe (lowercase, alphanumeric with hyphens, max 50 chars for the description part).
-
-#### Log Format
-
-Each log file includes:
-
-```
-==========================================
-=== CronMaster Job Execution Log ===
-==========================================
-Log Folder: backup-database_root-0
-Command: bash /app/scripts/backup.sh
-Started: 2025-11-10 14:30:00
-==========================================
-
-[command output here]
-
-==========================================
-=== Execution Summary ===
-==========================================
-Completed: 2025-11-10 14:30:45
-Duration: 45 seconds
-Exit code: 0
-==========================================
-```
-
-#### Automatic Cleanup
-
-Logs are automatically cleaned up to prevent disk space issues:
-
-- **Maximum logs per job**: 50 log files
-- **Maximum age**: 30 days
-- **Cleanup trigger**: When viewing logs or after manual execution
-- **Method**: Oldest logs are deleted first when limits are exceeded
-
-#### Custom Wrapper Script
-
-You can override the default log wrapper by creating your own at `./data/wrapper-override.sh`. This allows you to:
-
-- Customize log format
-- Add additional metadata
-- Integrate with external logging services
-- Implement custom retention policies
-
-**Example custom wrapper**:
-
-```bash
-#!/bin/bash
-JOB_ID="$1"
-shift
-
-# Your custom logic here
-LOG_FILE="/custom/path/${JOB_ID}_$(date '+%Y%m%d').log"
-
-{
-  echo "=== Custom Log Format ==="
-  echo "Job: $JOB_ID"
-  "$@"
-  echo "Exit: $?"
-} >> "$LOG_FILE" 2>&1
-```
-
-#### Docker Considerations
-
-- Mount the `./data` directory to persist logs on the host
-- The wrapper script location: `./data/cron-log-wrapper.sh`. This will be generated automatically the first time you enable logging.
-
-#### Non-Docker Considerations
-
-- Logs are stored at `./data/logs/` relative to the project directory
-- The codebase wrapper script location: `./app/_scripts/cron-log-wrapper.sh`
-- The running wrapper script location: `./data/cron-log-wrapper.sh`
-
-#### Important Notes
-
-- Logging is **optional** and disabled by default
-- Jobs with logging enabled are marked with a blue "Logged" badge in the UI
-- Logs are captured for both scheduled runs and manual executions
-- Commands with file redirections (>, >>) may conflict with logging
-- The crontab stores the **wrapped command**, so jobs run independently of CronMaster
+📖 **For complete logging documentation, see [howto/LOGS.md](howto/LOGS.md)**
 
 ### Cron Schedule Format
 
@@ -477,26 +278,6 @@ The application uses standard cron format: `* * * * *`
 4. **Delete Scripts**: Remove unwanted scripts (this won't delete the cronjob, you will need to manually remove these yourself)
 5. **Clone Scripts**: Clone scripts to quickly edit them in case they are similar to one another.
 
-<a id="technologies-used"></a>
-
-## Technologies Used
-
-- **Next.js 14**: React framework with App Router
-- **TypeScript**: Type-safe JavaScript
-- **Tailwind CSS**: Utility-first CSS framework
-- **Lucide React**: Beautiful icons
-- **next-themes**: Dark/light mode support
-- **Docker**: Containerization
-
-<a id="contributing"></a>
-
-## Contributing
-
-1. Fork the repository
-2. Create a feature branch from the `develop` branch
-3. Make your changes
-4. Submit a pull request to the `develop` branch
-
 ## Community shouts
 
 I would like to thank the following members for raising issues and help test/debug them!
@@ -537,19 +318,14 @@ I would like to thank the following members for raising issues and help test/deb
         <a href="https://github.com/Navino16"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/22234867?v=4&size=100"><br />Navino16</a>
       </td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="20%">
+        <a href="https://github.com/ShadowTox"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/558536?v=4&size=100"><br />ShadowTox</a>
+      </td>
+    </tr>
   </tbody>
 </table>
 
-<a id="license"></a>
-
-## License
-
-This project is licensed under the MIT License.
-
-## Support
-
-For issues and questions, please open an issue on the GitHub repository.
-
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=fccview/cronmaster&type=Date)](https://www.star-history.com/#fccview/cronmaster&Date)

app/_components/FeatureComponents/Cronjobs/CronJobList.tsx

@@ -9,16 +9,16 @@ import {
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Switch } from "@/app/_components/GlobalComponents/UIElements/Switch";
 import {
-  Clock,
-  Plus,
+  ClockIcon,
+  PlusIcon,
   Archive,
-  ChevronDown,
-  Code,
-  MessageSquare,
-  Settings,
-  Loader2,
-  Filter,
-} from "lucide-react";
+  CaretDownIcon,
+  CodeIcon,
+  ChatTextIcon,
+  GearIcon,
+  CircleNotchIcon,
+  FunnelIcon,
+} from "@phosphor-icons/react";
 import { CronJob } from "@/app/_utils/cronjob-utils";
 import { Script } from "@/app/_utils/scripts-utils";
 import { UserFilter } from "@/app/_components/FeatureComponents/User/UserFilter";
@@ -236,8 +236,8 @@ export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
         <CardHeader>
           <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
             <div className="flex items-center gap-3">
-              <div className="p-2 bg-primary/10 rounded-lg">
-                <Clock className="h-5 w-5 text-primary" />
+              <div className="p-2 bg-primary/10 ascii-border">
+                <ClockIcon className="h-5 w-5 text-primary" />
               </div>
               <div>
                 <CardTitle className="text-xl brand-gradient">
@@ -261,7 +261,7 @@ export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
                   className="btn-outline"
                   title={t("cronjobs.filters")}
                 >
-                  <Filter className="h-4 w-4" />
+                  <FunnelIcon className="h-4 w-4" />
                 </Button>
                 <Button
                   onClick={() => setIsBackupModalOpen(true)}
@@ -276,7 +276,7 @@ export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
                 onClick={() => setIsNewCronModalOpen(true)}
                 className="btn-primary glow-primary"
               >
-                <Plus className="h-4 w-4 mr-2" />
+                <PlusIcon className="h-4 w-4 mr-2" />
                 {t("cronjobs.newTask")}
               </Button>
             </div>
@@ -301,7 +301,7 @@ export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
               onNewTaskClick={() => setIsNewCronModalOpen(true)}
             />
           ) : (
-            <div className="space-y-3 max-h-[55vh] min-h-[55vh] overflow-y-auto">
+            <div className="space-y-4 max-h-[55vh] min-h-[55vh] overflow-y-auto tui-scrollbar pr-1">
               {loadedSettings ? (
                 filteredJobs.map((job) =>
                   minimalMode ? (
@@ -347,7 +347,7 @@ export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
                 )
               ) : (
                 <div className="flex items-center justify-center h-full min-h-[55vh]">
-                  <Loader2 className="h-8 w-8 animate-spin text-primary" />
+                  <CircleNotchIcon className="h-8 w-8 animate-spin text-primary" />
                 </div>
               )}
             </div>

app/_components/FeatureComponents/Cronjobs/Parts/CronJobEmptyState.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Clock, Plus } from "lucide-react";
+import { ClockIcon, PlusIcon } from "@phosphor-icons/react";
 
 interface CronJobEmptyStateProps {
     selectedUser: string | null;
@@ -15,7 +15,7 @@ export const CronJobEmptyState = ({
     return (
         <div className="text-center py-16">
             <div className="mx-auto w-20 h-20 bg-gradient-to-br from-primary/20 to-blue-500/20 rounded-full flex items-center justify-center mb-6">
-                <Clock className="h-10 w-10 text-primary" />
+                <ClockIcon className="h-10 w-10 text-primary" />
             </div>
             <h3 className="text-xl font-semibold mb-3 brand-gradient">
                 {selectedUser
@@ -32,7 +32,7 @@ export const CronJobEmptyState = ({
                 className="btn-primary glow-primary"
                 size="lg"
             >
-                <Plus className="h-5 w-5 mr-2" />
+                <PlusIcon className="h-5 w-5 mr-2" />
                 Create Your First Task
             </Button>
         </div>

app/_components/FeatureComponents/Cronjobs/Parts/CronJobItem.tsx

@@ -4,24 +4,24 @@ import { useState, useEffect } from "react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { DropdownMenu } from "@/app/_components/GlobalComponents/UIElements/DropdownMenu";
 import {
-  Trash2,
-  Edit,
-  Files,
-  User,
-  Play,
-  Pause,
-  Code,
-  Info,
-  FileOutput,
-  FileX,
-  FileText,
-  AlertCircle,
-  CheckCircle,
-  AlertTriangle,
-  Download,
-  Hash,
-  Check,
-} from "lucide-react";
+  TrashIcon,
+  PencilSimpleIcon,
+  FilesIcon,
+  UserIcon,
+  PlayIcon,
+  PauseIcon,
+  CodeIcon,
+  InfoIcon,
+  FileArrowDownIcon,
+  FileXIcon,
+  FileTextIcon,
+  WarningCircleIcon,
+  CheckCircleIcon,
+  WarningIcon,
+  DownloadIcon,
+  HashIcon,
+  CheckIcon,
+} from "@phosphor-icons/react";
 import { CronJob } from "@/app/_utils/cronjob-utils";
 import { JobError } from "@/app/_utils/error-utils";
 import { ErrorBadge } from "@/app/_components/GlobalComponents/Badges/ErrorBadge";
@@ -92,7 +92,7 @@ export const CronJobItem = ({
   const dropdownMenuItems = [
     {
       label: t("cronjobs.editCronJob"),
-      icon: <Edit className="h-3 w-3" />,
+      icon: <PencilSimpleIcon className="h-3 w-3" />,
       onClick: () => onEdit(job),
     },
     {
@@ -100,45 +100,45 @@ export const CronJobItem = ({
         ? t("cronjobs.disableLogging")
         : t("cronjobs.enableLogging"),
       icon: job.logsEnabled ? (
-        <FileX className="h-3 w-3" />
+        <FileXIcon className="h-3 w-3" />
       ) : (
-        <FileOutput className="h-3 w-3" />
+        <FileArrowDownIcon className="h-3 w-3" />
       ),
       onClick: () => onToggleLogging(job.id),
     },
     ...(job.logsEnabled
       ? [
-          {
-            label: t("cronjobs.viewLogs"),
-            icon: <FileText className="h-3 w-3" />,
-            onClick: () => onViewLogs(job),
-          },
-        ]
+        {
+          label: t("cronjobs.viewLogs"),
+          icon: <FileTextIcon className="h-3 w-3" />,
+          onClick: () => onViewLogs(job),
+        },
+      ]
       : []),
     {
       label: job.paused
         ? t("cronjobs.resumeCronJob")
         : t("cronjobs.pauseCronJob"),
       icon: job.paused ? (
-        <Play className="h-3 w-3" />
+        <PlayIcon className="h-3 w-3" />
       ) : (
-        <Pause className="h-3 w-3" />
+        <PauseIcon className="h-3 w-3" />
       ),
       onClick: () => (job.paused ? onResume(job.id) : onPause(job.id)),
     },
     {
       label: t("cronjobs.cloneCronJob"),
-      icon: <Files className="h-3 w-3" />,
+      icon: <FilesIcon className="h-3 w-3" />,
       onClick: () => onClone(job),
     },
     {
       label: t("cronjobs.backupJob"),
-      icon: <Download className="h-3 w-3" />,
+      icon: <DownloadIcon className="h-3 w-3" />,
       onClick: () => onBackup(job.id),
     },
     {
       label: t("cronjobs.deleteCronJob"),
-      icon: <Trash2 className="h-3 w-3" />,
+      icon: <TrashIcon className="h-3 w-3" />,
       onClick: () => onDelete(job),
       variant: "destructive" as const,
       disabled: deletingId === job.id,
@@ -148,22 +148,21 @@ export const CronJobItem = ({
   return (
     <div
       key={job.id}
-      className={`glass-card p-4 border border-border/50 rounded-lg hover:bg-accent/30 transition-colors ${
-        isDropdownOpen ? "relative z-10" : ""
-      }`}
+      className={`border border-border lg:tui-card p-4 terminal-font transition-colors ${isDropdownOpen ? "relative z-10" : ""
+        }`}
     >
       <div className="flex flex-col sm:flex-row sm:items-start gap-4">
         <div className="flex-1 min-w-0">
           <div className="flex items-center gap-3 mb-2">
             {(scheduleDisplayMode === "cron" ||
               scheduleDisplayMode === "both") && (
-              <code className="text-sm bg-purple-500/10 text-purple-600 dark:text-purple-400 px-2 py-1 rounded font-mono border border-purple-500/20">
-                {job.schedule}
-              </code>
-            )}
+                <code className="text-sm bg-background0 text-status-warning px-2 py-1 terminal-font ascii-border">
+                  {job.schedule}
+                </code>
+              )}
             {scheduleDisplayMode === "human" && cronExplanation?.isValid && (
-              <div className="flex items-start gap-1.5 border-b border-primary/30 bg-primary/10 rounded text-primary px-2 py-0.5">
-                <Info className="h-3 w-3 text-primary mt-0.5 flex-shrink-0" />
+              <div className="flex items-start gap-1.5 ascii-border bg-background2 px-2 py-0.5">
+                <InfoIcon className="h-3 w-3 mt-0.5 flex-shrink-0" />
                 <p className="text-sm italic">
                   {cronExplanation.humanReadable}
                 </p>
@@ -172,7 +171,7 @@ export const CronJobItem = ({
             <div className="flex-1 min-w-0">
               <div className="flex items-center gap-2 min-w-0 w-full">
                 {commandCopied === job.id && (
-                  <Check className="h-3 w-3 text-green-600" />
+                  <CheckIcon className="h-3 w-3 text-status-success" />
                 )}
                 <pre
                   onClick={(e) => {
@@ -181,7 +180,7 @@ export const CronJobItem = ({
                     setCommandCopied(job.id);
                     setTimeout(() => setCommandCopied(null), 3000);
                   }}
-                  className="w-full cursor-pointer overflow-x-auto text-sm font-medium text-foreground bg-muted/30 px-2 py-1 rounded border border-border/30 hide-scrollbar"
+                  className="w-full cursor-pointer overflow-x-auto text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border hide-scrollbar"
                 >
                   {unwrapCommand(displayCommand)}
                 </pre>
@@ -191,8 +190,8 @@ export const CronJobItem = ({
 
           <div className="flex items-center gap-2 pb-2 pt-4">
             {scheduleDisplayMode === "both" && cronExplanation?.isValid && (
-              <div className="flex items-start gap-1.5 border-b border-primary/30 bg-primary/10 rounded text-primary px-2 py-0.5">
-                <Info className="h-3 w-3 text-primary mt-0.5 flex-shrink-0" />
+              <div className="flex items-start gap-1.5 ascii-border bg-background2 px-2 py-0.5">
+                <InfoIcon className="h-3 w-3 mt-0.5 flex-shrink-0" />
                 <p className="text-xs italic">
                   {cronExplanation.humanReadable}
                 </p>
@@ -201,7 +200,7 @@ export const CronJobItem = ({
 
             {job.comment && (
               <p
-                className="text-xs text-muted-foreground italic truncate"
+                className="text-xs italic truncate"
                 title={job.comment}
               >
                 {job.comment}
@@ -210,13 +209,13 @@ export const CronJobItem = ({
           </div>
 
           <div className="flex flex-wrap items-center gap-2 py-3">
-            <div className="flex items-center gap-1 text-xs bg-muted/50 text-muted-foreground px-2 py-0.5 rounded border border-border/30 cursor-pointer hover:bg-muted/70 transition-colors relative">
-              <User className="h-3 w-3" />
+            <div className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border cursor-pointer hover:bg-background2 transition-colors relative terminal-font">
+              <UserIcon className="h-3 w-3" />
               <span>{job.user}</span>
             </div>
 
             <div
-              className="flex items-center gap-1 text-xs bg-muted/50 text-muted-foreground px-2 py-0.5 rounded border border-border/30 cursor-pointer hover:bg-muted/70 transition-colors relative"
+              className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border cursor-pointer hover:bg-background2 transition-colors relative terminal-font"
               title="Click to copy Job UUID"
               onClick={async () => {
                 const success = await copyToClipboard(job.id);
@@ -227,22 +226,22 @@ export const CronJobItem = ({
               }}
             >
               {showCopyConfirmation ? (
-                <Check className="h-3 w-3 text-green-600" />
+                <CheckIcon className="h-3 w-3 text-status-success" />
               ) : (
-                <Hash className="h-3 w-3" />
+                <HashIcon className="h-3 w-3" />
               )}
               <span className="font-mono">{job.id}</span>
             </div>
 
             {job.paused && (
-              <span className="text-xs bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 px-2 py-0.5 rounded border border-yellow-500/20">
-                {t("cronjobs.paused")}
+              <span className="text-xs bg-background2 px-2 py-0.5 ascii-border terminal-font">
+                <span className="text-status-warning">{t("cronjobs.paused")}</span>
               </span>
             )}
 
             {job.logsEnabled && (
-              <span className="text-xs bg-blue-500/10 text-blue-600 dark:text-blue-400 px-2 py-0.5 rounded border border-blue-500/20">
-                {t("cronjobs.logged")}
+              <span className="text-xs bg-background0 px-2 py-0.5 ascii-border terminal-font">
+                <span className="text-status-info">{t("cronjobs.logged")}</span>
               </span>
             )}
 
@@ -252,11 +251,11 @@ export const CronJobItem = ({
                   e.stopPropagation();
                   onViewLogs(job);
                 }}
-                className="flex items-center gap-1 text-xs bg-red-500/10 text-red-600 dark:text-red-400 px-2 py-0.5 rounded border border-red-500/30 hover:bg-red-500/20 transition-colors cursor-pointer"
+                className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border hover:bg-background1 transition-colors cursor-pointer terminal-font"
                 title="Latest execution failed - Click to view error log"
               >
-                <AlertCircle className="h-3 w-3" />
-                <span>
+                <WarningCircleIcon className="h-3 w-3 text-status-error" />
+                <span className="text-status-error">
                   {t("cronjobs.failed", {
                     exitCode: job.logError?.exitCode?.toString() ?? "",
                   })}
@@ -272,12 +271,12 @@ export const CronJobItem = ({
                     e.stopPropagation();
                     onViewLogs(job);
                   }}
-                  className="flex items-center gap-1 text-xs bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 px-2 py-0.5 rounded border border-yellow-500/30 hover:bg-yellow-500/20 transition-colors cursor-pointer"
+                  className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border hover:bg-background1 transition-colors cursor-pointer terminal-font"
                   title="Latest execution succeeded, but has historical failures - Click to view logs"
                 >
-                  <CheckCircle className="h-3 w-3" />
-                  <span>{t("cronjobs.healthy")}</span>
-                  <AlertTriangle className="h-3 w-3" />
+                  <CheckCircleIcon className="h-3 w-3 text-status-success" />
+                  <span className="text-status-warning">{t("cronjobs.healthy")}</span>
+                  <WarningIcon className="h-3 w-3 text-status-warning" />
                 </button>
               )}
 
@@ -285,9 +284,9 @@ export const CronJobItem = ({
               !job.logError?.hasError &&
               !job.logError?.hasHistoricalFailures &&
               job.logError?.latestExitCode === 0 && (
-                <div className="flex items-center gap-1 text-xs bg-green-500/10 text-green-600 dark:text-green-400 px-2 py-0.5 rounded border border-green-500/30">
-                  <CheckCircle className="h-3 w-3" />
-                  <span>{t("cronjobs.healthy")}</span>
+                <div className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border terminal-font">
+                  <CheckCircleIcon className="h-3 w-3 text-status-success" />
+                  <span className="text-status-success">{t("cronjobs.healthy")}</span>
                 </div>
               )}
 
@@ -315,7 +314,7 @@ export const CronJobItem = ({
               {runningJobId === job.id ? (
                 <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
               ) : (
-                <Code className="h-3 w-3" />
+                <CodeIcon className="h-3 w-3" />
               )}
             </Button>
 
@@ -334,9 +333,9 @@ export const CronJobItem = ({
               aria-label={t("cronjobs.pauseCronJob")}
             >
               {job.paused ? (
-                <Play className="h-3 w-3" />
+                <PlayIcon className="h-3 w-3" />
               ) : (
-                <Pause className="h-3 w-3" />
+                <PauseIcon className="h-3 w-3" />
               )}
             </Button>
 
@@ -363,9 +362,9 @@ export const CronJobItem = ({
               }
             >
               {job.logsEnabled ? (
-                <FileText className="h-3 w-3" />
+                <FileTextIcon className="h-3 w-3" />
               ) : (
-                <FileOutput className="h-3 w-3" />
+                <FileArrowDownIcon className="h-3 w-3" />
               )}
             </Button>
           </div>

app/_components/FeatureComponents/Cronjobs/Parts/MinimalCronJobItem.tsx

@@ -4,19 +4,19 @@ import { useState, useEffect } from "react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { DropdownMenu } from "@/app/_components/GlobalComponents/UIElements/DropdownMenu";
 import {
-  Trash2,
-  Edit,
-  Files,
-  Play,
-  Pause,
-  Code,
-  Info,
-  Download,
-  Check,
-  FileX,
-  FileText,
-  FileOutput,
-} from "lucide-react";
+  TrashIcon,
+  PencilSimpleIcon,
+  FilesIcon,
+  PlayIcon,
+  PauseIcon,
+  CodeIcon,
+  InfoIcon,
+  DownloadIcon,
+  CheckIcon,
+  FileXIcon,
+  FileTextIcon,
+  FileArrowDownIcon,
+} from "@phosphor-icons/react";
 import { CronJob } from "@/app/_utils/cronjob-utils";
 import { JobError } from "@/app/_utils/error-utils";
 import {
@@ -83,7 +83,7 @@ export const MinimalCronJobItem = ({
   const dropdownMenuItems = [
     {
       label: t("cronjobs.editCronJob"),
-      icon: <Edit className="h-3 w-3" />,
+      icon: <PencilSimpleIcon className="h-3 w-3" />,
       onClick: () => onEdit(job),
     },
     {
@@ -91,45 +91,45 @@ export const MinimalCronJobItem = ({
         ? t("cronjobs.disableLogging")
         : t("cronjobs.enableLogging"),
       icon: job.logsEnabled ? (
-        <FileX className="h-3 w-3" />
+        <FileXIcon className="h-3 w-3" />
       ) : (
-        <Code className="h-3 w-3" />
+        <CodeIcon className="h-3 w-3" />
       ),
       onClick: () => onToggleLogging(job.id),
     },
     ...(job.logsEnabled
       ? [
-          {
-            label: t("cronjobs.viewLogs"),
-            icon: <Code className="h-3 w-3" />,
-            onClick: () => onViewLogs(job),
-          },
-        ]
+        {
+          label: t("cronjobs.viewLogs"),
+          icon: <CodeIcon className="h-3 w-3" />,
+          onClick: () => onViewLogs(job),
+        },
+      ]
       : []),
     {
       label: job.paused
         ? t("cronjobs.resumeCronJob")
         : t("cronjobs.pauseCronJob"),
       icon: job.paused ? (
-        <Play className="h-3 w-3" />
+        <PlayIcon className="h-3 w-3" />
       ) : (
-        <Pause className="h-3 w-3" />
+        <PauseIcon className="h-3 w-3" />
       ),
       onClick: () => (job.paused ? onResume(job.id) : onPause(job.id)),
     },
     {
       label: t("cronjobs.cloneCronJob"),
-      icon: <Files className="h-3 w-3" />,
+      icon: <FilesIcon className="h-3 w-3" />,
       onClick: () => onClone(job),
     },
     {
       label: t("cronjobs.backupJob"),
-      icon: <Download className="h-3 w-3" />,
+      icon: <DownloadIcon className="h-3 w-3" />,
       onClick: () => onBackup(job.id),
     },
     {
       label: t("cronjobs.deleteCronJob"),
-      icon: <Trash2 className="h-3 w-3" />,
+      icon: <TrashIcon className="h-3 w-3" />,
       onClick: () => onDelete(job),
       variant: "destructive" as const,
       disabled: deletingId === job.id,
@@ -139,21 +139,19 @@ export const MinimalCronJobItem = ({
   return (
     <div
       key={job.id}
-      className={`glass-card p-3 border border-border/50 rounded-lg hover:bg-accent/30 transition-colors ${
-        isDropdownOpen ? "relative z-10" : ""
-      }`}
+      className={`border border-border lg:tui-card p-3 terminal-font transition-colors ${isDropdownOpen ? "relative z-10" : ""
+        }`}
     >
       <div className="flex items-center gap-3">
-        {/* Schedule display - minimal */}
         <div className="flex items-center gap-1 flex-shrink-0">
           {scheduleDisplayMode === "cron" && (
-            <code className="text-xs bg-purple-500/10 text-purple-600 dark:text-purple-400 px-1.5 py-0.5 rounded font-mono border border-purple-500/20">
+            <code className="text-xs bg-background0 text-status-warning px-1.5 py-0.5 terminal-font ascii-border">
               {job.schedule}
             </code>
           )}
           {scheduleDisplayMode === "human" && cronExplanation?.isValid && (
-            <div className="flex items-center gap-1 border-b border-primary/30 bg-primary/10 rounded text-primary px-1.5 py-0.5">
-              <Info className="h-3 w-3 text-primary flex-shrink-0" />
+            <div className="flex items-center gap-1 ascii-border bg-background2 px-1.5 py-0.5">
+              <InfoIcon className="h-3 w-3 flex-shrink-0" />
               <span className="text-xs italic truncate max-w-32">
                 {cronExplanation.humanReadable}
               </span>
@@ -161,15 +159,15 @@ export const MinimalCronJobItem = ({
           )}
           {scheduleDisplayMode === "both" && (
             <div className="flex items-center gap-1">
-              <code className="text-xs bg-purple-500/10 text-purple-600 dark:text-purple-400 px-1 py-0.5 rounded font-mono border border-purple-500/20">
+              <code className="text-xs bg-background0 text-status-warning px-1 py-0.5 terminal-font ascii-border">
                 {job.schedule}
               </code>
               {cronExplanation?.isValid && (
                 <div
-                  className="flex items-center gap-1 border-b border-primary/30 bg-primary/10 rounded text-primary px-1 py-0.5 cursor-help"
+                  className="flex items-center gap-1 ascii-border bg-background0 px-1 py-0.5 cursor-help"
                   title={cronExplanation.humanReadable}
                 >
-                  <Info className="h-2.5 w-2.5 text-primary flex-shrink-0" />
+                  <InfoIcon className="h-2.5 w-2.5 flex-shrink-0" />
                 </div>
               )}
             </div>
@@ -179,7 +177,7 @@ export const MinimalCronJobItem = ({
         <div className="flex-1 min-w-0">
           <div className="flex items-center gap-2">
             {commandCopied === job.id && (
-              <Check className="h-3 w-3 text-green-600 flex-shrink-0" />
+              <CheckIcon className="h-3 w-3 text-status-success flex-shrink-0" />
             )}
             <pre
               onClick={(e) => {
@@ -188,7 +186,7 @@ export const MinimalCronJobItem = ({
                 setCommandCopied(job.id);
                 setTimeout(() => setCommandCopied(null), 3000);
               }}
-              className="flex-1 cursor-pointer overflow-hidden text-sm font-medium text-foreground bg-muted/30 px-2 py-1 rounded border border-border/30 truncate"
+              className="flex-1 cursor-pointer overflow-hidden text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border truncate"
               title={unwrapCommand(job.command)}
             >
               {unwrapCommand(displayCommand)}
@@ -199,25 +197,25 @@ export const MinimalCronJobItem = ({
         <div className="flex items-center gap-1 flex-shrink-0">
           {job.logsEnabled && (
             <div
-              className="w-2 h-2 bg-blue-500 rounded-full"
+              className="w-2 h-2 bg-status-info ascii-border"
               title={t("cronjobs.logged")}
             />
           )}
           {job.paused && (
             <div
-              className="w-2 h-2 bg-yellow-500 rounded-full"
+              className="w-2 h-2 bg-status-warning ascii-border"
               title={t("cronjobs.paused")}
             />
           )}
           {!job.logError?.hasError && job.logsEnabled && (
             <div
-              className="w-2 h-2 bg-green-500 rounded-full"
+              className="w-2 h-2 bg-status-success ascii-border"
               title={t("cronjobs.healthy")}
             />
           )}
           {job.logsEnabled && job.logError?.hasError && (
             <div
-              className="w-2 h-2 bg-red-500 rounded-full cursor-pointer"
+              className="w-2 h-2 bg-status-error ascii-border cursor-pointer"
               title="Latest execution failed - Click to view error log"
               onClick={(e) => {
                 e.stopPropagation();
@@ -227,31 +225,32 @@ export const MinimalCronJobItem = ({
           )}
           {!job.logsEnabled && errors.length > 0 && (
             <div
-              className="w-2 h-2 bg-orange-500 rounded-full cursor-pointer"
+              className="w-2 h-2 bg-status-warning ascii-border cursor-pointer"
               title={`${errors.length} error(s)`}
               onClick={(e) => onErrorClick(errors[0])}
             />
           )}
         </div>
 
-        <div className="flex items-center gap-1 flex-shrink-0">
+        <div className="flex items-center gap-2 flex-shrink-0">
           <Button
-            variant="ghost"
+            variant="outline"
             size="sm"
             onClick={() => onRun(job.id)}
             disabled={runningJobId === job.id || job.paused}
-            className="h-6 w-6 p-0"
+            className="btn-outline h-8 px-3 hidden md:flex"
             title={t("cronjobs.runCronManually")}
+            aria-label={t("cronjobs.runCronManually")}
           >
             {runningJobId === job.id ? (
               <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
             ) : (
-              <Code className="h-3 w-3" />
+              <CodeIcon className="h-3 w-3" />
             )}
           </Button>
 
           <Button
-            variant="ghost"
+            variant="outline"
             size="sm"
             onClick={() => {
               if (job.paused) {
@@ -260,18 +259,19 @@ export const MinimalCronJobItem = ({
                 onPause(job.id);
               }
             }}
-            className="h-6 w-6 p-0"
+            className="btn-outline h-8 px-3 hidden md:flex"
             title={t("cronjobs.pauseCronJob")}
+            aria-label={t("cronjobs.pauseCronJob")}
           >
             {job.paused ? (
-              <Play className="h-3 w-3" />
+              <PlayIcon className="h-3 w-3" />
             ) : (
-              <Pause className="h-3 w-3" />
+              <PauseIcon className="h-3 w-3" />
             )}
           </Button>
 
           <Button
-            variant="ghost"
+            variant="outline"
             size="sm"
             onClick={() => {
               if (job.logsEnabled) {
@@ -280,17 +280,22 @@ export const MinimalCronJobItem = ({
                 onToggleLogging(job.id);
               }
             }}
-            className="h-6 w-6 p-0"
+            className="btn-outline h-8 px-3 hidden md:flex"
             title={
               job.logsEnabled
                 ? t("cronjobs.viewLogs")
                 : t("cronjobs.enableLogging")
             }
+            aria-label={
+              job.logsEnabled
+                ? t("cronjobs.viewLogs")
+                : t("cronjobs.enableLogging")
+            }
           >
             {job.logsEnabled ? (
-              <FileText className="h-3 w-3" />
+              <FileTextIcon className="h-3 w-3" />
             ) : (
-              <FileOutput className="h-3 w-3" />
+              <FileArrowDownIcon className="h-3 w-3" />
             )}
           </Button>
 

app/_components/FeatureComponents/Games/SnakeGame.tsx

@@ -0,0 +1,431 @@
+"use client";
+
+import { useEffect, useRef, useState, useCallback } from "react";
+import { useTranslations } from "next-intl";
+import { ArrowUpIcon, ArrowDownIcon, ArrowLeftIcon, ArrowRightIcon, ArrowClockwiseIcon, PlayIcon, PauseIcon } from "@phosphor-icons/react";
+
+interface Position {
+  x: number;
+  y: number;
+}
+
+type Direction = "UP" | "DOWN" | "LEFT" | "RIGHT";
+
+const GRID_SIZE = 20;
+const INITIAL_SNAKE: Position[] = [
+  { x: 10, y: 10 },
+  { x: 9, y: 10 },
+  { x: 8, y: 10 },
+];
+const INITIAL_DIRECTION: Direction = "RIGHT";
+const GAME_SPEED = 150;
+
+export const SnakeGame = () => {
+  const t = useTranslations("notFound");
+  const canvasRef = useRef<HTMLCanvasElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [snake, setSnake] = useState<Position[]>(INITIAL_SNAKE);
+  const [direction, setDirection] = useState<Direction>(INITIAL_DIRECTION);
+  const [food, setFood] = useState<Position>({ x: 15, y: 15 });
+  const [gameOver, setGameOver] = useState(false);
+  const [gameStarted, setGameStarted] = useState(false);
+  const [score, setScore] = useState(0);
+  const [highScore, setHighScore] = useState(0);
+  const [isPaused, setIsPaused] = useState(false);
+  const [colors, setColors] = useState({ snake: "#00ff00", food: "#ff0000", grid: "#333333" });
+  const [cellSize, setCellSize] = useState(20);
+
+  const directionRef = useRef<Direction>(INITIAL_DIRECTION);
+  const gameLoopRef = useRef<NodeJS.Timeout | null>(null);
+
+  useEffect(() => {
+    const savedHighScore = localStorage.getItem("snakeHighScore");
+    if (savedHighScore) {
+      setHighScore(parseInt(savedHighScore));
+    }
+
+    const updateColors = () => {
+      const theme = document.documentElement.getAttribute("data-webtui-theme");
+      if (theme === "catppuccin-mocha") {
+        setColors({
+          snake: "#9ca0b0",
+          food: "#f38ba8",
+          grid: "#313244",
+        });
+      } else {
+        setColors({
+          snake: "#313244",
+          food: "#d20f39",
+          grid: "#9ca0b0",
+        });
+      }
+    };
+
+    updateColors();
+
+    const observer = new MutationObserver(updateColors);
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ["data-webtui-theme"],
+    });
+
+    const updateCellSize = () => {
+      if (containerRef.current) {
+        const containerWidth = containerRef.current.offsetWidth;
+        const maxCanvasSize = Math.min(containerWidth - 32, 400);
+        const newCellSize = Math.floor(maxCanvasSize / GRID_SIZE);
+        setCellSize(newCellSize);
+      }
+    };
+
+    updateCellSize();
+    window.addEventListener("resize", updateCellSize);
+
+    return () => {
+      observer.disconnect();
+      window.removeEventListener("resize", updateCellSize);
+    };
+  }, []);
+
+  const generateFood = useCallback((): Position => {
+    let newFood: Position;
+    do {
+      newFood = {
+        x: Math.floor(Math.random() * GRID_SIZE),
+        y: Math.floor(Math.random() * GRID_SIZE),
+      };
+    } while (snake.some((segment) => segment.x === newFood.x && segment.y === newFood.y));
+    return newFood;
+  }, [snake]);
+
+  const resetGame = useCallback(() => {
+    setSnake(INITIAL_SNAKE);
+    setDirection(INITIAL_DIRECTION);
+    directionRef.current = INITIAL_DIRECTION;
+    setFood(generateFood());
+    setGameOver(false);
+    setGameStarted(true);
+    setScore(0);
+    setIsPaused(false);
+  }, [generateFood]);
+
+  const draw = useCallback(() => {
+    const canvas = canvasRef.current;
+    if (!canvas) return;
+
+    const ctx = canvas.getContext("2d");
+    if (!ctx) return;
+
+    const theme = document.documentElement.getAttribute("data-webtui-theme");
+    const bgColor = theme === "catppuccin-mocha" ? "#1e1e2e" : "#eff1f5";
+
+    ctx.fillStyle = bgColor;
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+    ctx.strokeStyle = colors.grid;
+    ctx.lineWidth = 1;
+    for (let i = 0; i <= GRID_SIZE; i++) {
+      ctx.beginPath();
+      ctx.moveTo(i * cellSize, 0);
+      ctx.lineTo(i * cellSize, GRID_SIZE * cellSize);
+      ctx.stroke();
+
+      ctx.beginPath();
+      ctx.moveTo(0, i * cellSize);
+      ctx.lineTo(GRID_SIZE * cellSize, i * cellSize);
+      ctx.stroke();
+    }
+
+    snake.forEach((segment) => {
+      ctx.fillStyle = colors.snake;
+      ctx.fillRect(
+        segment.x * cellSize + 1,
+        segment.y * cellSize + 1,
+        cellSize - 2,
+        cellSize - 2
+      );
+    });
+
+    ctx.fillStyle = colors.food;
+    ctx.fillRect(
+      food.x * cellSize + 1,
+      food.y * cellSize + 1,
+      cellSize - 2,
+      cellSize - 2
+    );
+  }, [snake, food, colors, cellSize]);
+
+  useEffect(() => {
+    draw();
+  }, [draw]);
+
+  const moveSnake = useCallback(() => {
+    if (gameOver || !gameStarted || isPaused) return;
+
+    setSnake((prevSnake) => {
+      const head = prevSnake[0];
+      const newHead: Position = { ...head };
+
+      switch (directionRef.current) {
+        case "UP":
+          newHead.y -= 1;
+          break;
+        case "DOWN":
+          newHead.y += 1;
+          break;
+        case "LEFT":
+          newHead.x -= 1;
+          break;
+        case "RIGHT":
+          newHead.x += 1;
+          break;
+      }
+
+      if (
+        newHead.x < 0 ||
+        newHead.x >= GRID_SIZE ||
+        newHead.y < 0 ||
+        newHead.y >= GRID_SIZE ||
+        prevSnake.some((segment) => segment.x === newHead.x && segment.y === newHead.y)
+      ) {
+        setGameOver(true);
+        setGameStarted(false);
+        return prevSnake;
+      }
+
+      const newSnake = [newHead, ...prevSnake];
+
+      if (newHead.x === food.x && newHead.y === food.y) {
+        setScore((prev) => {
+          const newScore = prev + 10;
+          if (newScore > highScore) {
+            setHighScore(newScore);
+            localStorage.setItem("snakeHighScore", newScore.toString());
+          }
+          return newScore;
+        });
+        setFood(generateFood());
+      } else {
+        newSnake.pop();
+      }
+
+      return newSnake;
+    });
+  }, [gameOver, gameStarted, isPaused, food, highScore, generateFood]);
+
+  useEffect(() => {
+    if (gameStarted && !gameOver && !isPaused) {
+      gameLoopRef.current = setInterval(moveSnake, GAME_SPEED);
+    }
+
+    return () => {
+      if (gameLoopRef.current) {
+        clearInterval(gameLoopRef.current);
+      }
+    };
+  }, [gameStarted, gameOver, isPaused, moveSnake]);
+
+  useEffect(() => {
+    const handleKeyPress = (e: KeyboardEvent) => {
+      if (e.code === "Space") {
+        e.preventDefault();
+        if (gameOver) {
+          resetGame();
+        } else if (!gameStarted) {
+          setGameStarted(true);
+        }
+        return;
+      }
+
+      if (e.code === "KeyP") {
+        e.preventDefault();
+        if (gameStarted && !gameOver) {
+          setIsPaused((prev) => !prev);
+        }
+        return;
+      }
+
+      if (!gameStarted || gameOver || isPaused) return;
+
+      let newDirection: Direction | null = null;
+
+      switch (e.key) {
+        case "ArrowUp":
+          if (directionRef.current !== "DOWN") {
+            newDirection = "UP";
+          }
+          break;
+        case "ArrowDown":
+          if (directionRef.current !== "UP") {
+            newDirection = "DOWN";
+          }
+          break;
+        case "ArrowLeft":
+          if (directionRef.current !== "RIGHT") {
+            newDirection = "LEFT";
+          }
+          break;
+        case "ArrowRight":
+          if (directionRef.current !== "LEFT") {
+            newDirection = "RIGHT";
+          }
+          break;
+      }
+
+      if (newDirection) {
+        e.preventDefault();
+        directionRef.current = newDirection;
+        setDirection(newDirection);
+      }
+    };
+
+    window.addEventListener("keydown", handleKeyPress);
+    return () => window.removeEventListener("keydown", handleKeyPress);
+  }, [gameOver, gameStarted, isPaused, resetGame]);
+
+  const handleTouchMove = (dir: Direction) => {
+    if (!gameStarted) {
+      setGameStarted(true);
+      directionRef.current = dir;
+      setDirection(dir);
+      return;
+    }
+    if (gameOver || isPaused) return;
+
+    let canMove = false;
+
+    switch (dir) {
+      case "UP":
+        canMove = directionRef.current !== "DOWN";
+        break;
+      case "DOWN":
+        canMove = directionRef.current !== "UP";
+        break;
+      case "LEFT":
+        canMove = directionRef.current !== "RIGHT";
+        break;
+      case "RIGHT":
+        canMove = directionRef.current !== "LEFT";
+        break;
+    }
+
+    if (canMove) {
+      directionRef.current = dir;
+      setDirection(dir);
+    }
+  };
+
+  const handleCanvasClick = () => {
+    if (gameOver) {
+      resetGame();
+    } else if (!gameStarted) {
+      setGameStarted(true);
+    }
+  };
+
+  return (
+    <div ref={containerRef} className="flex flex-col items-center gap-4 w-full">
+      <div className="tui-card p-4 w-full max-w-md">
+        <div className="flex justify-between items-center mb-4 terminal-font">
+          <div className="text-sm">
+            <span className="text-status-success">{t("score")}:</span> {score}
+          </div>
+          <div className="text-sm">
+            <span className="text-status-info">{t("highScore")}:</span> {highScore}
+          </div>
+        </div>
+
+        <div className="relative">
+          <canvas
+            ref={canvasRef}
+            width={GRID_SIZE * cellSize}
+            height={GRID_SIZE * cellSize}
+            className="ascii-border mx-auto cursor-pointer bg-background0"
+            onClick={handleCanvasClick}
+          />
+
+          {!gameStarted && !gameOver && (
+            <div
+              className="absolute inset-0 flex items-center justify-center bg-background0 bg-opacity-90 ascii-border cursor-pointer"
+              onClick={handleCanvasClick}
+            >
+              <div className="text-center terminal-font">
+                <p className="text-lg font-bold uppercase mb-2">{t("pressToStart")}</p>
+                <p className="text-xs text-foreground0 opacity-70">{t("pauseGame")}</p>
+              </div>
+            </div>
+          )}
+
+          {gameOver && (
+            <div
+              className="absolute inset-0 flex items-center justify-center bg-background0 bg-opacity-90 ascii-border cursor-pointer"
+              onClick={handleCanvasClick}
+            >
+              <div className="text-center terminal-font">
+                <p className="text-2xl font-bold uppercase text-status-error mb-2">
+                  {t("gameOver")}
+                </p>
+                <p className="text-lg mb-1">
+                  {t("score")}: {score}
+                </p>
+                <p className="text-sm text-foreground0 opacity-70">{t("pressToRestart")}</p>
+              </div>
+            </div>
+          )}
+
+          {isPaused && (
+            <div className="absolute inset-0 flex items-center justify-center bg-background0 bg-opacity-90 ascii-border">
+              <div className="text-center terminal-font">
+                <p className="text-2xl font-bold uppercase text-status-warning">
+                  {t("paused")}
+                </p>
+              </div>
+            </div>
+          )}
+        </div>
+
+        <div className="mt-4 grid grid-cols-3 gap-2 md:hidden">
+          <div></div>
+          <button
+            onClick={() => handleTouchMove("UP")}
+            className="ascii-border bg-background1 p-3 active:bg-background2 terminal-font flex items-center justify-center"
+          >
+            <ArrowUpIcon size={20} weight="bold" />
+          </button>
+          <div></div>
+          <button
+            onClick={() => handleTouchMove("LEFT")}
+            className="ascii-border bg-background1 p-3 active:bg-background2 terminal-font flex items-center justify-center"
+          >
+            <ArrowLeftIcon size={20} weight="bold" />
+          </button>
+          <button
+            onClick={() => (gameStarted && !gameOver ? setIsPaused(!isPaused) : resetGame())}
+            className="ascii-border bg-background1 p-3 active:bg-background2 terminal-font flex items-center justify-center"
+          >
+            {gameOver ? <ArrowClockwiseIcon size={20} weight="bold" /> : isPaused ? <PlayIcon size={20} weight="fill" /> : <PauseIcon size={20} weight="fill" />}
+          </button>
+          <button
+            onClick={() => handleTouchMove("RIGHT")}
+            className="ascii-border bg-background1 p-3 active:bg-background2 terminal-font flex items-center justify-center"
+          >
+            <ArrowRightIcon size={20} weight="bold" />
+          </button>
+          <div></div>
+          <button
+            onClick={() => handleTouchMove("DOWN")}
+            className="ascii-border bg-background1 p-3 active:bg-background2 terminal-font flex items-center justify-center"
+          >
+            <ArrowDownIcon size={20} weight="bold" />
+          </button>
+          <div></div>
+        </div>
+
+        <div className="mt-4 terminal-font text-xs text-center text-foreground0 opacity-70">
+          <p className="hidden md:block">{t("useArrowKeys")}</p>
+          <p className="md:hidden">{t("tapToMove")}</p>
+        </div>
+      </div>
+    </div>
+  );
+};

app/_components/FeatureComponents/Layout/Sidebar.tsx

@@ -2,15 +2,15 @@ import { cn } from "@/app/_utils/global-utils";
 import { HTMLAttributes, forwardRef, useState, useEffect } from "react";
 import React from "react";
 import {
-  ChevronLeft,
-  ChevronRight,
-  Server,
-  Menu,
-  X,
-  Cpu,
-  HardDrive,
-  Wifi,
-} from "lucide-react";
+  CaretLeftIcon,
+  CaretRightIcon,
+  HardDrivesIcon,
+  ListIcon,
+  XIcon,
+  CpuIcon,
+  HardDriveIcon,
+  WifiHighIcon,
+} from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 
 export interface SidebarProps extends HTMLAttributes<HTMLDivElement> {
@@ -54,18 +54,18 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
       <>
         <button
           onClick={() => setIsMobileOpen(!isMobileOpen)}
-          className="fixed bottom-4 right-4 z-50 lg:hidden p-2 bg-background/80 backdrop-blur-md border border-border/50 rounded-lg hover:bg-accent transition-colors"
+          className="fixed bottom-4 right-4 z-50 lg:hidden p-2 bg-background0 ascii-border transition-colors terminal-font"
         >
           {isMobileOpen ? (
-            <X className="h-5 w-5" />
+            <XIcon className="h-5 w-5" />
           ) : (
-            <Menu className="h-5 w-5" />
+            <ListIcon className="h-5 w-5" />
           )}
         </button>
 
         <div
           className={cn(
-            "fixed inset-0 bg-black/50 z-20 lg:hidden transition-opacity duration-300",
+            "fixed inset-0 bg-background0 z-20 lg:hidden transition-opacity duration-300",
             isMobileOpen ? "opacity-100" : "opacity-0 pointer-events-none"
           )}
           onClick={() => setIsMobileOpen(false)}
@@ -74,7 +74,7 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
         <div
           ref={ref}
           className={cn(
-            "bg-background/95 backdrop-blur-md border-r border-border/50 transition-all duration-300 ease-in-out glass-card",
+            "bg-background0 ascii-border transition-all duration-300 ease-in-out terminal-font",
             isMobileOpen
               ? "fixed left-0 top-0 h-full w-80 z-30 translate-x-0"
               : "fixed left-0 top-0 h-full w-80 z-30 -translate-x-full lg:translate-x-0",
@@ -92,38 +92,20 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
         >
           <button
             onClick={() => setIsCollapsed(!isCollapsed)}
-            className="absolute -right-3 top-[21.5vh] w-6 h-6 bg-background border border-border rounded-full items-center justify-center hover:bg-accent transition-colors z-40 hidden lg:flex"
+            className="absolute -right-3 top-[21.5vh] w-6 h-6 bg-background0 ascii-border items-center justify-center transition-colors z-40 hidden lg:flex"
           >
             {isCollapsed ? (
-              <ChevronRight className="h-3 w-3" />
+              <CaretRightIcon className="h-3 w-3" />
             ) : (
-              <ChevronLeft className="h-3 w-3" />
+              <CaretLeftIcon className="h-3 w-3" />
             )}
           </button>
 
-          <div className="p-4 border-b border-border/50 bg-background/95 backdrop-blur-md">
-            <div
-              className={cn(
-                "flex items-center gap-3",
-                isCollapsed && "lg:justify-center"
-              )}
-            >
-              <div className="p-2 bg-gradient-to-br from-cyan-500/20 to-blue-500/20 rounded-lg flex-shrink-0">
-                <Server className="h-4 w-4 text-cyan-500" />
-              </div>
-              {(!isCollapsed || !isCollapsed) && (
-                <h2 className="text-sm font-semibold text-foreground truncate">
-                  {t("sidebar.systemOverview")}
-                </h2>
-              )}
-            </div>
-          </div>
-
           <div
             className={cn(
-              "overflow-y-auto custom-scrollbar",
+              "overflow-y-auto tui-scrollbar",
               isCollapsed ? "lg:p-2" : "p-4",
-              "h-full lg:h-[calc(100vh-88px-80px)]"
+              "h-full lg:h-[calc(100vh-88px)]"
             )}
           >
             {isCollapsed ? (
@@ -131,22 +113,22 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
                 <div className="flex flex-col items-center space-y-4">
                   {quickStats ? (
                     <>
-                      <div className="w-12 h-12 bg-card/50 border border-border/30 rounded-lg flex flex-col items-center justify-center p-1">
-                        <Cpu className="h-3 w-3 text-pink-500 mb-1" />
+                      <div className="w-12 h-12 bg-background0 ascii-border flex flex-col items-center justify-center p-1">
+                        <CpuIcon className="h-3 w-3 mb-1" />
                         <span className="text-xs font-bold text-foreground">
                           {quickStats.cpu}%
                         </span>
                       </div>
 
-                      <div className="w-12 h-12 bg-card/50 border border-border/30 rounded-lg flex flex-col items-center justify-center p-1">
-                        <HardDrive className="h-3 w-3 text-cyan-500 mb-1" />
+                      <div className="w-12 h-12 bg-background0 ascii-border flex flex-col items-center justify-center p-1">
+                        <HardDriveIcon className="h-3 w-3 mb-1" />
                         <span className="text-xs font-bold text-foreground">
                           {quickStats.memory}%
                         </span>
                       </div>
 
-                      <div className="w-12 h-12 bg-card/50 border border-border/30 rounded-lg flex flex-col items-center justify-center p-1">
-                        <Wifi className="h-3 w-3 text-teal-500 mb-1" />
+                      <div className="w-12 h-12 bg-background0 ascii-border flex flex-col items-center justify-center p-1">
+                        <WifiHighIcon className="h-3 w-3 mb-1" />
                         <div className="flex flex-col items-center">
                           <span className="text-xs font-bold text-foreground leading-none">
                             {quickStats.network}
@@ -163,9 +145,9 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
                         return (
                           <div
                             key={index}
-                            className="w-8 h-8 bg-card/50 border border-border/30 rounded-lg flex items-center justify-center"
+                            className="w-8 h-8 bg-background2 ascii-border flex items-center justify-center"
                           >
-                            <Server className="h-4 w-4 text-muted-foreground" />
+                            <HardDrivesIcon className="h-4 w-4 text-muted-foreground" />
                           </div>
                         );
                       }

app/_components/FeatureComponents/Layout/TabbedInterface.tsx

@@ -5,7 +5,7 @@ import { CronJobList } from "@/app/_components/FeatureComponents/Cronjobs/CronJo
 import { ScriptsManager } from "@/app/_components/FeatureComponents/Scripts/ScriptsManager";
 import { CronJob } from "@/app/_utils/cronjob-utils";
 import { Script } from "@/app/_utils/scripts-utils";
-import { Clock, FileText } from "lucide-react";
+import { ClockIcon, FileTextIcon } from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 
 interface TabbedInterfaceProps {
@@ -24,33 +24,31 @@ export const TabbedInterface = ({
 
   return (
     <div className="space-y-6">
-      <div className="bg-background/80 backdrop-blur-md border border-border/50 rounded-lg p-1 glass-card">
-        <div className="flex">
+      <div className="tui-card p-1 terminal-font">
+        <div className="flex gap-2">
           <button
             onClick={() => setActiveTab("cronjobs")}
-            className={`flex items-center gap-2 px-4 py-2 text-sm font-medium transition-all duration-200 rounded-md flex-1 justify-center ${
-              activeTab === "cronjobs"
-                ? "bg-primary/10 text-primary shadow-sm border border-primary/20"
-                : "text-muted-foreground hover:text-foreground hover:bg-muted/50"
-            }`}
+            className={`flex items-center gap-2 px-4 py-2 border border-transparent text-sm font-medium flex-1 justify-center terminal-font ${activeTab === "cronjobs"
+              ? "bg-background0 ascii-border"
+              : "hover:ascii-border"
+              }`}
           >
-            <Clock className="h-4 w-4" />
+            <ClockIcon className="h-4 w-4" />
             {t("cronjobs.cronJobs")}
-            <span className="ml-1 text-xs bg-primary/20 text-primary px-2 py-0.5 rounded-full font-medium">
+            <span className="ml-1 text-xs bg-background0 px-2 py-0.5 ascii-border font-medium">
               {cronJobs.length}
             </span>
           </button>
           <button
             onClick={() => setActiveTab("scripts")}
-            className={`flex items-center gap-2 px-4 py-2 text-sm font-medium transition-all duration-200 rounded-md flex-1 justify-center ${
-              activeTab === "scripts"
-                ? "bg-primary/10 text-primary shadow-sm border border-primary/20"
-                : "text-muted-foreground hover:text-foreground hover:bg-muted/50"
-            }`}
+            className={`flex items-center gap-2 px-4 py-2 border border-transparent text-sm font-medium flex-1 justify-center terminal-font ${activeTab === "scripts"
+              ? "bg-background0 ascii-border"
+              : "hover:ascii-border"
+              }`}
           >
-            <FileText className="h-4 w-4" />
+            <FileTextIcon className="h-4 w-4" />
             {t("scripts.scripts")}
-            <span className="ml-1 text-xs bg-primary/20 text-primary px-2 py-0.5 rounded-full font-medium">
+            <span className="ml-1 text-xs bg-background0 px-2 py-0.5 ascii-border font-medium">
               {scripts.length}
             </span>
           </button>

app/_components/FeatureComponents/LoginForm/LoginForm.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { useState } from "react";
-import { useRouter } from "next/navigation";
+import { useState, useEffect } from "react";
+import { useRouter, useSearchParams } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
@@ -12,26 +12,44 @@ import {
   CardDescription,
   CardContent,
 } from "@/app/_components/GlobalComponents/Cards/Card";
-import { Lock, Eye, EyeOff, Shield, AlertTriangle } from "lucide-react";
+import { LockIcon, EyeIcon, EyeSlashIcon, ShieldIcon, WarningIcon, CircleNotchIcon } from "@phosphor-icons/react";
 
 interface LoginFormProps {
   hasPassword?: boolean;
   hasOIDC?: boolean;
+  oidcAutoRedirect?: boolean;
   version?: string;
 }
 
 export const LoginForm = ({
   hasPassword = false,
   hasOIDC = false,
+  oidcAutoRedirect = false,
   version,
 }: LoginFormProps) => {
   const [password, setPassword] = useState("");
   const [showPassword, setShowPassword] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState("");
+  const [isRedirecting, setIsRedirecting] = useState(false);
   const router = useRouter();
+  const searchParams = useSearchParams();
   const t = useTranslations();
 
+  useEffect(() => {
+    const errorParam = searchParams.get("error");
+
+    if (errorParam) {
+      setError(decodeURIComponent(errorParam));
+      return;
+    }
+
+    if (oidcAutoRedirect && !hasPassword && hasOIDC) {
+      setIsRedirecting(true);
+      window.location.href = "/api/oidc/login";
+    }
+  }, [oidcAutoRedirect, hasPassword, hasOIDC, searchParams]);
+
   const handlePasswordSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setIsLoading(true);
@@ -65,19 +83,37 @@ export const LoginForm = ({
     window.location.href = "/api/oidc/login";
   };
 
+  if (isRedirecting) {
+    return (
+      <Card className="w-full max-w-md shadow-xl">
+        <CardContent className="pt-6">
+          <div className="flex flex-col items-center justify-center py-8 space-y-4">
+            <CircleNotchIcon className="w-12 h-12 text-primary animate-spin" />
+            <div className="text-center">
+              <p className="text-lg font-medium">{t("login.redirectingToOIDC")}</p>
+              <p className="text-sm text-muted-foreground mt-1">
+                {t("login.pleaseWait")}
+              </p>
+            </div>
+          </div>
+        </CardContent>
+      </Card>
+    );
+  }
+
   return (
     <Card className="w-full max-w-md shadow-xl">
       <CardHeader className="text-center">
         <div className="mx-auto w-16 h-16 bg-primary/10 rounded-full flex items-center justify-center mb-4">
-          <Lock className="w-8 h-8 text-primary" />
+          <LockIcon className="w-8 h-8 text-primary" />
         </div>
         <CardTitle>{t("login.welcomeTitle")}</CardTitle>
         <CardDescription>
           {hasPassword && hasOIDC
             ? t("login.signInWithPasswordOrSSO")
             : hasOIDC
-            ? t("login.signInWithSSO")
-            : t("login.enterPasswordToContinue")}
+              ? t("login.signInWithSSO")
+              : t("login.enterPasswordToContinue")}
         </CardDescription>
       </CardHeader>
 
@@ -85,7 +121,7 @@ export const LoginForm = ({
         {!hasPassword && !hasOIDC && (
           <div className="mb-4 p-3 bg-amber-500/10 border border-amber-500/20 rounded-md">
             <div className="flex items-start space-x-2">
-              <AlertTriangle className="w-4 h-4 text-amber-500 mt-0.5 flex-shrink-0" />
+              <WarningIcon className="w-4 h-4 text-amber-500 mt-0.5 flex-shrink-0" />
               <div className="text-sm text-amber-700 dark:text-amber-400">
                 <div className="font-medium">
                   {t("login.authenticationNotConfigured")}
@@ -116,9 +152,9 @@ export const LoginForm = ({
                   disabled={isLoading}
                 >
                   {showPassword ? (
-                    <EyeOff className="w-4 h-4" />
+                    <EyeSlashIcon className="w-4 h-4" />
                   ) : (
-                    <Eye className="w-4 h-4" />
+                    <EyeIcon className="w-4 h-4" />
                   )}
                 </button>
               </div>
@@ -139,7 +175,7 @@ export const LoginForm = ({
                 <span className="w-full border-t" />
               </div>
               <div className="relative flex justify-center text-xs uppercase">
-                <span className="bg-background px-2 text-muted-foreground">
+                <span className="bg-background0 px-2 text-muted-foreground">
                   {t("login.orContinueWith")}
                 </span>
               </div>
@@ -154,7 +190,7 @@ export const LoginForm = ({
               onClick={handleOIDCLogin}
               disabled={isLoading}
             >
-              <Shield className="w-4 h-4 mr-2" />
+              <ShieldIcon className="w-4 h-4 mr-2" />
               {isLoading ? t("login.redirecting") : t("login.signInWithSSO")}
             </Button>
           )}
@@ -167,7 +203,7 @@ export const LoginForm = ({
         </div>
 
         {version && (
-          <div className="mt-6 pt-4 border-t border-border/50">
+          <div className="mt-6 pt-4 border-t border-border">
             <div className="text-center text-xs text-muted-foreground">
               Cr*nMaster {t("common.version", { version })}
             </div>

app/_components/FeatureComponents/LoginForm/LogoutButton.tsx

@@ -3,7 +3,7 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { LogOut } from "lucide-react";
+import { SignOutIcon } from "@phosphor-icons/react";
 
 export const LogoutButton = () => {
   const [isLoading, setIsLoading] = useState(false);
@@ -35,7 +35,7 @@ export const LogoutButton = () => {
       disabled={isLoading}
       title="Logout"
     >
-      <LogOut className="h-[1.2rem] w-[1.2rem]" />
+      <SignOutIcon className="h-[1.2rem] w-[1.2rem]" />
       <span className="sr-only">Logout</span>
     </Button>
   );

app/_components/FeatureComponents/Modals/CloneScriptModal.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { Copy } from "lucide-react";
+import { CopyIcon } from "@phosphor-icons/react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
@@ -89,7 +89,7 @@ export const CloneScriptModal = ({
               </>
             ) : (
               <>
-                <Copy className="h-4 w-4 mr-2" />
+                <CopyIcon className="h-4 w-4 mr-2" />
                 Clone Script
               </>
             )}

app/_components/FeatureComponents/Modals/CloneTaskModal.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { Copy } from "lucide-react";
+import { CopyIcon } from "@phosphor-icons/react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
@@ -89,7 +89,7 @@ export const CloneTaskModal = ({
               </>
             ) : (
               <>
-                <Copy className="h-4 w-4 mr-2" />
+                <CopyIcon className="h-4 w-4 mr-2" />
                 Clone Cron Job
               </>
             )}

app/_components/FeatureComponents/Modals/CreateScriptModal.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Plus } from "lucide-react";
+import { PlusIcon } from "@phosphor-icons/react";
 import { ScriptModal } from "@/app/_components/FeatureComponents/Modals/ScriptModal";
 
 interface CreateScriptModalProps {
@@ -15,6 +15,8 @@ interface CreateScriptModalProps {
     content: string;
   };
   onFormChange: (updates: Partial<CreateScriptModalProps["form"]>) => void;
+  isDraft?: boolean;
+  onClearDraft?: () => void;
 }
 
 export const CreateScriptModal = ({
@@ -23,6 +25,8 @@ export const CreateScriptModal = ({
   onSubmit,
   form,
   onFormChange,
+  isDraft,
+  onClearDraft,
 }: CreateScriptModalProps) => {
   return (
     <ScriptModal
@@ -31,9 +35,11 @@ export const CreateScriptModal = ({
       onSubmit={onSubmit}
       title="Create New Script"
       submitButtonText="Create Script"
-      submitButtonIcon={<Plus className="h-4 w-4 mr-2" />}
+      submitButtonIcon={<PlusIcon className="h-4 w-4 mr-2" />}
       form={form}
       onFormChange={onFormChange}
+      isDraft={isDraft}
+      onClearDraft={onClearDraft}
     />
   );
 }

app/_components/FeatureComponents/Modals/CreateTaskModal.tsx

@@ -4,10 +4,11 @@ import { useState, useEffect } from "react";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
+import { Switch } from "@/app/_components/GlobalComponents/UIElements/Switch";
 import { CronExpressionHelper } from "@/app/_components/FeatureComponents/Scripts/CronExpressionHelper";
 import { SelectScriptModal } from "@/app/_components/FeatureComponents/Modals/SelectScriptModal";
 import { UserSwitcher } from "@/app/_components/FeatureComponents/User/UserSwitcher";
-import { Plus, Terminal, FileText, X, FileOutput } from "lucide-react";
+import { PlusIcon, TerminalIcon, FileTextIcon, XIcon, FileArrowDownIcon } from "@phosphor-icons/react";
 import { getScriptContent } from "@/app/_server/actions/scripts";
 import { getHostScriptPath } from "@/app/_server/actions/scripts";
 import { useTranslations } from "next-intl";
@@ -64,9 +65,10 @@ export const CreateTaskModal = ({
   }, [selectedScript]);
 
   const handleScriptSelect = async (script: Script) => {
+    const scriptPath = await getHostScriptPath(script.filename);
     onFormChange({
       selectedScriptId: script.id,
-      command: await getHostScriptPath(script.filename),
+      command: scriptPath,
     });
   };
 
@@ -99,7 +101,7 @@ export const CreateTaskModal = ({
             </label>
             <UserSwitcher
               selectedUser={form.user}
-              onUserChange={(user) => onFormChange({ user })}
+              onUserChange={(user: string) => onFormChange({ user })}
             />
           </div>
 
@@ -123,14 +125,13 @@ export const CreateTaskModal = ({
               <button
                 type="button"
                 onClick={handleCustomCommand}
-                className={`p-4 rounded-lg border-2 transition-all ${
-                  !form.selectedScriptId
-                    ? "border-primary bg-primary/5 text-primary"
-                    : "border-border bg-muted/30 text-muted-foreground hover:border-border/60"
-                }`}
+                className={`p-4 rounded-lg transition-all ${!form.selectedScriptId
+                  ? "border-border border-2"
+                  : "border-border border"
+                  }`}
               >
                 <div className="flex items-center gap-3">
-                  <Terminal className="h-5 w-5" />
+                  <TerminalIcon className="h-5 w-5" />
                   <div className="text-left">
                     <div className="font-medium">
                       {t("cronjobs.customCommand")}
@@ -145,14 +146,13 @@ export const CreateTaskModal = ({
               <button
                 type="button"
                 onClick={() => setIsSelectScriptModalOpen(true)}
-                className={`p-4 rounded-lg border-2 transition-all ${
-                  form.selectedScriptId
-                    ? "border-primary bg-primary/5 text-primary"
-                    : "border-border bg-muted/30 text-muted-foreground hover:border-border/60"
-                }`}
+                className={`p-4 rounded-lg transition-all ${form.selectedScriptId
+                  ? "border-border border-2"
+                  : "border-border border"
+                  }`}
               >
                 <div className="flex items-center gap-3">
-                  <FileText className="h-5 w-5" />
+                  <FileTextIcon className="h-5 w-5" />
                   <div className="text-left">
                     <div className="font-medium">
                       {t("scripts.savedScript")}
@@ -171,7 +171,7 @@ export const CreateTaskModal = ({
               <div className="flex items-start justify-between">
                 <div className="flex-1">
                   <div className="flex items-center gap-2 mb-1">
-                    <FileText className="h-4 w-4 text-primary" />
+                    <FileTextIcon className="h-4 w-4 text-primary" />
                     <h4 className="font-medium text-foreground">
                       {selectedScript.name}
                     </h4>
@@ -179,7 +179,7 @@ export const CreateTaskModal = ({
                   <p className="text-sm text-muted-foreground mb-2">
                     {selectedScript.description}
                   </p>
-                  <div className="bg-muted/30 p-2 rounded border border-border/30">
+                  <div className="bg-muted/30 p-2 rounded border border-border">
                     <code className="text-xs font-mono text-foreground break-all">
                       {form.command}
                     </code>
@@ -202,7 +202,7 @@ export const CreateTaskModal = ({
                     onClick={handleClearScript}
                     className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground"
                   >
-                    <X className="h-4 w-4" />
+                    <XIcon className="h-4 w-4" />
                   </Button>
                 </div>
               </div>
@@ -223,12 +223,12 @@ export const CreateTaskModal = ({
                       ? "/app/scripts/script_name.sh"
                       : "/usr/bin/command"
                   }
-                  className="w-full h-24 p-2 border border-border rounded bg-background text-foreground font-mono text-sm resize-none focus:outline-none focus:ring-1 focus:ring-primary/20"
+                  className="w-full h-24 p-2 border border-border rounded bg-background0 text-foreground font-mono text-sm resize-none focus:outline-none focus:ring-1 focus:ring-primary/20"
                   required
                   readOnly={!!form.selectedScriptId}
                 />
                 <div className="absolute right-3 top-2">
-                  <Terminal className="h-4 w-4 text-muted-foreground" />
+                  <TerminalIcon className="h-4 w-4 text-muted-foreground" />
                 </div>
               </div>
               {form.selectedScriptId && (
@@ -250,29 +250,28 @@ export const CreateTaskModal = ({
               value={form.comment}
               onChange={(e) => onFormChange({ comment: e.target.value })}
               placeholder={t("cronjobs.whatDoesThisTaskDo")}
-              className="bg-muted/30 border-border/50 focus:border-primary/50"
+              className="bg-muted/30 border-border focus:border-primary/50"
             />
           </div>
 
-          <div className="border border-border/30 bg-muted/10 rounded-lg p-4">
-            <div className="flex items-start gap-3">
-              <input
-                type="checkbox"
-                id="logsEnabled"
+
+          <div className="border border-border bg-muted/10 rounded-lg p-4">
+            <div
+              className="flex items-start gap-3 cursor-pointer"
+              onClick={() => onFormChange({ logsEnabled: !form.logsEnabled })}
+            >
+              <Switch
                 checked={form.logsEnabled}
-                onChange={(e) =>
-                  onFormChange({ logsEnabled: e.target.checked })
+                onCheckedChange={(checked) =>
+                  onFormChange({ logsEnabled: checked })
                 }
-                className="mt-1 h-4 w-4 rounded border-border text-primary focus:ring-primary/20 cursor-pointer"
+                className="mt-1"
               />
               <div className="flex-1">
-                <label
-                  htmlFor="logsEnabled"
-                  className="flex items-center gap-2 text-sm font-medium text-foreground cursor-pointer"
-                >
-                  <FileOutput className="h-4 w-4 text-primary" />
+                <div className="flex items-center gap-2 text-sm font-medium text-foreground">
+                  <FileArrowDownIcon className="h-4 w-4 text-primary" />
                   {t("cronjobs.enableLogging")}
-                </label>
+                </div>
                 <p className="text-xs text-muted-foreground mt-1">
                   {t("cronjobs.loggingDescription")}
                 </p>
@@ -280,7 +279,8 @@ export const CreateTaskModal = ({
             </div>
           </div>
 
-          <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
+
+          <div className="flex justify-end gap-2 pt-3 border-t border-border">
             <Button
               type="button"
               variant="outline"
@@ -290,7 +290,7 @@ export const CreateTaskModal = ({
               {t("common.cancel")}
             </Button>
             <Button type="submit" className="btn-primary glow-primary">
-              <Plus className="h-4 w-4 mr-2" />
+              <PlusIcon className="h-4 w-4 mr-2" />
               {t("cronjobs.createTask")}
             </Button>
           </div>

app/_components/FeatureComponents/Modals/DeleteScriptModal.tsx

@@ -2,7 +2,7 @@
 
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { FileText, AlertCircle, Trash2 } from "lucide-react";
+import { FileTextIcon, WarningCircleIcon, TrashIcon } from "@phosphor-icons/react";
 import { Script } from "@/app/_utils/scripts-utils";
 
 interface DeleteScriptModalProps {
@@ -25,10 +25,10 @@ export const DeleteScriptModal = ({
   return (
     <Modal isOpen={isOpen} onClose={onClose} title="Delete Script" size="sm">
       <div className="space-y-3">
-        <div className="bg-muted/30 rounded p-2 border border-border/50">
+        <div className="bg-muted/30 rounded p-2 border border-border">
           <div className="space-y-1">
             <div className="flex items-center gap-2">
-              <FileText className="h-3 w-3 text-muted-foreground" />
+              <FileTextIcon className="h-3 w-3 text-muted-foreground" />
               <span className="text-xs font-medium text-foreground">
                 {script.name}
               </span>
@@ -36,7 +36,7 @@ export const DeleteScriptModal = ({
 
             {script.description && (
               <div className="flex items-start gap-2">
-                <FileText className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+                <FileTextIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
                 <p className="text-xs text-muted-foreground break-words italic">
                   {script.description}
                 </p>
@@ -44,8 +44,8 @@ export const DeleteScriptModal = ({
             )}
 
             <div className="flex items-start gap-2">
-              <FileText className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
-              <code className="text-xs font-mono bg-muted/30 px-1 py-0.5 rounded border border-border/30">
+              <FileTextIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+              <code className="text-xs font-mono bg-muted/30 px-1 py-0.5 rounded border border-border">
                 {script.filename}
               </code>
             </div>
@@ -54,7 +54,7 @@ export const DeleteScriptModal = ({
 
         <div className="bg-destructive/5 border border-destructive/20 rounded p-2">
           <div className="flex items-start gap-2">
-            <AlertCircle className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
+            <WarningCircleIcon className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
             <div>
               <p className="text-xs font-medium text-destructive mb-0.5">
                 This action cannot be undone
@@ -66,7 +66,7 @@ export const DeleteScriptModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-2 border-t border-border/50">
+        <div className="flex justify-end gap-2 pt-2 border-t border-border">
           <Button
             variant="outline"
             onClick={onClose}
@@ -78,7 +78,6 @@ export const DeleteScriptModal = ({
           <Button
             variant="destructive"
             onClick={onConfirm}
-            className="btn-destructive"
             disabled={isDeleting}
           >
             {isDeleting ? (
@@ -88,7 +87,7 @@ export const DeleteScriptModal = ({
               </>
             ) : (
               <>
-                <Trash2 className="h-4 w-4 mr-2" />
+                <TrashIcon className="h-4 w-4 mr-2" />
                 Delete Script
               </>
             )}

app/_components/FeatureComponents/Modals/DeleteTaskModal.tsx

@@ -4,11 +4,11 @@ import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import {
   Calendar,
-  Terminal,
-  MessageSquare,
-  AlertCircle,
-  Trash2,
-} from "lucide-react";
+  TerminalIcon,
+  ChatTextIcon,
+  WarningCircleIcon,
+  TrashIcon,
+} from "@phosphor-icons/react";
 import { CronJob } from "@/app/_utils/cronjob-utils";
 
 interface DeleteTaskModalProps {
@@ -34,7 +34,7 @@ export const DeleteTaskModal = ({
       size="sm"
     >
       <div className="space-y-3">
-        <div className="bg-muted/30 rounded p-2 border border-border/50">
+        <div className="bg-muted/30 rounded p-2 border border-border">
           <div className="space-y-1">
             <div className="flex items-center gap-2">
               <Calendar className="h-3 w-3 text-muted-foreground" />
@@ -44,15 +44,15 @@ export const DeleteTaskModal = ({
             </div>
 
             <div className="flex items-start gap-2">
-              <Terminal className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
-              <pre className="max-w-full overflow-x-auto text-xs font-medium text-foreground break-words bg-muted/30 px-1 py-0.5 rounded border border-border/30 flex-1 hide-scrollbar">
+              <TerminalIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+              <pre className="max-w-full overflow-x-auto text-xs font-medium text-foreground break-words bg-muted/30 px-1 py-0.5 rounded border border-border flex-1 hide-scrollbar">
                 {job.command}
               </pre>
             </div>
 
             {job.comment && (
               <div className="flex items-start gap-2">
-                <MessageSquare className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+                <ChatTextIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
                 <p className="text-xs text-muted-foreground break-words italic">
                   {job.comment}
                 </p>
@@ -63,7 +63,7 @@ export const DeleteTaskModal = ({
 
         <div className="bg-destructive/5 border border-destructive/20 rounded p-2">
           <div className="flex items-start gap-2">
-            <AlertCircle className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
+            <WarningCircleIcon className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
             <div>
               <p className="text-xs font-medium text-destructive mb-0.5">
                 This action cannot be undone
@@ -75,16 +75,15 @@ export const DeleteTaskModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-2 border-t border-border/50">
+        <div className="flex justify-end gap-2 pt-2 border-t border-border">
           <Button variant="outline" onClick={onClose} className="btn-outline">
             Cancel
           </Button>
           <Button
             variant="destructive"
             onClick={onConfirm}
-            className="btn-destructive"
           >
-            <Trash2 className="h-4 w-4 mr-2" />
+            <TrashIcon className="h-4 w-4 mr-2" />
             Delete Task
           </Button>
         </div>

app/_components/FeatureComponents/Modals/EditScriptModal.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Edit } from "lucide-react";
+import { PencilSimpleIcon } from "@phosphor-icons/react";
 import { Script } from "@/app/_utils/scripts-utils";
 import { ScriptModal } from "@/app/_components/FeatureComponents/Modals/ScriptModal";
 
@@ -36,7 +36,7 @@ export const EditScriptModal = ({
       onSubmit={onSubmit}
       title="Edit Script"
       submitButtonText="Update Script"
-      submitButtonIcon={<Edit className="h-4 w-4 mr-2" />}
+      submitButtonIcon={<PencilSimpleIcon className="h-4 w-4 mr-2" />}
       form={form}
       onFormChange={onFormChange}
       additionalFormData={{ id: script.id }}

app/_components/FeatureComponents/Modals/EditTaskModal.tsx

@@ -3,8 +3,9 @@
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
+import { Switch } from "@/app/_components/GlobalComponents/UIElements/Switch";
 import { CronExpressionHelper } from "@/app/_components/FeatureComponents/Scripts/CronExpressionHelper";
-import { Edit, Terminal, FileOutput } from "lucide-react";
+import { PencilSimpleIcon, TerminalIcon, FileArrowDownIcon } from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 
 interface EditTaskModalProps {
@@ -59,11 +60,11 @@ export const EditTaskModal = ({
                 value={form.command}
                 onChange={(e) => onFormChange({ command: e.target.value })}
                 placeholder="/usr/bin/command"
-                className="font-mono bg-muted/30 border-border/50 focus:border-primary/50"
+                className="font-mono bg-muted/30 border-border focus:border-primary/50"
                 required
               />
               <div className="absolute right-3 top-1/2 -translate-y-1/2">
-                <Terminal className="h-4 w-4 text-muted-foreground" />
+                <TerminalIcon className="h-4 w-4 text-muted-foreground" />
               </div>
             </div>
           </div>
@@ -80,27 +81,26 @@ export const EditTaskModal = ({
             value={form.comment}
             onChange={(e) => onFormChange({ comment: e.target.value })}
             placeholder={t("cronjobs.whatDoesThisTaskDo")}
-            className="bg-muted/30 border-border/50 focus:border-primary/50"
+            className="bg-muted/30 border-border focus:border-primary/50"
           />
         </div>
 
-        <div className="border border-border/30 bg-muted/10 rounded-lg p-4">
-          <div className="flex items-start gap-3">
-            <input
-              type="checkbox"
-              id="logsEnabled"
+
+        <div className="border border-border bg-muted/10 rounded-lg p-4">
+          <div
+            className="flex items-start gap-3 cursor-pointer"
+            onClick={() => onFormChange({ logsEnabled: !form.logsEnabled })}
+          >
+            <Switch
               checked={form.logsEnabled}
-              onChange={(e) => onFormChange({ logsEnabled: e.target.checked })}
-              className="mt-1 h-4 w-4 rounded border-border text-primary focus:ring-primary/20 cursor-pointer"
+              onCheckedChange={(checked) => onFormChange({ logsEnabled: checked })}
+              className="mt-1"
             />
             <div className="flex-1">
-              <label
-                htmlFor="logsEnabled"
-                className="flex items-center gap-2 text-sm font-medium text-foreground cursor-pointer"
-              >
-                <FileOutput className="h-4 w-4 text-primary" />
+              <div className="flex items-center gap-2 text-sm font-medium text-foreground">
+                <FileArrowDownIcon className="h-4 w-4 text-primary" />
                 {t("cronjobs.enableLogging")}
-              </label>
+              </div>
               <p className="text-xs text-muted-foreground mt-1">
                 {t("cronjobs.loggingDescription")}
               </p>
@@ -108,7 +108,8 @@ export const EditTaskModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
+
+        <div className="flex justify-end gap-2 pt-3 border-t border-border">
           <Button
             type="button"
             variant="outline"
@@ -118,7 +119,7 @@ export const EditTaskModal = ({
             Cancel
           </Button>
           <Button type="submit" className="btn-primary glow-primary">
-            <Edit className="h-4 w-4 mr-2" />
+            <PencilSimpleIcon className="h-4 w-4 mr-2" />
             Update Task
           </Button>
         </div>

app/_components/FeatureComponents/Modals/ErrorDetailsModal.tsx

@@ -2,7 +2,7 @@
 
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { AlertCircle, Copy, X } from "lucide-react";
+import { WarningCircleIcon, CopyIcon, XIcon } from "@phosphor-icons/react";
 import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
 
 interface ErrorDetails {
@@ -54,7 +54,7 @@ Timestamp: ${error.timestamp}
       <div className="space-y-4">
         <div className="bg-destructive/5 border border-destructive/20 rounded-lg p-4">
           <div className="flex items-start gap-3">
-            <AlertCircle className="h-5 w-5 text-destructive mt-0.5 flex-shrink-0" />
+            <WarningCircleIcon className="h-5 w-5 text-destructive mt-0.5 flex-shrink-0" />
             <div className="flex-1">
               <h3 className="font-medium text-destructive mb-1">
                 {error.title}
@@ -69,7 +69,7 @@ Timestamp: ${error.timestamp}
             <h4 className="text-sm font-medium text-foreground mb-2">
               Details
             </h4>
-            <div className="bg-muted/30 p-3 rounded border border-border/30">
+            <div className="bg-muted/30 p-3 rounded border border-border">
               <pre className="text-sm font-mono text-foreground whitespace-pre-wrap break-words">
                 {error.details}
               </pre>
@@ -82,7 +82,7 @@ Timestamp: ${error.timestamp}
             <h4 className="text-sm font-medium text-foreground mb-2">
               Command
             </h4>
-            <div className="bg-muted/30 p-3 rounded border border-border/30">
+            <div className="bg-muted/30 p-3 rounded border border-border">
               <code className="text-sm font-mono text-foreground break-all">
                 {error.command}
               </code>
@@ -93,7 +93,7 @@ Timestamp: ${error.timestamp}
         {error.output && (
           <div>
             <h4 className="text-sm font-medium text-foreground mb-2">Output</h4>
-            <div className="bg-muted/30 p-3 rounded border border-border/30 max-h-32 overflow-y-auto">
+            <div className="bg-muted/30 p-3 rounded border border-border max-h-32 overflow-y-auto tui-scrollbar">
               <pre className="text-sm font-mono text-foreground whitespace-pre-wrap">
                 {error.output}
               </pre>
@@ -106,7 +106,7 @@ Timestamp: ${error.timestamp}
             <h4 className="text-sm font-medium text-foreground mb-2">
               Error Output
             </h4>
-            <div className="bg-destructive/5 p-3 rounded border border-destructive/20 max-h-32 overflow-y-auto">
+            <div className="bg-destructive/5 p-3 rounded border border-destructive/20 max-h-32 overflow-y-auto tui-scrollbar">
               <pre className="text-sm font-mono text-destructive whitespace-pre-wrap">
                 {error.stderr}
               </pre>
@@ -118,14 +118,14 @@ Timestamp: ${error.timestamp}
           Timestamp: {error.timestamp}
         </div>
 
-        <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
+        <div className="flex justify-end gap-2 pt-3 border-t border-border">
           <Button
             variant="outline"
             onClick={handleCopyDetails}
             className="btn-outline"
           >
-            <Copy className="h-4 w-4 mr-2" />
-            Copy Details
+            <CopyIcon className="h-4 w-4 mr-2" />
+            CopyIcon Details
           </Button>
           <Button onClick={onClose} className="btn-primary">
             Close

app/_components/FeatureComponents/Modals/FiltersModal.tsx

@@ -3,7 +3,7 @@
 import { useState, useEffect } from "react";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { ChevronDown, Code, MessageSquare } from "lucide-react";
+import { CaretDownIcon, CodeIcon, ChatTextIcon } from "@phosphor-icons/react";
 import { UserFilter } from "@/app/_components/FeatureComponents/User/UserFilter";
 import { useTranslations } from "next-intl";
 
@@ -72,15 +72,15 @@ export const FiltersModal = ({
               >
                 <div className="flex items-center">
                   {localScheduleMode === "cron" && (
-                    <Code className="h-4 w-4 mr-2" />
+                    <CodeIcon className="h-4 w-4 mr-2" />
                   )}
                   {localScheduleMode === "human" && (
-                    <MessageSquare className="h-4 w-4 mr-2" />
+                    <ChatTextIcon className="h-4 w-4 mr-2" />
                   )}
                   {localScheduleMode === "both" && (
                     <>
-                      <Code className="h-4 w-4 mr-1" />
-                      <MessageSquare className="h-4 w-4 mr-2" />
+                      <CodeIcon className="h-4 w-4 mr-1" />
+                      <ChatTextIcon className="h-4 w-4 mr-2" />
                     </>
                   )}
                   <span>
@@ -90,23 +90,22 @@ export const FiltersModal = ({
                     {localScheduleMode === "both" && t("cronjobs.both")}
                   </span>
                 </div>
-                <ChevronDown className="h-4 w-4 ml-2" />
+                <CaretDownIcon className="h-4 w-4 ml-2" />
               </Button>
 
               {isScheduleDropdownOpen && (
-                <div className="absolute top-full left-0 right-0 mt-1 bg-background border border-border rounded-md shadow-lg z-50 min-w-[140px]">
+                <div className="absolute top-full left-0 p-1 right-0 mt-1 bg-background0 border border-border rounded-md shadow-lg z-50 min-w-[140px]">
                   <button
                     onClick={() => {
                       setLocalScheduleMode("cron");
                       setIsScheduleDropdownOpen(false);
                     }}
-                    className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors flex items-center gap-2 ${
-                      localScheduleMode === "cron"
-                        ? "bg-accent text-accent-foreground"
-                        : ""
-                    }`}
+                    className={`w-full text-left px-3 border py-2 text-sm hover:border-border border-transparent transition-colors flex items-center gap-2 ${localScheduleMode === "cron"
+                      ? "border-border"
+                      : ""
+                      }`}
                   >
-                    <Code className="h-3 w-3" />
+                    <CodeIcon className="h-3 w-3" />
                     {t("cronjobs.cronSyntax")}
                   </button>
                   <button
@@ -114,13 +113,12 @@ export const FiltersModal = ({
                       setLocalScheduleMode("human");
                       setIsScheduleDropdownOpen(false);
                     }}
-                    className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors flex items-center gap-2 ${
-                      localScheduleMode === "human"
-                        ? "bg-accent text-accent-foreground"
-                        : ""
-                    }`}
+                    className={`w-full text-left px-3 py-2 border text-sm hover:border-border border-transparent transition-colors flex items-center gap-2 ${localScheduleMode === "human"
+                      ? "border-border"
+                      : ""
+                      }`}
                   >
-                    <MessageSquare className="h-3 w-3" />
+                    <ChatTextIcon className="h-3 w-3" />
                     {t("cronjobs.humanReadable")}
                   </button>
                   <button
@@ -128,14 +126,13 @@ export const FiltersModal = ({
                       setLocalScheduleMode("both");
                       setIsScheduleDropdownOpen(false);
                     }}
-                    className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors flex items-center gap-2 ${
-                      localScheduleMode === "both"
-                        ? "bg-accent text-accent-foreground"
-                        : ""
-                    }`}
+                    className={`w-full text-left px-3 py-2 border text-sm hover:border-border border-transparent transition-colors flex items-center gap-2 ${localScheduleMode === "both"
+                      ? "border-border"
+                      : ""
+                      }`}
                   >
-                    <Code className="h-3 w-3" />
-                    <MessageSquare className="h-3 w-3" />
+                    <CodeIcon className="h-3 w-3" />
+                    <ChatTextIcon className="h-3 w-3" />
                     {t("cronjobs.both")}
                   </button>
                 </div>
@@ -144,7 +141,7 @@ export const FiltersModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-4 border-t border-border">
+        <div className="flex justify-end gap-2 pt-4">
           <Button variant="outline" onClick={onClose}>
             {t("common.cancel")}
           </Button>

app/_components/FeatureComponents/Modals/LiveLogModal.tsx

@@ -1,11 +1,13 @@
 "use client";
 
-import { useState, useEffect, useRef } from "react";
-import { Loader2, CheckCircle2, XCircle } from "lucide-react";
+import { useState, useEffect, useRef, useCallback } from "react";
+import { CircleNotchIcon, CheckCircleIcon, XCircleIcon, WarningIcon, ArrowsInIcon, ArrowsOutIcon } from "@phosphor-icons/react";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
+import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { useSSEContext } from "@/app/_contexts/SSEContext";
 import { SSEEvent } from "@/app/_utils/sse-events";
 import { usePageVisibility } from "@/app/_hooks/usePageVisibility";
+import { useTranslations } from "next-intl";
 
 interface LiveLogModalProps {
   isOpen: boolean;
@@ -15,6 +17,9 @@ interface LiveLogModalProps {
   jobComment?: string;
 }
 
+const MAX_LINES_FULL_RENDER = 10000;
+const TAIL_LINES = 5000;
+
 export const LiveLogModal = ({
   isOpen,
   onClose,
@@ -22,65 +27,125 @@ export const LiveLogModal = ({
   jobId,
   jobComment,
 }: LiveLogModalProps) => {
+  const t = useTranslations();
   const [logContent, setLogContent] = useState<string>("");
   const [status, setStatus] = useState<"running" | "completed" | "failed">(
     "running"
   );
   const [exitCode, setExitCode] = useState<number | null>(null);
+  const [tailMode, setTailMode] = useState<boolean>(false);
+  const [showSizeWarning, setShowSizeWarning] = useState<boolean>(false);
   const logEndRef = useRef<HTMLDivElement>(null);
   const { subscribe } = useSSEContext();
   const isPageVisible = usePageVisibility();
   const lastOffsetRef = useRef<number>(0);
   const abortControllerRef = useRef<AbortController | null>(null);
+  const [fileSize, setFileSize] = useState<number>(0);
+  const [lineCount, setLineCount] = useState<number>(0);
+  const [maxLines, setMaxLines] = useState<number>(500);
+  const [totalLines, setTotalLines] = useState<number>(0);
+  const [truncated, setTruncated] = useState<boolean>(false);
+  const [showFullLog, setShowFullLog] = useState<boolean>(false);
+  const [isJobComplete, setIsJobComplete] = useState<boolean>(false);
+
+  useEffect(() => {
+    if (isOpen) {
+      lastOffsetRef.current = 0;
+      setLogContent("");
+      setTailMode(false);
+      setShowSizeWarning(false);
+      setFileSize(0);
+      setLineCount(0);
+      setShowFullLog(false);
+      setIsJobComplete(false);
+    }
+  }, [isOpen, runId]);
+
+  useEffect(() => {
+    if (isOpen && runId && !isJobComplete) {
+      lastOffsetRef.current = 0;
+      setLogContent("");
+      fetchLogs();
+    }
+  }, [maxLines]);
+
+  const fetchLogs = useCallback(async () => {
+    if (abortControllerRef.current) {
+      abortControllerRef.current.abort();
+    }
+
+    const abortController = new AbortController();
+    abortControllerRef.current = abortController;
+
+    try {
+      const url = `/api/logs/stream?runId=${runId}&offset=${lastOffsetRef.current}&maxLines=${maxLines}`;
+      const response = await fetch(url, {
+        signal: abortController.signal,
+      });
+      const data = await response.json();
+
+      if (data.fileSize !== undefined) {
+        lastOffsetRef.current = data.fileSize;
+        setFileSize(data.fileSize);
+
+        if (data.fileSize > 10 * 1024 * 1024) {
+          setShowSizeWarning(true);
+        }
+      }
+
+      if (data.totalLines !== undefined) {
+        setTotalLines(data.totalLines);
+      }
+      setLineCount(data.displayedLines || 0);
+
+      if (data.truncated !== undefined) {
+        setTruncated(data.truncated);
+      }
+
+      if (lastOffsetRef.current === 0 && data.content) {
+        setLogContent(data.content);
+
+        if (data.truncated) {
+          setTailMode(true);
+        }
+      } else if (data.newContent) {
+        setLogContent((prev) => {
+          const combined = prev + data.newContent;
+          const lines = combined.split("\n");
+
+          if (lines.length > maxLines) {
+            return lines.slice(-maxLines).join("\n");
+          }
+
+          return combined;
+        });
+      }
+
+      const jobStatus = data.status || "running";
+      setStatus(jobStatus);
+
+      if (jobStatus === "completed" || jobStatus === "failed") {
+        setIsJobComplete(true);
+      }
+
+      if (data.exitCode !== undefined) {
+        setExitCode(data.exitCode);
+      }
+    } catch (error: any) {
+      if (error.name !== "AbortError") {
+        console.error("Failed to fetch logs:", error);
+      }
+    }
+  }, [runId, maxLines]);
 
   useEffect(() => {
     if (!isOpen || !runId || !isPageVisible) return;
 
-    lastOffsetRef.current = 0;
-    setLogContent("");
-
-    const fetchLogs = async () => {
-      if (abortControllerRef.current) {
-        abortControllerRef.current.abort();
-      }
-
-      const abortController = new AbortController();
-      abortControllerRef.current = abortController;
-
-      try {
-        const url = `/api/logs/stream?runId=${runId}&offset=${lastOffsetRef.current}`;
-        const response = await fetch(url, {
-          signal: abortController.signal,
-        });
-        const data = await response.json();
-
-        if (data.fileSize !== undefined) {
-          lastOffsetRef.current = data.fileSize;
-        }
-
-        if (lastOffsetRef.current === 0 && data.content) {
-          setLogContent(data.content);
-        } else if (data.newContent) {
-          setLogContent((prev) => prev + data.newContent);
-        }
-
-        setStatus(data.status || "running");
-
-        if (data.exitCode !== undefined) {
-          setExitCode(data.exitCode);
-        }
-      } catch (error: any) {
-        if (error.name !== "AbortError") {
-          console.error("Failed to fetch logs:", error);
-        }
-      }
-    };
-
     fetchLogs();
 
     let interval: NodeJS.Timeout | null = null;
-    if (isPageVisible) {
-      interval = setInterval(fetchLogs, 2000);
+    if (isPageVisible && !isJobComplete) {
+      interval = setInterval(fetchLogs, 3000);
     }
 
     return () => {
@@ -91,7 +156,7 @@ export const LiveLogModal = ({
         abortControllerRef.current.abort();
       }
     };
-  }, [isOpen, runId, isPageVisible]);
+  }, [isOpen, runId, isPageVisible, fetchLogs, isJobComplete]);
 
   useEffect(() => {
     if (!isOpen) return;
@@ -101,53 +166,83 @@ export const LiveLogModal = ({
         setStatus("completed");
         setExitCode(event.data.exitCode);
 
-        fetch(`/api/logs/stream?runId=${runId}`)
+        fetch(`/api/logs/stream?runId=${runId}&offset=0`)
           .then((res) => res.json())
           .then((data) => {
             if (data.content) {
-              setLogContent(data.content);
+              const lines = data.content.split("\n");
+              setLineCount(lines.length);
+              if (tailMode && lines.length > TAIL_LINES) {
+                setLogContent(lines.slice(-TAIL_LINES).join("\n"));
+              } else {
+                setLogContent(data.content);
+              }
             }
           });
       } else if (event.type === "job-failed" && event.data.runId === runId) {
         setStatus("failed");
         setExitCode(event.data.exitCode);
 
-        fetch(`/api/logs/stream?runId=${runId}`)
+        fetch(`/api/logs/stream?runId=${runId}&offset=0`)
           .then((res) => res.json())
           .then((data) => {
             if (data.content) {
-              setLogContent(data.content);
+              const lines = data.content.split("\n");
+              setLineCount(lines.length);
+              if (tailMode && lines.length > TAIL_LINES) {
+                setLogContent(lines.slice(-TAIL_LINES).join("\n"));
+              } else {
+                setLogContent(data.content);
+              }
             }
           });
       }
     });
 
     return unsubscribe;
-  }, [isOpen, runId, subscribe]);
+  }, [isOpen, runId, subscribe, tailMode]);
 
   useEffect(() => {
-    logEndRef.current?.scrollIntoView({ behavior: "smooth" });
+    if (logEndRef.current) {
+      logEndRef.current.scrollIntoView({ behavior: "instant" });
+    }
   }, [logContent]);
 
+  const toggleTailMode = () => {
+    setTailMode(!tailMode);
+    if (!tailMode) {
+      const lines = logContent.split("\n");
+      if (lines.length > TAIL_LINES) {
+        setLogContent(lines.slice(-TAIL_LINES).join("\n"));
+      }
+    }
+  };
+
+  const formatFileSize = (bytes: number): string => {
+    if (bytes < 1024) return `${bytes} B`;
+    if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+  };
+
   const titleWithStatus = (
     <div className="flex items-center gap-3">
-      <span>Live Job Execution{jobComment && `: ${jobComment}`}</span>
+      <span>{t("cronjobs.liveJobExecution")}{jobComment && `: ${jobComment}`}</span>
       {status === "running" && (
-        <span className="flex items-center gap-1 text-sm text-blue-500">
-          <Loader2 className="w-4 h-4 animate-spin" />
-          Running...
+        <span className="flex items-center gap-1 text-sm text-status-info">
+          <CircleNotchIcon className="w-4 h-4 animate-spin" />
+          {t("cronjobs.running")}
         </span>
       )}
       {status === "completed" && (
-        <span className="flex items-center gap-1 text-sm text-green-500">
-          <CheckCircle2 className="w-4 h-4" />
-          Completed (Exit: {exitCode})
+        <span className="flex items-center gap-1 text-sm text-status-success">
+          <CheckCircleIcon className="w-4 h-4" />
+          {t("cronjobs.completed", { exitCode: exitCode ?? 0 })}
         </span>
       )}
       {status === "failed" && (
-        <span className="flex items-center gap-1 text-sm text-red-500">
-          <XCircle className="w-4 h-4" />
-          Failed (Exit: {exitCode})
+        <span className="flex items-center gap-1 text-sm text-status-error">
+          <XCircleIcon className="w-4 h-4" />
+          {t("cronjobs.jobFailed", { exitCode: exitCode ?? 1 })}
         </span>
       )}
     </div>
@@ -162,16 +257,108 @@ export const LiveLogModal = ({
       preventCloseOnClickOutside={status === "running"}
     >
       <div className="space-y-4">
-        <div className="bg-black/90 dark:bg-black/60 rounded-lg p-4 max-h-[60vh] overflow-auto">
-          <pre className="text-xs font-mono text-green-400 whitespace-pre-wrap break-words">
-            {logContent ||
-              "Waiting for job to start...\n\nLogs will appear here in real-time."}
+        <div className="flex items-center justify-between gap-4">
+          <div className="flex items-center gap-3">
+            {!showFullLog ? (
+              <>
+                <label htmlFor="maxLines" className="text-sm text-muted-foreground">
+                  {t("cronjobs.showLast")}
+                </label>
+                <select
+                  id="maxLines"
+                  value={maxLines}
+                  onChange={(e) => setMaxLines(parseInt(e.target.value, 10))}
+                  className="bg-background0 border border-border rounded px-2 py-1 text-sm"
+                >
+                  <option value="100">{t("cronjobs.nLines", { count: "100" })}</option>
+                  <option value="500">{t("cronjobs.nLines", { count: "500" })}</option>
+                  <option value="1000">{t("cronjobs.nLines", { count: "1,000" })}</option>
+                  <option value="2000">{t("cronjobs.nLines", { count: "2,000" })}</option>
+                  <option value="5000">{t("cronjobs.nLines", { count: "5,000" })}</option>
+                </select>
+                {truncated && (
+                  <Button
+                    type="button"
+                    variant="outline"
+                    size="sm"
+                    onClick={() => {
+                      setShowFullLog(true);
+                      setMaxLines(50000);
+                    }}
+                    className="text-xs"
+                  >
+                    {totalLines > 0
+                      ? t("cronjobs.viewFullLog", { totalLines: totalLines.toLocaleString() })
+                      : t("cronjobs.viewFullLogNoCount")}
+                  </Button>
+                )}
+              </>
+            ) : (
+              <div className="flex items-center gap-2">
+                <span className="text-sm text-muted-foreground">
+                  {totalLines > 0
+                    ? t("cronjobs.viewingFullLog", { totalLines: totalLines.toLocaleString() })
+                    : t("cronjobs.viewingFullLogNoCount")}
+                </span>
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  onClick={() => {
+                    setShowFullLog(false);
+                    setMaxLines(500);
+                  }}
+                  className="text-xs"
+                >
+                  {t("cronjobs.backToWindowedView")}
+                </Button>
+              </div>
+            )}
+          </div>
+          {truncated && !showFullLog && (
+            <div className="text-sm text-status-warning flex items-center gap-1 terminal-font">
+              <WarningIcon className="h-4 w-4" />
+              {t("cronjobs.showingLastOf", {
+                lineCount: lineCount.toLocaleString(),
+                totalLines: totalLines.toLocaleString()
+              })}
+            </div>
+          )}
+        </div>
+
+        {showSizeWarning && (
+          <div className="bg-background2 ascii-border p-3 flex items-start gap-3 terminal-font">
+            <WarningIcon className="h-4 w-4 text-status-warning mt-0.5 flex-shrink-0" />
+            <div className="flex-1 min-w-0">
+              <p className="text-sm text-foreground">
+                <span className="font-medium">{t("cronjobs.largeLogFileDetected")}</span> ({formatFileSize(fileSize)})
+                {tailMode && ` - ${t("cronjobs.tailModeEnabled", { tailLines: TAIL_LINES.toLocaleString() })}`}
+              </p>
+            </div>
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              onClick={toggleTailMode}
+              className="text-status-warning hover:text-status-warning hover:bg-background2 h-auto py-1 px-2 text-xs"
+              title={tailMode ? t("cronjobs.showAllLines") : t("cronjobs.enableTailMode")}
+            >
+              {tailMode ? <ArrowsOutIcon className="h-3 w-3" /> : <ArrowsInIcon className="h-3 w-3" />}
+            </Button>
+          </div>
+        )}
+
+        <div className="bg-background0 p-4 max-h-[60vh] overflow-auto terminal-font ascii-border">
+          <pre className="text-xs text-status-success whitespace-pre-wrap break-words">
+            {logContent || t("cronjobs.waitingForJobToStart")}
             <div ref={logEndRef} />
           </pre>
         </div>
 
-        <div className="text-xs text-muted-foreground">
-          Run ID: {runId} | Job ID: {jobId}
+        <div className="flex justify-between items-center text-xs text-muted-foreground">
+          <span>
+            {t("cronjobs.runIdJobId", { runId, jobId })}
+          </span>
         </div>
       </div>
     </Modal>

app/_components/FeatureComponents/Modals/LogsModal.tsx

@@ -3,7 +3,7 @@
 import { useState, useEffect } from "react";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { FileText, Trash2, Eye, X, RefreshCw, AlertCircle, CheckCircle } from "lucide-react";
+import { FileTextIcon, TrashIcon, EyeIcon, XIcon, ArrowsClockwiseIcon, WarningCircleIcon, CheckCircleIcon } from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 import {
   getJobLogs,
@@ -173,7 +173,7 @@ export const LogsModal = ({
               className="btn-primary glow-primary"
               size="sm"
             >
-              <RefreshCw
+              <ArrowsClockwiseIcon
                 className={`w-4 h-4 mr-2 ${isLoadingLogs ? "animate-spin" : ""
                   }`}
               />
@@ -182,10 +182,10 @@ export const LogsModal = ({
             {logs.length > 0 && (
               <Button
                 onClick={handleDeleteAllLogs}
-                className="btn-destructive glow-primary"
+                variant="destructive"
                 size="sm"
               >
-                <Trash2 className="w-4 h-4 mr-2" />
+                <TrashIcon className="w-4 h-4 mr-2" />
                 {t("cronjobs.deleteAll")}
               </Button>
             )}
@@ -208,11 +208,11 @@ export const LogsModal = ({
                 logs.map((log) => (
                   <div
                     key={log.filename}
-                    className={`p-3 rounded border cursor-pointer transition-colors ${selectedLog === log.filename
-                      ? "border-primary bg-primary/10"
+                    className={`p-3 ascii-border cursor-pointer transition-colors terminal-font ${selectedLog === log.filename
+                      ? "border-primary bg-background2"
                       : log.hasError
-                        ? "border-red-500/50 hover:border-red-500"
-                        : "border-border hover:border-primary/50"
+                        ? "border-red-600 hover:border-red-600"
+                        : "ascii-border hover:border-primary"
                       }`}
                     onClick={() => handleViewLog(log.filename)}
                   >
@@ -220,11 +220,11 @@ export const LogsModal = ({
                       <div className="flex-1 min-w-0">
                         <div className="flex items-center gap-2 mb-1">
                           {log.hasError ? (
-                            <AlertCircle className="w-4 h-4 flex-shrink-0 text-red-500" />
+                            <WarningCircleIcon className="w-4 h-4 flex-shrink-0 text-status-error" />
                           ) : log.exitCode === 0 ? (
-                            <CheckCircle className="w-4 h-4 flex-shrink-0 text-green-500" />
+                            <CheckCircleIcon className="w-4 h-4 flex-shrink-0 text-status-success" />
                           ) : (
-                            <FileText className="w-4 h-4 flex-shrink-0" />
+                            <FileTextIcon className="w-4 h-4 flex-shrink-0" />
                           )}
                           <span className="text-sm font-medium truncate">
                             {formatTimestamp(log.timestamp)}
@@ -236,9 +236,9 @@ export const LogsModal = ({
                           </p>
                           {log.exitCode !== undefined && (
                             <span
-                              className={`text-xs px-1.5 py-0.5 rounded ${log.hasError
-                                ? "bg-red-500/10 text-red-600 dark:text-red-400"
-                                : "bg-green-500/10 text-green-600 dark:text-green-400"
+                              className={`text-xs px-1.5 py-0.5 ${log.hasError
+                                ? "bg-background2 text-status-error"
+                                : "bg-background2 text-status-success"
                                 }`}
                             >
                               Exit: {log.exitCode}
@@ -251,10 +251,10 @@ export const LogsModal = ({
                           e.stopPropagation();
                           handleDeleteLog(log.filename);
                         }}
-                        className="btn-destructive glow-primary p-1 h-auto"
+                        variant="destructive"
                         size="sm"
                       >
-                        <Trash2 className="w-3 h-3" />
+                        <TrashIcon className="w-3 h-3" />
                       </Button>
                     </div>
                   </div>
@@ -271,13 +271,13 @@ export const LogsModal = ({
                   {t("common.loading")}...
                 </div>
               ) : selectedLog ? (
-                <pre className="h-full overflow-auto bg-muted/50 p-4 rounded border border-border text-xs font-mono whitespace-pre-wrap">
+                <pre className="h-full overflow-auto bg-background0 tui-scrollbar p-4 ascii-border text-xs font-mono whitespace-pre-wrap terminal-font">
                   {logContent}
                 </pre>
               ) : (
                 <div className="h-full flex items-center justify-center text-muted-foreground">
                   <div className="text-center">
-                    <Eye className="w-12 h-12 mx-auto mb-2 opacity-50" />
+                    <EyeIcon className="w-12 h-12 mx-auto mb-2 opacity-50" />
                     <p>{t("cronjobs.selectLogToView")}</p>
                   </div>
                 </div>
@@ -288,7 +288,7 @@ export const LogsModal = ({
 
         <div className="mt-4 pt-4 border-t border-border flex justify-end">
           <Button onClick={onClose} className="btn-primary glow-primary">
-            <X className="w-4 h-4 mr-2" />
+            <XIcon className="w-4 h-4 mr-2" />
             {t("common.close")}
           </Button>
         </div>

app/_components/FeatureComponents/Modals/RestoreBackupModal.tsx

@@ -4,14 +4,14 @@ import { useState, useEffect } from "react";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import {
-  Upload,
-  Trash2,
-  Calendar,
-  User,
-  Download,
-  RefreshCw,
-  Check,
-} from "lucide-react";
+  UploadIcon,
+  TrashIcon,
+  CalendarIcon,
+  UserIcon,
+  DownloadIcon,
+  ArrowsClockwiseIcon,
+  CheckIcon,
+} from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 import { CronJob } from "@/app/_utils/cronjob-utils";
 import { unwrapCommand } from "@/app/_utils/wrapper-utils-client";
@@ -86,14 +86,15 @@ export const RestoreBackupModal = ({
       size="xl"
     >
       <div className="space-y-4">
-        <div className="flex gap-2">
+        <div className="flex flex-col sm:flex-row gap-2">
           <Button
             variant="outline"
             onClick={onBackupAll}
             className="btn-outline flex-1"
           >
-            <Download className="h-4 w-4 mr-2" />
-            {t("cronjobs.backupAll")}
+            <DownloadIcon className="h-4 w-4 sm:mr-2" />
+            <span className="hidden sm:inline">{t("cronjobs.backupAll")}</span>
+            <span className="sm:hidden">Backup</span>
           </Button>
           {backups.length > 0 && (
             <Button
@@ -101,17 +102,19 @@ export const RestoreBackupModal = ({
               onClick={handleRestoreAll}
               className="btn-primary flex-1"
             >
-              <Upload className="h-4 w-4 mr-2" />
-              {t("cronjobs.restoreAll")}
+              <UploadIcon className="h-4 w-4 sm:mr-2" />
+              <span className="hidden sm:inline">{t("cronjobs.restoreAll")}</span>
+              <span className="sm:hidden">Restore</span>
             </Button>
           )}
           <Button
             variant="outline"
             onClick={onRefresh}
-            className="btn-outline"
+            className="btn-outline sm:w-auto"
             title={t("common.refresh")}
           >
-            <RefreshCw className="h-4 w-4" />
+            <ArrowsClockwiseIcon className="h-4 w-4" />
+            <span className="sm:hidden ml-2">Refresh</span>
           </Button>
         </div>
 
@@ -120,25 +123,88 @@ export const RestoreBackupModal = ({
             <p>{t("cronjobs.noBackupsFound")}</p>
           </div>
         ) : (
-          <div className="space-y-2 max-h-[500px] overflow-y-auto">
+          <div className="space-y-3 max-h-[500px] overflow-y-auto tui-scrollbar pr-2 pb-2">
             {backups.map((backup) => (
               <div
                 key={backup.filename}
-                className="glass-card p-3 border border-border/50 rounded-lg hover:bg-accent/30 transition-colors"
+                className="tui-card p-3 terminal-font"
               >
-                <div className="flex items-center gap-3">
-                  {/* Schedule */}
+                <div className="flex flex-col gap-3 lg:hidden">
+                  <div className="flex items-center justify-between">
+                    <code className="text-xs bg-background0 text-status-warning px-1.5 py-0.5 terminal-font ascii-border">
+                      {backup.job.schedule}
+                    </code>
+                    <div className="flex items-center gap-2">
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => {
+                          onRestore(backup.filename);
+                          onClose();
+                        }}
+                        className="btn-outline h-8 px-3"
+                        title={t("cronjobs.restoreThisBackup")}
+                      >
+                        <UploadIcon className="h-3 w-3" />
+                      </Button>
+                      <Button
+                        variant="destructive"
+                        size="sm"
+                        onClick={() => handleDelete(backup.filename)}
+                        disabled={deletingFilename === backup.filename}
+                        className="h-8 px-3"
+                        title={t("cronjobs.deleteBackup")}
+                      >
+                        {deletingFilename === backup.filename ? (
+                          <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
+                        ) : (
+                          <TrashIcon className="h-3 w-3" />
+                        )}
+                      </Button>
+                    </div>
+                  </div>
+
+                  <div className="flex items-center gap-2">
+                    {commandCopied === backup.filename && (
+                      <CheckIcon className="h-3 w-3 text-status-success flex-shrink-0" />
+                    )}
+                    <pre
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        copyToClipboard(unwrapCommand(backup.job.command));
+                        setCommandCopied(backup.filename);
+                        setTimeout(() => setCommandCopied(null), 3000);
+                      }}
+                      className="max-w-full overflow-x-auto flex-1 cursor-pointer text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border break-all"
+                      title={unwrapCommand(backup.job.command)}
+                    >
+                      {unwrapCommand(backup.job.command)}
+                    </pre>
+                  </div>
+
+                  <div className="flex flex-wrap items-center gap-3 text-xs text-muted-foreground">
+                    <div className="flex items-center gap-1">
+                      <UserIcon className="h-3 w-3" />
+                      <span>{backup.job.user}</span>
+                    </div>
+                    <div className="flex items-center gap-1">
+                      <CalendarIcon className="h-3 w-3" />
+                      <span>{formatDate(backup.backedUpAt)}</span>
+                    </div>
+                  </div>
+                </div>
+
+                <div className="hidden lg:flex items-center gap-3">
                   <div className="flex-shrink-0">
-                    <code className="text-xs bg-purple-500/10 text-purple-600 dark:text-purple-400 px-1.5 py-0.5 rounded font-mono border border-purple-500/20">
+                    <code className="text-xs bg-background0 text-status-warning px-1.5 py-0.5 terminal-font ascii-border">
                       {backup.job.schedule}
                     </code>
                   </div>
 
-                  {/* Command */}
                   <div className="flex-1 min-w-0">
                     <div className="flex items-center gap-2">
                       {commandCopied === backup.filename && (
-                        <Check className="h-3 w-3 text-green-600 flex-shrink-0" />
+                        <CheckIcon className="h-3 w-3 text-status-success flex-shrink-0" />
                       )}
                       <pre
                         onClick={(e) => {
@@ -147,7 +213,7 @@ export const RestoreBackupModal = ({
                           setCommandCopied(backup.filename);
                           setTimeout(() => setCommandCopied(null), 3000);
                         }}
-                        className="flex-1 cursor-pointer overflow-hidden text-sm font-medium text-foreground bg-muted/30 px-2 py-1 rounded border border-border/30 truncate"
+                        className="flex-1 cursor-pointer overflow-hidden text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border truncate"
                         title={unwrapCommand(backup.job.command)}
                       >
                         {unwrapCommand(backup.job.command)}
@@ -155,52 +221,49 @@ export const RestoreBackupModal = ({
                     </div>
                   </div>
 
-                  {/* User & Date */}
                   <div className="flex items-center gap-3 text-xs text-muted-foreground flex-shrink-0">
                     <div className="flex items-center gap-1">
-                      <User className="h-3 w-3" />
+                      <UserIcon className="h-3 w-3" />
                       <span>{backup.job.user}</span>
                     </div>
                     <div className="flex items-center gap-1">
-                      <Calendar className="h-3 w-3" />
+                      <CalendarIcon className="h-3 w-3" />
                       <span>{formatDate(backup.backedUpAt)}</span>
                     </div>
                   </div>
 
-                  {/* Action buttons */}
-                  <div className="flex items-center gap-1 flex-shrink-0">
+                  <div className="flex items-center gap-2 flex-shrink-0">
                     <Button
-                      variant="ghost"
+                      variant="outline"
                       size="sm"
                       onClick={() => {
                         onRestore(backup.filename);
                         onClose();
                       }}
-                      className="h-7 w-7 p-0"
+                      className="btn-outline h-8 px-3"
                       title={t("cronjobs.restoreThisBackup")}
                     >
-                      <Upload className="h-3 w-3" />
+                      <UploadIcon className="h-3 w-3" />
                     </Button>
                     <Button
-                      variant="ghost"
+                      variant="destructive"
                       size="sm"
                       onClick={() => handleDelete(backup.filename)}
                       disabled={deletingFilename === backup.filename}
-                      className="h-7 w-7 p-0 text-destructive hover:text-destructive"
+                      className="h-8 px-3"
                       title={t("cronjobs.deleteBackup")}
                     >
                       {deletingFilename === backup.filename ? (
                         <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
                       ) : (
-                        <Trash2 className="h-3 w-3" />
+                        <TrashIcon className="h-3 w-3" />
                       )}
                     </Button>
                   </div>
                 </div>
 
-                {/* Comment (if present) */}
                 {backup.job.comment && (
-                  <p className="text-xs text-muted-foreground italic mt-2 ml-0">
+                  <p className="text-xs text-muted-foreground italic mt-2">
                     {backup.job.comment}
                   </p>
                 )}
@@ -209,11 +272,11 @@ export const RestoreBackupModal = ({
           </div>
         )}
 
-        <div className="flex justify-between gap-2 pt-4 border-t border-border/50">
-          <p className="text-sm text-muted-foreground">
+        <div className="flex flex-col sm:flex-row sm:justify-between gap-2 pt-4 border-t border-border">
+          <p className="text-sm text-muted-foreground text-center sm:text-left">
             {t("cronjobs.availableBackups")}: {backups.length}
           </p>
-          <Button variant="outline" onClick={onClose} className="btn-outline">
+          <Button variant="outline" onClick={onClose} className="btn-outline w-full sm:w-auto">
             {t("common.close")}
           </Button>
         </div>

app/_components/FeatureComponents/Modals/ScriptModal.tsx

@@ -6,7 +6,8 @@ import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
 import { BashEditor } from "@/app/_components/FeatureComponents/Scripts/BashEditor";
 import { BashSnippetHelper } from "@/app/_components/FeatureComponents/Scripts/BashSnippetHelper";
 import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
-import { FileText, Code } from "lucide-react";
+import { FileTextIcon, CodeIcon, InfoIcon, TrashIcon } from "@phosphor-icons/react";
+import { useTranslations } from "next-intl";
 
 interface ScriptModalProps {
   isOpen: boolean;
@@ -24,6 +25,8 @@ interface ScriptModalProps {
   };
   onFormChange: (updates: Partial<ScriptModalProps["form"]>) => void;
   additionalFormData?: Record<string, string>;
+  isDraft?: boolean;
+  onClearDraft?: () => void;
 }
 
 export const ScriptModal = ({
@@ -36,7 +39,11 @@ export const ScriptModal = ({
   form,
   onFormChange,
   additionalFormData = {},
+  isDraft = false,
+  onClearDraft,
 }: ScriptModalProps) => {
+  const t = useTranslations();
+
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
@@ -72,12 +79,12 @@ export const ScriptModal = ({
   };
 
   return (
-    <Modal isOpen={isOpen} onClose={onClose} title={title} size="xl">
-      <form onSubmit={handleSubmit} className="space-y-6">
+    <Modal isOpen={isOpen} onClose={onClose} title={title} size="2xl">
+      <form onSubmit={handleSubmit} className="space-y-6 terminal-font">
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <div>
-            <label className="block text-sm font-medium text-foreground mb-2">
-              Script Name <span className="text-red-500">*</span>
+            <label className="block text-sm font-medium mb-2">
+              Script Name <span className="text-status-error">*</span>
             </label>
             <Input
               value={form.name}
@@ -86,15 +93,15 @@ export const ScriptModal = ({
               required
               className={
                 !form.name.trim()
-                  ? "border-red-300 focus:border-red-500 focus:ring-red-500"
+                  ? "border-status-error focus:border-status-error"
                   : ""
               }
             />
           </div>
           <div>
-            <label className="block text-sm font-medium text-foreground mb-2">
+            <label className="block text-sm font-medium mb-2">
               Description{" "}
-              <span className="text-muted-foreground text-xs">(optional)</span>
+              <span className="text-xs opacity-60">(optional)</span>
             </label>
             <Input
               value={form.description}
@@ -105,22 +112,27 @@ export const ScriptModal = ({
         </div>
 
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-6 h-[500px]">
-          <div className="lg:col-span-1 bg-muted/20 rounded-lg p-4 flex flex-col h-full overflow-hidden">
+          <div className="lg:col-span-1 bg-background0 ascii-border p-4 flex flex-col h-full overflow-hidden">
             <div className="flex items-center gap-2 mb-4 flex-shrink-0">
-              <Code className="h-4 w-4 text-primary" />
-              <h3 className="text-sm font-medium text-foreground">Snippets</h3>
+              <CodeIcon className="h-4 w-4" />
+              <h3 className="text-sm font-medium">Snippets</h3>
             </div>
-            <div className="flex-1 overflow-y-auto min-h-0 !pr-0">
+            <div className="flex-1 overflow-y-auto min-h-0 !pr-0 tui-scrollbar">
               <BashSnippetHelper onInsertSnippet={handleInsertSnippet} />
             </div>
           </div>
 
           <div className="lg:col-span-2 flex flex-col h-full overflow-hidden">
             <div className="flex items-center gap-2 mb-4 flex-shrink-0">
-              <FileText className="h-4 w-4 text-primary" />
-              <h3 className="text-sm font-medium text-foreground">
-                Script Content <span className="text-red-500">*</span>
+              <FileTextIcon className="h-4 w-4" />
+              <h3 className="text-sm font-medium">
+                Script Content <span className="text-status-error">*</span>
               </h3>
+              {isDraft && (
+                <span className="ml-auto px-2 py-0.5 text-xs font-medium bg-background0 text-status-info ascii-border">
+                  {t("scripts.draft")}
+                </span>
+              )}
             </div>
             <div className="flex-1 min-h-0">
               <BashEditor
@@ -133,19 +145,34 @@ export const ScriptModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-3 pt-4 border-t border-border/30">
-          <Button
-            type="button"
-            variant="outline"
-            onClick={onClose}
-            className="btn-outline"
-          >
-            Cancel
-          </Button>
-          <Button type="submit" className="btn-primary glow-primary">
-            {submitButtonIcon}
-            {submitButtonText}
-          </Button>
+        <div className="flex justify-between items-center gap-3 pt-4 border-border border-t">
+          <div>
+            {isDraft && onClearDraft && (
+              <Button
+                type="button"
+                variant="ghost"
+                onClick={onClearDraft}
+                className="opacity-60 hover:opacity-100"
+              >
+                <TrashIcon className="h-4 w-4 mr-2" />
+                {t("scripts.clearDraft")}
+              </Button>
+            )}
+          </div>
+          <div className="flex gap-3">
+            <Button
+              type="button"
+              variant="outline"
+              onClick={onClose}
+              className="btn-outline"
+            >
+              {t("scripts.close")}
+            </Button>
+            <Button type="submit" className="btn-primary glow-primary">
+              {submitButtonIcon}
+              {submitButtonText}
+            </Button>
+          </div>
         </div>
       </form>
     </Modal>

app/_components/FeatureComponents/Modals/SelectScriptModal.tsx

@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { FileText, Search, Check, Terminal } from "lucide-react";
+import { FileTextIcon, MagnifyingGlassIcon, CheckIcon, TerminalIcon } from "@phosphor-icons/react";
 import { Script } from "@/app/_utils/scripts-utils";
 import { getScriptContent } from "@/app/_server/actions/scripts";
 import { getHostScriptPath } from "@/app/_server/actions/scripts";
@@ -84,7 +84,7 @@ export const SelectScriptModal = ({
     >
       <div className="space-y-4">
         <div className="relative">
-          <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+          <MagnifyingGlassIcon className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-muted-foreground" />
           <Input
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
@@ -119,12 +119,12 @@ export const SelectScriptModal = ({
                       <div className="flex items-start justify-between">
                         <div className="flex-1 min-w-0">
                           <div className="flex items-center gap-2 mb-1">
-                            <FileText className="h-4 w-4 text-primary flex-shrink-0" />
+                            <FileTextIcon className="h-4 w-4 text-primary flex-shrink-0" />
                             <h4 className="font-medium text-foreground truncate">
                               {script.name}
                             </h4>
                             {selectedScriptId === script.id && (
-                              <Check className="h-4 w-4 text-green-500 flex-shrink-0" />
+                              <CheckIcon className="h-4 w-4 text-status-success flex-shrink-0" />
                             )}
                           </div>
                           <p className="text-sm text-muted-foreground line-clamp-2">
@@ -148,7 +148,7 @@ export const SelectScriptModal = ({
                 {t("scripts.scriptPreview")}
               </h3>
             </div>
-            <div className="p-4 h-full max-h-80 overflow-y-auto">
+            <div className="p-4 h-full max-h-80 overflow-y-auto tui-scrollbar">
               {previewScript ? (
                 <div className="space-y-4">
                   <div>
@@ -162,12 +162,12 @@ export const SelectScriptModal = ({
 
                   <div>
                     <div className="flex items-center gap-2 mb-2">
-                      <Terminal className="h-4 w-4 text-primary" />
+                      <TerminalIcon className="h-4 w-4 text-primary" />
                       <span className="text-sm font-medium text-foreground">
                         {t("scripts.commandPreview")}
                       </span>
                     </div>
-                    <div className="bg-muted/30 p-3 rounded border border-border/30">
+                    <div className="bg-muted/30 p-3 rounded border border-border">
                       <code className="text-sm font-mono text-foreground break-all">
                         {hostScriptPath}
                       </code>
@@ -178,7 +178,7 @@ export const SelectScriptModal = ({
                     <span className="text-sm font-medium text-foreground">
                       {t("scripts.scriptContent")}
                     </span>
-                    <div className="bg-muted/30 p-3 rounded border border-border/30 mt-2 max-h-32 overflow-auto">
+                    <div className="bg-muted/30 p-3 rounded border border-border mt-2 max-h-32 overflow-auto tui-scrollbar">
                       <pre className="text-xs font-mono text-foreground whitespace-pre-wrap">
                         {previewContent}
                       </pre>
@@ -187,7 +187,7 @@ export const SelectScriptModal = ({
                 </div>
               ) : (
                 <div className="text-center text-muted-foreground py-8">
-                  <FileText className="h-12 w-12 mx-auto mb-4 opacity-50" />
+                  <FileTextIcon className="h-12 w-12 mx-auto mb-4 opacity-50" />
                   <p>{t("scripts.selectScriptToPreview")}</p>
                 </div>
               )}
@@ -195,7 +195,7 @@ export const SelectScriptModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
+        <div className="flex justify-end gap-2 pt-3 border-t border-border">
           <Button
             type="button"
             variant="outline"
@@ -210,7 +210,7 @@ export const SelectScriptModal = ({
             disabled={!previewScript}
             className="btn-primary glow-primary"
           >
-            <Check className="h-4 w-4 mr-2" />
+            <CheckIcon className="h-4 w-4 mr-2" />
             {t("scripts.selectScript")}
           </Button>
         </div>

app/_components/FeatureComponents/PWA/PWAInstallPrompt.tsx

@@ -16,7 +16,6 @@ export const PWAInstallPrompt = (): JSX.Element | null => {
   useEffect(() => {
     if (typeof window === "undefined") return;
     const onBeforeInstallPrompt = (e: Event) => {
-      e.preventDefault();
       setDeferred(e as BeforeInstallPromptEvent);
     };
     const onAppInstalled = () => {
@@ -42,17 +41,17 @@ export const PWAInstallPrompt = (): JSX.Element | null => {
       if (choice.outcome === "accepted") {
         setDeferred(null);
       }
-    } catch (_err) {}
+    } catch (_err) { }
   }, [deferred]);
 
   if (isInstalled || !deferred) return null;
 
   return (
     <button
-      className="px-3 py-1 rounded-md border border-border/50 bg-background/80 hover:bg-background/60"
+      className="px-3 py-2 ascii-border bg-background0 hover:bg-background1 transition-colors terminal-font text-sm"
       onClick={onInstall}
     >
-      Install App
+      Install
     </button>
   );
 };

app/_components/FeatureComponents/Scripts/BashEditor.tsx

@@ -1,12 +1,14 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
-import { EditorView } from "@codemirror/view";
-import { EditorState } from "@codemirror/state";
-import { javascript } from "@codemirror/lang-javascript";
-import { oneDark } from "@codemirror/theme-one-dark";
+import { EditorView, keymap } from "@codemirror/view";
+import { EditorState, Transaction } from "@codemirror/state";
+import { shell } from "@codemirror/legacy-modes/mode/shell";
+import { StreamLanguage } from "@codemirror/language";
+import { catppuccinMocha, catppuccinLatte } from './catppuccin-theme';
+import { useTheme } from 'next-themes';
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Terminal, Copy, Check } from "lucide-react";
+import { TerminalIcon, CopyIcon, CheckIcon } from "@phosphor-icons/react";
 
 interface BashEditorProps {
   value: string;
@@ -21,25 +23,136 @@ export const BashEditor = ({
   onChange,
   placeholder = "#!/bin/bash\n# Your bash script here\necho 'Hello World'",
   className = "",
-  label = "Bash Script",
+  label,
 }: BashEditorProps) => {
   const [copied, setCopied] = useState(false);
   const editorRef = useRef<HTMLDivElement>(null);
   const editorViewRef = useRef<EditorView | null>(null);
+  const { theme } = useTheme();
+
+  const insertFourSpaces = ({
+    state,
+    dispatch,
+  }: {
+    state: EditorState;
+    dispatch: (tr: Transaction) => void;
+  }) => {
+    if (state.selection.ranges.some((range) => !range.empty)) {
+      const changes = state.selection.ranges
+        .map((range) => {
+          const fromLine = state.doc.lineAt(range.from).number;
+          const toLine = state.doc.lineAt(range.to).number;
+          const changes = [];
+          for (let line = fromLine; line <= toLine; line++) {
+            const lineObj = state.doc.line(line);
+            changes.push({ from: lineObj.from, insert: "    " });
+          }
+          return changes;
+        })
+        .flat();
+      dispatch(state.update({ changes }));
+    } else {
+      dispatch(state.update(state.replaceSelection("    ")));
+    }
+    return true;
+  };
+
+  const removeFourSpaces = ({
+    state,
+    dispatch,
+  }: {
+    state: EditorState;
+    dispatch: (tr: Transaction) => void;
+  }) => {
+    if (state.selection.ranges.some((range) => !range.empty)) {
+      const changes = state.selection.ranges
+        .map((range) => {
+          const fromLine = state.doc.lineAt(range.from).number;
+          const toLine = state.doc.lineAt(range.to).number;
+          const changes = [];
+          for (let line = fromLine; line <= toLine; line++) {
+            const lineObj = state.doc.line(line);
+            const indent = lineObj.text.match(/^    /);
+            if (indent) {
+              changes.push({ from: lineObj.from, to: lineObj.from + 4 });
+            }
+          }
+          return changes;
+        })
+        .flat();
+      dispatch(state.update({ changes }));
+    } else {
+      const cursor = state.selection.main.head;
+      const line = state.doc.lineAt(cursor);
+      const beforeCursor = line.text.slice(0, cursor - line.from);
+      const spacesToRemove = beforeCursor.match(/ {1,4}$/);
+      if (spacesToRemove) {
+        const removeCount = spacesToRemove[0].length;
+        dispatch(
+          state.update({
+            changes: { from: cursor - removeCount, to: cursor },
+          })
+        );
+      }
+    }
+    return true;
+  };
 
   useEffect(() => {
     if (!editorRef.current) return;
 
-    const bashLanguage = javascript({
-      typescript: false,
-      jsx: false,
-    });
+    const isDark = theme === 'catppuccin-mocha';
+    const bashLanguage = StreamLanguage.define(shell);
+
+    const getThemeColors = () => {
+      const root = document.documentElement;
+      const style = getComputedStyle(root);
+
+      return {
+        background: style.getPropertyValue('--base').trim() || (isDark ? '#1e1e2e' : '#eff1f5'),
+        foreground: style.getPropertyValue('--text').trim() || (isDark ? '#cdd6f4' : '#4c4f69'),
+        border: style.getPropertyValue('--box-border-color').trim() || (isDark ? '#313244' : '#9ca0b0'),
+        surface: style.getPropertyValue('--surface0').trim() || (isDark ? '#313244' : '#ccd0da'),
+      };
+    };
+
+    const colors = getThemeColors();
+
+    const customTheme = EditorView.theme({
+      "&": {
+        backgroundColor: colors.background,
+        color: colors.foreground,
+        border: `1px solid ${colors.border}`,
+        borderRadius: '0',
+      },
+      ".cm-content": {
+        caretColor: colors.foreground,
+        padding: '12px'
+      },
+      ".cm-gutters": {
+        backgroundColor: colors.surface,
+        color: colors.foreground,
+        borderRight: `1px solid ${colors.border}`,
+        opacity: '0.6',
+      },
+      ".cm-activeLineGutter": {
+        backgroundColor: colors.surface,
+        opacity: '1',
+      },
+      ".cm-scroller": {
+        fontFamily: 'JetBrains Mono, Fira CodeIcon, monospace',
+      },
+    }, { dark: isDark });
 
     const state = EditorState.create({
       doc: value || placeholder,
       extensions: [
         bashLanguage,
-        oneDark,
+        customTheme,
+        keymap.of([
+          { key: "Tab", run: insertFourSpaces },
+          { key: "Shift-Tab", run: removeFourSpaces },
+        ]),
         EditorView.updateListener.of((update: any) => {
           if (update.docChanged) {
             onChange(update.state.doc.toString());
@@ -49,7 +162,7 @@ export const BashEditor = ({
           "&": {
             fontSize: "14px",
             fontFamily:
-              'ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
+              'JetBrains Mono, Fira CodeIcon, ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
             height: "100%",
             maxHeight: "100%",
           },
@@ -62,7 +175,7 @@ export const BashEditor = ({
           },
           ".cm-scroller": {
             fontFamily:
-              'ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
+              'JetBrains Mono, Fira CodeIcon, ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
             height: "100%",
             maxHeight: "100%",
           },
@@ -80,7 +193,7 @@ export const BashEditor = ({
     return () => {
       view.destroy();
     };
-  }, []);
+  }, [theme]);
 
   useEffect(() => {
     if (editorViewRef.current) {
@@ -111,27 +224,28 @@ export const BashEditor = ({
       {label && (
         <div className="flex items-center justify-between mb-2">
           <div className="flex items-center gap-2">
-            <Terminal className="h-4 w-4 text-cyan-500" />
+            <TerminalIcon className="h-4 w-4" />
             <span className="text-sm font-medium">{label}</span>
           </div>
           <Button
+            type="button"
             variant="outline"
             size="sm"
             onClick={handleCopy}
             className="btn-outline h-7 px-2"
           >
             {copied ? (
-              <Check className="h-3 w-3 mr-1" />
+              <CheckIcon className="h-3 w-3 mr-1" />
             ) : (
-              <Copy className="h-3 w-3 mr-1" />
+              <CopyIcon className="h-3 w-3 mr-1" />
             )}
-            {copied ? "Copied!" : "Copy"}
+            {copied ? "Copied!" : "CopyIcon"}
           </Button>
         </div>
       )}
-      <div className="border border-border overflow-hidden h-full">
-        <div ref={editorRef} className="h-full rounded-lg" />
+      <div className="overflow-hidden h-full">
+        <div ref={editorRef} className="h-full" />
       </div>
     </div>
   );
-}
+};

app/_components/FeatureComponents/Scripts/BashSnippetHelper.tsx

@@ -4,15 +4,15 @@ import { useState, useEffect } from "react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
 import {
-  Search,
-  FileText,
+  MagnifyingGlassIcon,
+  FileTextIcon,
   FolderOpen,
-  Code,
-  Settings,
+  CodeIcon,
+  GearIcon,
   Database,
-  Copy,
-  Check,
-} from "lucide-react";
+  CopyIcon,
+  CheckIcon,
+} from "@phosphor-icons/react";
 import {
   fetchSnippets,
   fetchSnippetCategories,
@@ -25,13 +25,13 @@ interface BashSnippetHelperProps {
 }
 
 const categoryIcons = {
-  "File Operations": FileText,
-  Loops: Code,
-  Conditionals: Code,
-  "System Operations": Settings,
+  "File Operations": FileTextIcon,
+  Loops: CodeIcon,
+  Conditionals: CodeIcon,
+  "System Operations": GearIcon,
   "Database Operations": Database,
-  "User Examples": FolderOpen,
-  "Custom Scripts": Code,
+  "UserIcon Examples": FolderOpen,
+  "Custom Scripts": CodeIcon,
 };
 
 export const BashSnippetHelper = ({
@@ -109,7 +109,7 @@ export const BashSnippetHelper = ({
     return (
       <div className="space-y-3">
         <div className="text-center py-8">
-          <Code className="h-8 w-8 text-muted-foreground mx-auto mb-2 animate-spin" />
+          <CodeIcon className="h-8 w-8 text-muted-foreground mx-auto mb-2 animate-spin" />
           <p className="text-sm text-muted-foreground">Loading snippets...</p>
         </div>
       </div>
@@ -119,7 +119,7 @@ export const BashSnippetHelper = ({
   return (
     <div className="space-y-3">
       <div className="relative">
-        <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+        <MagnifyingGlassIcon className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
         <Input
           value={searchQuery}
           onChange={(e) => setSearchQuery(e.target.value)}
@@ -129,7 +129,7 @@ export const BashSnippetHelper = ({
       </div>
 
       {!searchQuery && (
-        <div className="overflow-x-auto">
+        <div className="overflow-x-auto tui-scrollbar">
           <div className="flex gap-1 pb-2 min-w-max">
             <Button
               type="button"
@@ -142,7 +142,7 @@ export const BashSnippetHelper = ({
             </Button>
             {categories.map((category) => {
               const Icon =
-                categoryIcons[category as keyof typeof categoryIcons] || Code;
+                categoryIcons[category as keyof typeof categoryIcons] || CodeIcon;
               return (
                 <Button
                   key={category}
@@ -163,15 +163,15 @@ export const BashSnippetHelper = ({
         </div>
       )}
 
-      <div className="space-y-2 overflow-y-auto !pr-0 custom-scrollbar">
+      <div className="space-y-2 overflow-y-auto !pr-0 tui-scrollbar">
         {filteredSnippets.map((snippet) => {
           const Icon =
             categoryIcons[snippet.category as keyof typeof categoryIcons] ||
-            Code;
+            CodeIcon;
           return (
             <div
               key={snippet.id}
-              className="bg-muted/30 rounded-lg border border-border/50 p-3 hover:bg-accent/30 transition-colors"
+              className="bg-muted/30 rounded-lg border border-border p-3 hover:bg-accent/30 transition-colors"
             >
               <div className="flex-1 min-w-0">
                 <div className="flex items-center gap-2 mb-1">
@@ -180,7 +180,7 @@ export const BashSnippetHelper = ({
                     {snippet.title}
                   </h4>
                   {snippet.source === "user" && (
-                    <span className="inline-block px-1.5 py-0.5 text-xs bg-green-100 text-green-700 rounded border border-green-200">
+                    <span className="inline-block px-1.5 py-0.5 text-xs text-status-success border border-border">
                       User
                     </span>
                   )}
@@ -192,7 +192,7 @@ export const BashSnippetHelper = ({
                   {snippet.tags.slice(0, 3).map((tag) => (
                     <span
                       key={tag}
-                      className="inline-block px-2 py-1 text-xs bg-primary/10 text-primary rounded border border-primary/20"
+                      className="inline-block px-2 py-1 text-xs bg-primary/10 text-primary border border-border"
                     >
                       {tag}
                     </span>
@@ -209,12 +209,11 @@ export const BashSnippetHelper = ({
                     variant="outline"
                     size="sm"
                     onClick={() => handleCopy(snippet)}
-                    className="h-6 w-8 p-0 text-xs"
                   >
                     {copiedId === snippet.id ? (
-                      <Check className="h-3 w-3" />
+                      <CheckIcon className="h-3 w-3" />
                     ) : (
-                      <Copy className="h-3 w-3" />
+                      <CopyIcon className="h-3 w-3" />
                     )}
                   </Button>
                   <Button
@@ -222,7 +221,7 @@ export const BashSnippetHelper = ({
                     variant="default"
                     size="sm"
                     onClick={() => handleInsert(snippet)}
-                    className="h-6 px-3 text-xs flex-1"
+                    className="flex-1"
                   >
                     Insert
                   </Button>
@@ -234,7 +233,7 @@ export const BashSnippetHelper = ({
 
         {filteredSnippets.length === 0 && (
           <div className="text-center py-8">
-            <Code className="h-8 w-8 text-muted-foreground mx-auto mb-2" />
+            <CodeIcon className="h-8 w-8 text-muted-foreground mx-auto mb-2" />
             <p className="text-sm text-muted-foreground">
               {searchQuery
                 ? `No snippets found for "${searchQuery}"`

app/_components/FeatureComponents/Scripts/CronExpressionHelper.tsx

@@ -9,15 +9,15 @@ import {
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
 import {
-  Clock,
-  Info,
-  CheckCircle,
-  AlertCircle,
+  ClockIcon,
+  InfoIcon,
+  CheckCircleIcon,
+  WarningCircleIcon,
   Calendar,
-  ChevronDown,
-  ChevronUp,
-  Search,
-} from "lucide-react";
+  CaretDownIcon,
+  CaretUpIcon,
+  MagnifyingGlassIcon,
+} from "@phosphor-icons/react";
 import { useLocale } from "next-intl";
 
 interface CronExpressionHelperProps {
@@ -87,20 +87,20 @@ export const CronExpressionHelper = ({
         />
         <div className="absolute right-3 top-1/2 -translate-y-1/2">
           {explanation?.isValid ? (
-            <CheckCircle className="h-4 w-4 text-green-500" />
+            <CheckCircleIcon className="h-4 w-4 text-status-success" />
           ) : value ? (
-            <AlertCircle className="h-4 w-4 text-red-500" />
+            <WarningCircleIcon className="h-4 w-4 text-status-error" />
           ) : (
-            <Clock className="h-4 w-4 text-muted-foreground" />
+            <ClockIcon className="h-4 w-4 text-muted-foreground" />
           )}
         </div>
       </div>
 
       {explanation && (
-        <div className="bg-muted/30 rounded p-2 border border-border/30">
+        <div className="bg-background0 p-2 text-status-warning ascii-border terminal-font">
           <div className="space-y-1">
             <div className="flex items-start gap-2">
-              <Info className="h-3 w-3 text-primary mt-0.5 flex-shrink-0" />
+              <InfoIcon className="h-3 w-3 text-primary mt-0.5 flex-shrink-0" />
               <div className="flex-1">
                 <p className="text-xs italic text-muted-foreground">
                   {explanation.isValid
@@ -108,7 +108,7 @@ export const CronExpressionHelper = ({
                     : "Invalid Expression"}
                 </p>
                 {explanation.error && (
-                  <p className="text-xs text-red-600 dark:text-red-400 mt-0.5">
+                  <p className="text-xs text-status-error mt-0.5">
                     {explanation.error}
                   </p>
                 )}
@@ -117,7 +117,7 @@ export const CronExpressionHelper = ({
 
             {explanation.isValid && explanation.nextRuns.length > 0 && (
               <div className="flex items-start gap-2">
-                <Calendar className="h-3 w-3 text-blue-500 mt-0.5 flex-shrink-0" />
+                <Calendar className="h-3 w-3 text-status-info mt-0.5 flex-shrink-0" />
                 <div className="flex-1">
                   <p className="text-xs text-muted-foreground mb-1">
                     Next executions:
@@ -137,7 +137,7 @@ export const CronExpressionHelper = ({
       )}
 
       {showPatterns && (
-        <div className="bg-muted/30 rounded-lg border border-border/50">
+        <div className="bg-background0 ascii-border terminal-font">
           <button
             type="button"
             onClick={(e) => {
@@ -145,24 +145,24 @@ export const CronExpressionHelper = ({
               e.stopPropagation();
               setShowPatternsPanel(!showPatternsPanel);
             }}
-            className="w-full text-left p-3 hover:bg-accent/30 transition-colors rounded-t-lg"
+            className="w-full text-left p-3 hover:bg-background0 transition-colors"
           >
             <div className="flex items-center justify-between">
               <span className="text-sm font-medium">Quick Patterns</span>
               <div className="p-1">
                 {showPatternsPanel ? (
-                  <ChevronUp className="h-4 w-4" />
+                  <CaretUpIcon className="h-4 w-4" />
                 ) : (
-                  <ChevronDown className="h-4 w-4" />
+                  <CaretDownIcon className="h-4 w-4" />
                 )}
               </div>
             </div>
           </button>
 
           {showPatternsPanel && (
-            <div className="p-3 border-t border-border/50">
+            <div className="p-3 border-t border-border">
               <div className="relative mb-3">
-                <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+                <MagnifyingGlassIcon className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
                 <Input
                   value={patternSearch}
                   onChange={(e) => setPatternSearch(e.target.value)}
@@ -171,7 +171,7 @@ export const CronExpressionHelper = ({
                 />
               </div>
 
-              <div className="space-y-3 max-h-64 overflow-y-auto custom-scrollbar">
+              <div className="space-y-3 max-h-64 overflow-y-auto tui-scrollbar">
                 {filteredPatterns.map((category) => (
                   <div key={category.category} className="space-y-2">
                     <h4 className="font-medium text-foreground text-sm">

app/_components/FeatureComponents/Scripts/ScriptsManager.tsx

@@ -1,18 +1,17 @@
 "use client";
 
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { Card, CardContent, CardHeader, CardTitle } from "@/app/_components/GlobalComponents/Cards/Card";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
 import {
-  FileText,
-  Plus,
-  Edit,
-  Trash2,
-  Copy,
-  Copy as CopyIcon,
-  CheckCircle,
-  Files,
-} from "lucide-react";
+  FileTextIcon,
+  PlusIcon,
+  PencilSimpleIcon,
+  TrashIcon,
+  CopyIcon,
+  CheckCircleIcon,
+  FilesIcon,
+} from "@phosphor-icons/react";
 import { Script } from "@/app/_utils/scripts-utils";
 import {
   createScript,
@@ -32,6 +31,8 @@ interface ScriptsManagerProps {
   scripts: Script[];
 }
 
+const DRAFT_STORAGE_KEY = "cronjob_script_draft";
+
 export const ScriptsManager = ({
   scripts: initialScripts,
 }: ScriptsManagerProps) => {
@@ -46,11 +47,13 @@ export const ScriptsManager = ({
   const [isCloning, setIsCloning] = useState(false);
   const t = useTranslations();
 
-  const [createForm, setCreateForm] = useState({
+  const defaultFormValues = {
     name: "",
     description: "",
     content: "#!/bin/bash\n# Your script here\necho 'Hello World'",
-  });
+  };
+
+  const [createForm, setCreateForm] = useState(defaultFormValues);
 
   const [editForm, setEditForm] = useState({
     name: "",
@@ -58,6 +61,37 @@ export const ScriptsManager = ({
     content: "",
   });
 
+  useEffect(() => {
+    try {
+      const savedDraft = localStorage.getItem(DRAFT_STORAGE_KEY);
+      if (savedDraft) {
+        const parsedDraft = JSON.parse(savedDraft);
+        setCreateForm(parsedDraft);
+      }
+    } catch (error) {
+      console.error("Failed to load draft from localStorage:", error);
+    }
+  }, []);
+
+  useEffect(() => {
+    try {
+      localStorage.setItem(DRAFT_STORAGE_KEY, JSON.stringify(createForm));
+    } catch (error) {
+      console.error("Failed to save draft to localStorage:", error);
+    }
+  }, [createForm]);
+
+  const isDraft =
+    createForm.name.trim() !== "" ||
+    createForm.description.trim() !== "" ||
+    createForm.content !== defaultFormValues.content;
+
+  const handleClearDraft = () => {
+    setCreateForm(defaultFormValues);
+    localStorage.removeItem(DRAFT_STORAGE_KEY);
+    showToast("success", t("scripts.draftCleared"));
+  };
+
   const refreshScripts = async () => {
     try {
       const { fetchScripts } = await import("@/app/_server/actions/scripts");
@@ -78,6 +112,8 @@ export const ScriptsManager = ({
     if (result.success) {
       await refreshScripts();
       setIsCreateModalOpen(false);
+      setCreateForm(defaultFormValues);
+      localStorage.removeItem(DRAFT_STORAGE_KEY);
       showToast("success", "Script created successfully");
     } else {
       showToast("error", "Failed to create script", result.message);
@@ -170,8 +206,8 @@ export const ScriptsManager = ({
         <CardHeader>
           <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
             <div className="flex items-center gap-3">
-              <div className="p-2 bg-primary/10 rounded-lg">
-                <FileText className="h-5 w-5 text-primary" />
+              <div className="p-2 bg-background0 ascii-border">
+                <FileTextIcon className="h-5 w-5 text-primary" />
               </div>
               <div>
                 <CardTitle className="text-xl brand-gradient">
@@ -186,16 +222,16 @@ export const ScriptsManager = ({
               onClick={() => setIsCreateModalOpen(true)}
               className="btn-primary glow-primary"
             >
-              <Plus className="h-4 w-4 mr-2" />
+              <PlusIcon className="h-4 w-4 mr-2" />
               {t("scripts.newScript")}
             </Button>
           </div>
         </CardHeader>
         <CardContent>
           {scripts.length === 0 ? (
-            <div className="text-center py-16">
-              <div className="mx-auto w-20 h-20 bg-gradient-to-br from-primary/20 to-blue-500/20 rounded-full flex items-center justify-center mb-6">
-                <FileText className="h-10 w-10 text-primary" />
+            <div className="text-center py-16 terminal-font">
+              <div className="mx-auto w-20 h-20 bg-background2 ascii-border flex items-center justify-center mb-6">
+                <FileTextIcon className="h-10 w-10 text-primary" />
               </div>
               <h3 className="text-xl font-semibold mb-3 brand-gradient">
                 {t("scripts.noScriptsYet")}
@@ -208,7 +244,7 @@ export const ScriptsManager = ({
                 className="btn-primary glow-primary"
                 size="lg"
               >
-                <Plus className="h-5 w-5 mr-2" />
+                <PlusIcon className="h-5 w-5 mr-2" />
                 {t("scripts.createYourFirstScript")}
               </Button>
             </div>
@@ -217,7 +253,7 @@ export const ScriptsManager = ({
               {scripts.map((script) => (
                 <div
                   key={script.id}
-                  className="glass-card p-4 border border-border/50 rounded-lg hover:bg-accent/30 transition-colors"
+                  className="glass-card p-4 ascii-border hover:bg-accent/30 transition-colors terminal-font"
                 >
                   <div className="flex items-start justify-between gap-4">
                     <div className="flex-1 min-w-0">
@@ -245,11 +281,11 @@ export const ScriptsManager = ({
                         size="sm"
                         onClick={() => handleCopy(script)}
                         className="btn-outline h-8 px-3"
-                        title="Copy script content to clipboard"
-                        aria-label="Copy script content to clipboard"
+                        title="CopyIcon script content to clipboard"
+                        aria-label="CopyIcon script content to clipboard"
                       >
                         {copiedId === script.id ? (
-                          <CheckCircle className="h-3 w-3 text-green-500" />
+                          <CheckCircleIcon className="h-3 w-3 text-status-success" />
                         ) : (
                           <CopyIcon className="h-3 w-3" />
                         )}
@@ -265,7 +301,7 @@ export const ScriptsManager = ({
                         title="Clone script"
                         aria-label="Clone script"
                       >
-                        <Files className="h-3 w-3" />
+                        <FilesIcon className="h-3 w-3" />
                       </Button>
                       <Button
                         variant="outline"
@@ -286,7 +322,7 @@ export const ScriptsManager = ({
                         title="Edit script"
                         aria-label="Edit script"
                       >
-                        <Edit className="h-3 w-3" />
+                        <PencilSimpleIcon className="h-3 w-3" />
                       </Button>
                       <Button
                         variant="destructive"
@@ -295,11 +331,11 @@ export const ScriptsManager = ({
                           setSelectedScript(script);
                           setIsDeleteModalOpen(true);
                         }}
-                        className="btn-destructive h-8 px-3"
+                        className="h-8 px-3"
                         title="Delete script"
                         aria-label="Delete script"
                       >
-                        <Trash2 className="h-3 w-3" />
+                        <TrashIcon className="h-3 w-3" />
                       </Button>
                     </div>
                   </div>
@@ -318,6 +354,8 @@ export const ScriptsManager = ({
         onFormChange={(updates) =>
           setCreateForm((prev) => ({ ...prev, ...updates }))
         }
+        isDraft={isDraft}
+        onClearDraft={handleClearDraft}
       />
 
       <EditScriptModal

app/_components/FeatureComponents/Scripts/catppuccin-theme.ts

@@ -0,0 +1,36 @@
+import { Extension } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+
+export const catppuccinMocha: Extension = EditorView.theme({
+  '&': {
+    backgroundColor: '#1e1e2e',
+    color: '#cdd6f4',
+    fontSize: '14px',
+    fontFamily: 'JetBrains Mono, monospace',
+    border: '1px solid #45475a',
+    borderRadius: '0',
+  },
+  '.cm-content': { caretColor: '#f5e0dc', padding: '12px' },
+  '.cm-gutters': {
+    backgroundColor: '#181825',
+    color: '#6c7086',
+    borderRight: '1px solid #45475a',
+  },
+}, { dark: true });
+
+export const catppuccinLatte: Extension = EditorView.theme({
+  '&': {
+    backgroundColor: '#eff1f5',
+    color: '#4c4f69',
+    fontSize: '14px',
+    fontFamily: 'JetBrains Mono, monospace',
+    border: '1px solid #9ca0b0',
+    borderRadius: '0',
+  },
+  '.cm-content': { caretColor: '#dc8a78', padding: '12px' },
+  '.cm-gutters': {
+    backgroundColor: '#e6e9ef',
+    color: '#8c8fa1',
+    borderRight: '1px solid #9ca0b0',
+  },
+}, { dark: false });

app/_components/FeatureComponents/System/PerformanceSummary.tsx

@@ -1,6 +1,6 @@
 import { cn } from "@/app/_utils/global-utils";
 import { HTMLAttributes, forwardRef } from "react";
-import { Zap } from "lucide-react";
+import { LightningIcon } from "@phosphor-icons/react";
 import { StatusBadge } from "@/app/_components/GlobalComponents/Badges/StatusBadge";
 
 export interface PerformanceMetric {
@@ -20,14 +20,14 @@ export const PerformanceSummary = forwardRef<HTMLDivElement, PerformanceSummaryP
       <div
         ref={ref}
         className={cn(
-          "p-3 bg-gradient-to-r from-purple-500/5 to-pink-500/5 border border-purple-500/20 rounded-lg glass-card",
+          "p-3 bg-background0 ascii-border glass-card terminal-font",
           className
         )}
         {...props}
       >
         <div className="flex items-center gap-2 mb-3">
-          <Zap className="h-4 w-4 text-purple-500" />
-          <span className="text-sm font-medium text-purple-600 dark:text-purple-400">
+          <LightningIcon className="h-4 w-4" />
+          <span className="text-sm font-medium">
             Performance Summary
           </span>
         </div>

app/_components/FeatureComponents/System/SystemInfo.tsx

@@ -4,7 +4,7 @@ import { MetricCard } from "@/app/_components/GlobalComponents/Cards/MetricCard"
 import { SystemStatus } from "@/app/_components/FeatureComponents/System/SystemStatus";
 import { PerformanceSummary } from "@/app/_components/FeatureComponents/System/PerformanceSummary";
 import { Sidebar } from "@/app/_components/FeatureComponents/Layout/Sidebar";
-import { Clock, HardDrive, Cpu, Monitor, Wifi } from "lucide-react";
+import { ClockIcon, HardDriveIcon, CpuIcon, MonitorIcon, WifiHighIcon } from "@phosphor-icons/react";
 
 interface SystemInfoType {
   hostname: string;
@@ -65,6 +65,7 @@ export const SystemInfoCard = ({
   const [systemInfo, setSystemInfo] =
     useState<SystemInfoType>(initialSystemInfo);
   const [isUpdating, setIsUpdating] = useState(false);
+  const [isDisabled, setIsDisabled] = useState(false);
   const t = useTranslations();
   const { subscribe } = useSSEContext();
   const isPageVisible = usePageVisibility();
@@ -72,6 +73,10 @@ export const SystemInfoCard = ({
   const abortControllerRef = useRef<AbortController | null>(null);
 
   const updateSystemInfo = async () => {
+    if (isDisabled) {
+      return;
+    }
+
     if (abortControllerRef.current) {
       abortControllerRef.current.abort();
     }
@@ -88,13 +93,17 @@ export const SystemInfoCard = ({
         throw new Error("Failed to fetch system stats");
       }
       const freshData = await response.json();
+      if (freshData === null) {
+        setIsDisabled(true);
+        return;
+      }
       setSystemInfo(freshData);
     } catch (error: any) {
       if (error.name !== "AbortError") {
         console.error("Failed to update system info:", error);
       }
     } finally {
-      if (!abortController.signal.aborted) {
+      if (!abortControllerRef.current?.signal.aborted) {
         setIsUpdating(false);
       }
     }
@@ -102,7 +111,7 @@ export const SystemInfoCard = ({
 
   useEffect(() => {
     const unsubscribe = subscribe((event: SSEEvent) => {
-      if (event.type === "system-stats") {
+      if (event.type === "system-stats" && event.data !== null) {
         setSystemInfo(event.data);
       }
     });
@@ -129,16 +138,16 @@ export const SystemInfoCard = ({
     let timeoutId: NodeJS.Timeout | null = null;
 
     const doUpdate = () => {
-      if (!mounted || !isPageVisible) return;
+      if (!mounted || !isPageVisible || isDisabled) return;
       updateTime();
       updateSystemInfo().finally(() => {
-        if (mounted && isPageVisible) {
+        if (mounted && isPageVisible && !isDisabled) {
           timeoutId = setTimeout(doUpdate, updateInterval);
         }
       });
     };
 
-    if (isPageVisible) {
+    if (isPageVisible && !isDisabled) {
       timeoutId = setTimeout(doUpdate, updateInterval);
     }
 
@@ -151,7 +160,7 @@ export const SystemInfoCard = ({
         abortControllerRef.current.abort();
       }
     };
-  }, [isPageVisible]);
+  }, [isPageVisible, isDisabled]);
 
   const quickStats = {
     cpu: systemInfo.cpu.usage,
@@ -161,55 +170,50 @@ export const SystemInfoCard = ({
 
   const basicInfoItems = [
     {
-      icon: Clock,
+      icon: ClockIcon,
       label: t("sidebar.uptime"),
       value: systemInfo.uptime,
-      color: "text-orange-500",
     },
   ];
 
   const performanceItems = [
     {
-      icon: HardDrive,
+      icon: HardDriveIcon,
       label: t("sidebar.memory"),
       value: `${systemInfo.memory.used} / ${systemInfo.memory.total}`,
       detail: `${systemInfo.memory.free} free`,
       status: systemInfo.memory.status,
-      color: "text-cyan-500",
       showProgress: true,
       progressValue: systemInfo.memory.usage,
     },
     {
-      icon: Cpu,
+      icon: CpuIcon,
       label: t("sidebar.cpu"),
       value: systemInfo.cpu.model,
       detail: `${systemInfo.cpu.cores} cores`,
       status: systemInfo.cpu.status,
-      color: "text-pink-500",
       showProgress: true,
       progressValue: systemInfo.cpu.usage,
     },
     {
-      icon: Monitor,
+      icon: MonitorIcon,
       label: t("sidebar.gpu"),
       value: systemInfo.gpu.model,
       detail: systemInfo.gpu.memory
         ? `${systemInfo.gpu.memory} VRAM`
         : systemInfo.gpu.status,
       status: systemInfo.gpu.status,
-      color: "text-indigo-500",
     },
     ...(systemInfo.network
       ? [
-          {
-            icon: Wifi,
-            label: t("sidebar.network"),
-            value: `${systemInfo.network.latency}ms`,
-            detail: `${systemInfo.network.latency}ms latency • ${systemInfo.network.speed}`,
-            status: systemInfo.network.status,
-            color: "text-teal-500",
-          },
-        ]
+        {
+          icon: WifiHighIcon,
+          label: t("sidebar.network"),
+          value: `${systemInfo.network.latency}ms`,
+          detail: `${systemInfo.network.latency}ms latency • ${systemInfo.network.speed}`,
+          status: systemInfo.network.status,
+        },
+      ]
       : []),
   ];
 
@@ -226,12 +230,12 @@ export const SystemInfoCard = ({
     },
     ...(systemInfo.network
       ? [
-          {
-            label: t("sidebar.networkLatency"),
-            value: `${systemInfo.network.latency}ms`,
-            status: systemInfo.network.status,
-          },
-        ]
+        {
+          label: t("sidebar.networkLatency"),
+          value: `${systemInfo.network.latency}ms`,
+          status: systemInfo.network.status,
+        },
+      ]
       : []),
   ];
 
@@ -255,7 +259,6 @@ export const SystemInfoCard = ({
               icon={item.icon}
               label={item.label}
               value={item.value}
-              color={item.color}
               variant="basic"
             />
           ))}
@@ -266,7 +269,7 @@ export const SystemInfoCard = ({
         <h3 className="text-xs font-semibold text-foreground mb-2 uppercase tracking-wide">
           {t("sidebar.performanceMetrics")}
         </h3>
-        <div className="space-y-2">
+        <div className="space-y-4">
           {performanceItems.map((item) => (
             <MetricCard
               key={item.label}
@@ -275,7 +278,6 @@ export const SystemInfoCard = ({
               value={item.value}
               detail={item.detail}
               status={item.status}
-              color={item.color}
               variant="performance"
               showProgress={item.showProgress}
               progressValue={item.progressValue}
@@ -290,7 +292,7 @@ export const SystemInfoCard = ({
         {t("sidebar.statsUpdateEvery")}{" "}
         {Math.round(
           parseInt(process.env.NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL || "30000") /
-            1000
+          1000
         )}
         s • {t("sidebar.networkSpeedEstimatedFromLatency")}
         {isUpdating && (

app/_components/FeatureComponents/System/SystemStatus.tsx

@@ -1,6 +1,6 @@
 import { cn } from "@/app/_utils/global-utils";
 import { HTMLAttributes, forwardRef } from "react";
-import { Activity } from "lucide-react";
+import { PulseIcon } from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 
 export interface SystemStatusProps extends HTMLAttributes<HTMLDivElement> {
@@ -22,27 +22,27 @@ export const SystemStatus = forwardRef<HTMLDivElement, SystemStatusProps>(
       switch (lowerStatus) {
         case "operational":
           return {
-            bgColor: "bg-emerald-500/10",
-            borderColor: "border-emerald-500/20",
-            dotColor: "bg-emerald-500",
+            bgColor: "bg-background0",
+            borderColor: "ascii-border",
+            dotColor: "bg-status-success",
           };
         case "warning":
           return {
-            bgColor: "bg-yellow-500/10",
-            borderColor: "border-yellow-500/20",
-            dotColor: "bg-yellow-500",
+            bgColor: "bg-background0",
+            borderColor: "ascii-border",
+            dotColor: "bg-status-warning",
           };
         case "critical":
           return {
-            bgColor: "bg-destructive/10",
-            borderColor: "border-destructive/20",
-            dotColor: "bg-destructive",
+            bgColor: "bg-background0",
+            borderColor: "ascii-border",
+            dotColor: "bg-status-error",
           };
         default:
           return {
-            bgColor: "bg-muted",
-            borderColor: "border-border",
-            dotColor: "bg-muted-foreground",
+            bgColor: "bg-background0",
+            borderColor: "ascii-border",
+            dotColor: "bg-status-success",
           };
       }
     };
@@ -53,7 +53,7 @@ export const SystemStatus = forwardRef<HTMLDivElement, SystemStatusProps>(
       <div
         ref={ref}
         className={cn(
-          "p-4 border border-border/50 rounded-lg glass-card",
+          "p-4 glass-card terminal-font",
           config.bgColor,
           config.borderColor,
           className
@@ -61,10 +61,10 @@ export const SystemStatus = forwardRef<HTMLDivElement, SystemStatusProps>(
         {...props}
       >
         <div className="flex items-center gap-3">
-          <div className={cn("w-3 h-3 rounded-full", config.dotColor)} />
+          <div className={cn("w-3 h-3", config.dotColor)} />
           <div className="flex-1">
             <div className="flex items-center gap-2">
-              <Activity className="h-4 w-4 text-muted-foreground" />
+              <PulseIcon className="h-4 w-4 text-muted-foreground" />
               <span className="text-sm font-medium text-foreground">
                 {t("system.systemStatus")}: {status}
               </span>

app/_components/FeatureComponents/System/WrapperScriptWarning.tsx

@@ -2,7 +2,7 @@
 
 import { useState, useEffect } from "react";
 import { useTranslations } from "next-intl";
-import { AlertTriangle, X } from "lucide-react";
+import { WarningIcon, XIcon } from "@phosphor-icons/react";
 
 export const WrapperScriptWarning = () => {
   const [isVisible, setIsVisible] = useState(false);
@@ -46,7 +46,7 @@ export const WrapperScriptWarning = () => {
     <div className="bg-amber-500/10 border border-amber-500/20 rounded-lg p-4 mb-4">
       <div className="flex items-start justify-between">
         <div className="flex items-start space-x-3">
-          <AlertTriangle className="w-5 h-5 text-amber-500 mt-0.5 flex-shrink-0" />
+          <WarningIcon className="w-5 h-5 text-amber-500 mt-0.5 flex-shrink-0" />
           <div className="flex-1">
             <h3 className="text-sm font-medium text-amber-800 dark:text-amber-400">
               {t("warnings.wrapperScriptModified")}
@@ -61,7 +61,7 @@ export const WrapperScriptWarning = () => {
           className="text-amber-600 dark:text-amber-400 hover:text-amber-800 dark:hover:text-amber-300 transition-colors ml-4"
           aria-label="Dismiss warning"
         >
-          <X className="w-4 h-4" />
+          <XIcon className="w-4 h-4" />
         </button>
       </div>
     </div>

app/_components/FeatureComponents/Theme/ThemeToggle.tsx

@@ -1,9 +1,8 @@
 'use client'
 
-import { Moon, Sun } from 'lucide-react';
 import { useTheme } from 'next-themes';
 import { useEffect, useState } from 'react';
-import { Button } from '@/app/_components/GlobalComponents/UIElements/Button';
+import { SunIcon, MoonIcon } from '@phosphor-icons/react';
 
 export const ThemeToggle = () => {
   const [mounted, setMounted] = useState(false);
@@ -13,19 +12,22 @@ export const ThemeToggle = () => {
     setMounted(true);
   }, []);
 
-  if (!mounted) {
-    return null;
-  }
+  if (!mounted) return null;
+
+  const isDark = theme === 'dark';
 
   return (
-    <Button
-      variant="ghost"
-      size="icon"
-      onClick={() => setTheme(theme === 'light' ? 'dark' : 'light')}
+    <button
+      onClick={() => setTheme(isDark ? 'light' : 'dark')}
+      className="p-2 ascii-border bg-background0 hover:bg-background1 transition-colors"
+      aria-label={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
+      title={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
     >
-      <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-      <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-      <span className="sr-only">Toggle theme</span>
-    </Button>
+      {isDark ? (
+        <SunIcon size={20} weight="regular" className="text-foreground" />
+      ) : (
+        <MoonIcon size={20} weight="regular" className="text-foreground" />
+      )}
+    </button>
   );
 };

app/_components/FeatureComponents/User/UserFilter.tsx

@@ -2,7 +2,7 @@
 
 import { useState, useEffect } from "react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { ChevronDown, User, X } from "lucide-react";
+import { CaretDownIcon, UserIcon, XIcon } from "@phosphor-icons/react";
 import { fetchAvailableUsers } from "@/app/_server/actions/cronjobs";
 import { useTranslations } from "next-intl";
 
@@ -42,7 +42,7 @@ export const UserFilter = ({
       <div
         className={`flex items-center gap-2 px-3 py-2 bg-muted/50 rounded-md ${className}`}
       >
-        <User className="h-4 w-4 text-muted-foreground" />
+        <UserIcon className="h-4 w-4 text-muted-foreground" />
         <span className="text-sm text-muted-foreground">Loading users...</span>
       </div>
     );
@@ -57,14 +57,14 @@ export const UserFilter = ({
           className="flex-1 justify-between"
         >
           <div className="flex items-center gap-2">
-            <User className="h-4 w-4" />
+            <UserIcon className="h-4 w-4" />
             <span className="text-sm">
               {selectedUser
                 ? `${t("common.userWithUsername", { user: selectedUser })}`
                 : t("common.allUsers")}
             </span>
           </div>
-          <ChevronDown className="h-4 w-4" />
+          <CaretDownIcon className="h-4 w-4" />
         </Button>
         {selectedUser && (
           <Button
@@ -73,21 +73,20 @@ export const UserFilter = ({
             onClick={() => onUserChange(null)}
             className="p-2 h-8 w-8 flex-shrink-0"
           >
-            <X className="h-3 w-3" />
+            <XIcon className="h-3 w-3" />
           </Button>
         )}
       </div>
 
       {isOpen && (
-        <div className="absolute top-full left-0 right-0 mt-1 bg-background border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto">
+        <div className="absolute top-full left-0 right-0 p-1 mt-1 bg-background0 border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto tui-scrollbar">
           <button
             onClick={() => {
               onUserChange(null);
               setIsOpen(false);
             }}
-            className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors ${
-              !selectedUser ? "bg-accent text-accent-foreground" : ""
-            }`}
+            className={`w-full text-left px-3 py-2 text-sm hover:border-border transition-colors ${!selectedUser ? "border border-border" : "border border-transparent"
+              }`}
           >
             {t("common.allUsers")}
           </button>
@@ -98,9 +97,8 @@ export const UserFilter = ({
                 onUserChange(user);
                 setIsOpen(false);
               }}
-              className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors ${
-                selectedUser === user ? "bg-accent text-accent-foreground" : ""
-              }`}
+              className={`w-full text-left px-3 py-2 text-sm border border-transparent hover:border-border transition-colors ${selectedUser === user ? "border border-border" : "border border-transparent"
+                }`}
             >
               {user}
             </button>

app/_components/FeatureComponents/User/UserSwitcher.tsx

@@ -2,7 +2,7 @@
 
 import { useState, useEffect } from "react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { ChevronDown, User } from "lucide-react";
+import { CaretDownIcon, UserIcon } from "@phosphor-icons/react";
 import { fetchAvailableUsers } from "@/app/_server/actions/cronjobs";
 
 interface UserSwitcherProps {
@@ -43,7 +43,7 @@ export const UserSwitcher = ({
       <div
         className={`flex items-center gap-2 px-3 py-2 bg-muted/50 rounded-md ${className}`}
       >
-        <User className="h-4 w-4 text-muted-foreground" />
+        <UserIcon className="h-4 w-4 text-muted-foreground" />
         <span className="text-sm text-muted-foreground">Loading users...</span>
       </div>
     );
@@ -52,29 +52,36 @@ export const UserSwitcher = ({
   return (
     <div className={`relative ${className}`}>
       <Button
+        type="button"
         variant="outline"
-        onClick={() => setIsOpen(!isOpen)}
+        onClick={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          setIsOpen(!isOpen);
+        }}
         className="w-full justify-between"
       >
         <div className="flex items-center gap-2">
-          <User className="h-4 w-4" />
+          <UserIcon className="h-4 w-4" />
           <span className="text-sm">{selectedUser || "Select user"}</span>
         </div>
-        <ChevronDown className="h-4 w-4" />
+        <CaretDownIcon className="h-4 w-4" />
       </Button>
 
       {isOpen && (
-        <div className="absolute top-full left-0 right-0 mt-1 bg-background border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto">
+        <div className="absolute top-full left-0 right-0 mt-1 bg-background0 border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto tui-scrollbar">
           {users.map((user) => (
             <button
+              type="button"
               key={user}
-              onClick={() => {
+              onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
                 onUserChange(user);
                 setIsOpen(false);
               }}
-              className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors ${
-                selectedUser === user ? "bg-accent text-accent-foreground" : ""
-              }`}
+              className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors ${selectedUser === user ? "border border-border" : "border border-transparent"
+                }`}
             >
               {user}
             </button>

app/_components/GlobalComponents/Badges/ErrorBadge.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { AlertCircle, X } from "lucide-react";
+import { WarningCircleIcon, XIcon } from "@phosphor-icons/react";
 import { JobError, removeJobError } from "@/app/_utils/error-utils";
 
 interface ErrorBadgeProps {
@@ -30,7 +30,7 @@ export const ErrorBadge = ({
             className="flex items-center gap-1 px-2 py-1 bg-destructive/10 text-destructive border border-destructive/20 rounded text-xs hover:bg-destructive/20 transition-colors"
             title={error.message}
           >
-            <AlertCircle className="h-3 w-3" />
+            <WarningCircleIcon className="h-3 w-3" />
             <span className="hidden sm:inline">Error</span>
           </button>
           <button
@@ -38,7 +38,7 @@ export const ErrorBadge = ({
             className="p-1 text-destructive hover:bg-destructive/10 rounded transition-colors"
             title="Dismiss error"
           >
-            <X className="h-3 w-3" />
+            <XIcon className="h-3 w-3" />
           </button>
         </div>
       ))}

app/_components/GlobalComponents/Badges/StatusBadge.tsx

@@ -1,6 +1,6 @@
 import { cn } from "@/app/_utils/global-utils";
 import { HTMLAttributes, forwardRef } from "react";
-import { CheckCircle, AlertTriangle, XCircle, Activity } from "lucide-react";
+import { CheckCircleIcon, WarningIcon, XCircleIcon, PulseIcon } from "@phosphor-icons/react";
 import { useTranslations } from "next-intl";
 
 export interface StatusBadgeProps extends HTMLAttributes<HTMLDivElement> {
@@ -31,46 +31,41 @@ export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>(
         case "operational":
         case "stable":
           return {
-            color: "text-emerald-500",
-            bgColor: "bg-emerald-500/10",
-            borderColor: "border-emerald-500/20",
-            icon: CheckCircle,
+            color: "text-status-success",
+            bgColor: "bg-background0",
+            icon: CheckCircleIcon,
             label: t("system.optimal"),
           };
         case "moderate":
         case "warning":
           return {
-            color: "text-yellow-500",
-            bgColor: "bg-yellow-500/10",
-            borderColor: "border-yellow-500/20",
-            icon: AlertTriangle,
+            color: "text-status-warning",
+            bgColor: "bg-background0",
+            icon: WarningIcon,
             label: t("system.warning"),
           };
         case "high":
         case "slow":
           return {
-            color: "text-orange-500",
-            bgColor: "bg-orange-500/10",
-            borderColor: "border-orange-500/20",
-            icon: AlertTriangle,
+            color: "text-status-warning",
+            bgColor: "bg-background0",
+            icon: WarningIcon,
             label: t("system.high"),
           };
         case "critical":
         case "poor":
         case "offline":
           return {
-            color: "text-destructive",
-            bgColor: "bg-destructive/10",
-            borderColor: "border-destructive/20",
-            icon: XCircle,
+            color: "text-status-error",
+            bgColor: "bg-background0",
+            icon: XCircleIcon,
             label: t("system.critical"),
           };
         default:
           return {
-            color: "text-muted-foreground",
-            bgColor: "bg-muted",
-            borderColor: "border-border",
-            icon: Activity,
+            color: "",
+            bgColor: "bg-background0",
+            icon: PulseIcon,
             label: t("system.unknown"),
           };
       }
@@ -83,9 +78,8 @@ export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>(
       <div
         ref={ref}
         className={cn(
-          "inline-flex items-center gap-1.5 rounded-full border px-2 py-1",
+          "inline-flex items-center gap-1.5 ascii-border px-2 py-1 terminal-font",
           config.bgColor,
-          config.borderColor,
           {
             "text-xs": size === "sm",
             "text-sm": size === "md",

app/_components/GlobalComponents/Cards/Card.tsx

@@ -1,72 +1,43 @@
-import { cn } from '@/app/_utils/global-utils';
 import { HTMLAttributes, forwardRef } from 'react';
 
 export const Card = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn(
-        'rounded-lg border bg-card text-card-foreground shadow-sm',
-        className
-      )}
-      {...props}
-    />
+  ({ className = '', ...props }, ref) => (
+    <div ref={ref} className={`tui-card ${className}`} {...props} />
   )
 );
 Card.displayName = 'Card';
 
-const CardHeader = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn('flex flex-col space-y-1.5 p-6', className)}
-      {...props}
-    />
+export const CardHeader = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className = '', ...props }, ref) => (
+    <div ref={ref} className={`p-4 border-b border-foreground1 ${className}`} {...props} />
   )
 );
 CardHeader.displayName = 'CardHeader';
 
-const CardTitle = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLHeadingElement>>(
-  ({ className, ...props }, ref) => (
-    <h3
-      ref={ref}
-      className={cn(
-        'text-2xl font-semibold leading-none tracking-tight',
-        className
-      )}
-      {...props}
-    />
+export const CardTitle = forwardRef<HTMLHeadingElement, HTMLAttributes<HTMLHeadingElement>>(
+  ({ className = '', ...props }, ref) => (
+    <h3 ref={ref} className={`terminal-font font-bold uppercase ${className}`} {...props} />
   )
 );
 CardTitle.displayName = 'CardTitle';
 
-const CardDescription = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
-  ({ className, ...props }, ref) => (
-    <p
-      ref={ref}
-      className={cn('text-sm text-muted-foreground', className)}
-      {...props}
-    />
+export const CardDescription = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
+  ({ className = '', ...props }, ref) => (
+    <p ref={ref} className={`terminal-font text-sm ${className}`} {...props} />
   )
 );
 CardDescription.displayName = 'CardDescription';
 
-const CardContent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div ref={ref} className={cn('p-4 lg:p-6 pt-0', className)} {...props} />
+export const CardContent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className = '', ...props }, ref) => (
+    <div ref={ref} className={`p-4 ${className}`} {...props} />
   )
 );
 CardContent.displayName = 'CardContent';
 
-const CardFooter = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className, ...props }, ref) => (
-    <div
-      ref={ref}
-      className={cn('flex items-center p-6 pt-0', className)}
-      {...props}
-    />
+export const CardFooter = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className = '', ...props }, ref) => (
+    <div ref={ref} className={`flex items-center p-4 border-t border-foreground1 ${className}`} {...props} />
   )
 );
 CardFooter.displayName = 'CardFooter';
-
-export { CardHeader, CardFooter, CardTitle, CardDescription, CardContent };

app/_components/GlobalComponents/Cards/MetricCard.tsx

@@ -1,12 +1,12 @@
 import { cn } from "@/app/_utils/global-utils";
-import { HTMLAttributes, forwardRef } from "react";
-import { LucideIcon } from "lucide-react";
+import { HTMLAttributes, forwardRef, ComponentType } from "react";
+import { IconProps } from "@phosphor-icons/react";
 import { StatusBadge } from "@/app/_components/GlobalComponents/Badges/StatusBadge";
 import { ProgressBar } from "@/app/_components/GlobalComponents/UIElements/ProgressBar";
 import { TruncatedText } from "@/app/_components/GlobalComponents/UIElements/TruncatedText";
 
 export interface MetricCardProps extends HTMLAttributes<HTMLDivElement> {
-  icon: LucideIcon;
+  icon: ComponentType<IconProps>;
   label: string;
   value: string;
   detail?: string;
@@ -27,7 +27,7 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
       value,
       detail,
       status,
-      color = "text-blue-500",
+      color,
       variant = "basic",
       showProgress = false,
       progressValue = 0,
@@ -40,14 +40,14 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
       <div
         ref={ref}
         className={cn(
-          "flex items-start gap-3 p-3 border border-border/50 rounded-lg hover:bg-accent/50 transition-colors duration-200 glass-card-hover",
+          "flex items-start gap-3 p-3 tui-card-mini transition-colors duration-200 terminal-font",
           className
         )}
         {...props}
       >
         <div
           className={cn(
-            "p-2 rounded-lg border border-border/50 flex-shrink-0 bg-card/50"
+            "p-2 ascii-border flex-shrink-0 bg-background0"
           )}
         >
           <Icon className={cn("h-4 w-4", color)} />
@@ -55,7 +55,7 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
 
         <div className="flex-1 min-w-0">
           <div className="flex items-center gap-2 mb-1">
-            <p className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+            <p className="text-xs font-medium uppercase tracking-wide terminal-font">
               {label}
             </p>
             {status && variant === "performance" && (
@@ -67,12 +67,12 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
             <TruncatedText
               text={value}
               maxLength={40}
-              className="text-sm font-medium text-foreground"
+              className="text-sm font-medium terminal-font"
             />
           </div>
 
           {detail && (
-            <p className="text-xs text-muted-foreground mb-2">{detail}</p>
+            <p className="text-xs mb-2 terminal-font">{detail}</p>
           )}
 
           {showProgress && (

app/_components/GlobalComponents/FormElements/Input.tsx

@@ -1,17 +1,12 @@
-import { cn } from '@/app/_utils/global-utils';
 import { InputHTMLAttributes, forwardRef } from 'react';
 
-export interface InputProps extends InputHTMLAttributes<HTMLInputElement> { }
+export interface InputProps extends InputHTMLAttributes<HTMLInputElement> {}
 
 export const Input = forwardRef<HTMLInputElement, InputProps>(
-  ({ className, type, ...props }, ref) => {
+  ({ className = '', ...props }, ref) => {
     return (
       <input
-        type={type}
-        className={cn(
-          'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
-          className
-        )}
+        className={`terminal-font ascii-border px-3 py-2 bg-background0 w-full ${className}`}
         ref={ref}
         {...props}
       />

app/_components/GlobalComponents/Logo/Logo.tsx

@@ -0,0 +1,46 @@
+"use client";
+
+import { AsteriskIcon, TerminalIcon } from "@phosphor-icons/react";
+
+interface LogoProps {
+    size?: number;
+    showGlow?: boolean;
+}
+
+export const Logo = ({ size = 48, showGlow = false }: LogoProps) => {
+    const iconSize = size * 0.8;
+    const asteriskSize = size * 0.4;
+    const asteriskOffset = size * 0.08;
+
+    return (
+        <div
+            className="relative flex items-center justify-center flex-shrink-0"
+            style={{ width: size, height: size }}
+        >
+            {showGlow && (
+                <div
+                    className="absolute inset-0 bg-gradient-to-br from-primary/20 via-primary/10 to-transparent blur-xl"
+                    style={{ width: size, height: size }}
+                />
+            )}
+
+            <div className="relative z-10 flex items-center justify-center w-full h-full">
+                <TerminalIcon
+                    className="text-primary drop-shadow-[0_0_10px_rgba(var(--primary-rgb),0.4)]"
+                    weight="duotone"
+                    style={{ width: iconSize, height: iconSize }}
+                />
+                <AsteriskIcon
+                    className="text-primary absolute drop-shadow-[0_0_8px_rgba(var(--primary-rgb),0.6)]"
+                    weight="bold"
+                    style={{
+                        width: asteriskSize,
+                        height: asteriskSize,
+                        top: -asteriskOffset,
+                        right: -asteriskOffset
+                    }}
+                />
+            </div>
+        </div>
+    );
+};

app/_components/GlobalComponents/UIElements/Button.tsx

@@ -1,4 +1,3 @@
-import { cn } from '@/app/_utils/global-utils';
 import { ButtonHTMLAttributes, forwardRef } from 'react';
 
 export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
@@ -7,30 +6,31 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
 }
 
 export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant = 'default', size = 'default', ...props }, ref) => {
+  ({ className = '', variant = 'default', size = 'default', children, ...props }, ref) => {
+    const baseClasses = 'terminal-font border border-border px-4 py-2 cursor-pointer inline-flex items-center justify-center disabled:opacity-50 disabled:cursor-not-allowed';
+    const variantClasses = {
+      default: 'bg-background1 hover:bg-background2',
+      destructive: 'text-status-error hover:bg-status-error hover:text-white',
+      outline: 'bg-background0 hover:bg-background1',
+      secondary: 'bg-background2 hover:bg-background1',
+      ghost: 'border-0 bg-transparent hover:bg-background1',
+      link: 'border-0 underline bg-transparent',
+    };
+    const sizeClasses = {
+      default: '',
+      sm: 'px-2 py-1 text-sm',
+      lg: 'px-6 py-3',
+      icon: 'p-2',
+    };
+
     return (
       <button
-        className={cn(
-          'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
-          {
-            'bg-primary text-primary-foreground hover:bg-primary/90': variant === 'default',
-            'bg-destructive text-destructive-foreground hover:bg-destructive/90': variant === 'destructive',
-            'border border-input bg-background hover:bg-accent hover:text-accent-foreground': variant === 'outline',
-            'bg-secondary text-secondary-foreground hover:bg-secondary/80': variant === 'secondary',
-            'hover:bg-accent hover:text-accent-foreground': variant === 'ghost',
-            'text-primary underline-offset-4 hover:underline': variant === 'link',
-          },
-          {
-            'h-10 px-4 py-2': size === 'default',
-            'h-9 rounded-md px-3': size === 'sm',
-            'h-11 rounded-md px-8': size === 'lg',
-            'h-10 w-10': size === 'icon',
-          },
-          className
-        )}
+        className={`${baseClasses} ${variantClasses[variant]} ${sizeClasses[size]} ${className}`}
         ref={ref}
         {...props}
-      />
+      >
+        {children}
+      </button>
     );
   }
 );

app/_components/GlobalComponents/UIElements/DropdownMenu.tsx

@@ -2,9 +2,9 @@
 
 import { useState, useRef, useEffect, ReactNode } from "react";
 import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { MoreVertical } from "lucide-react";
+import { DotsThreeVerticalIcon } from "@phosphor-icons/react";
 
-const DROPDOWN_HEIGHT = 200; // Approximate max height of dropdown
+const DROPDOWN_HEIGHT = 200;
 
 interface DropdownMenuItem {
   label: string;
@@ -25,7 +25,7 @@ interface DropdownMenuProps {
 export const DropdownMenu = ({
   items,
   triggerLabel,
-  triggerIcon = <MoreVertical className="h-3 w-3" />,
+  triggerIcon = <DotsThreeVerticalIcon className="h-3 w-3" />,
   triggerClassName = "btn-outline h-8 px-3",
   onOpenChange,
 }: DropdownMenuProps) => {
@@ -36,13 +36,11 @@ export const DropdownMenu = ({
 
   const handleOpenChange = (open: boolean) => {
     if (open && triggerRef.current) {
-      // Calculate if dropdown should be positioned above or below
       const rect = triggerRef.current.getBoundingClientRect();
       const viewportHeight = window.innerHeight;
       const spaceBelow = viewportHeight - rect.bottom;
       const spaceAbove = rect.top;
 
-      // Position above if there's not enough space below
       setPositionAbove(spaceBelow < DROPDOWN_HEIGHT && spaceAbove > spaceBelow);
     }
     setIsOpen(open);
@@ -100,23 +98,21 @@ export const DropdownMenu = ({
 
       {isOpen && (
         <div
-          className={`absolute right-0 w-56 rounded-lg border border-border/50 bg-background shadow-lg z-[9999] overflow-hidden ${
-            positionAbove ? "bottom-full mb-2" : "top-full mt-2"
-          }`}
+          className={`absolute right-0 w-56 ascii-border bg-background0 shadow-lg z-[9999] overflow-hidden terminal-font ${positionAbove ? "bottom-full mb-2" : "top-full mt-2"
+            }`}
         >
-          <div className="py-1">
+          <div className="p-1">
             {items.map((item, index) => (
               <button
                 key={index}
                 onClick={() => handleItemClick(item)}
                 disabled={item.disabled}
-                className={`w-full flex items-center gap-3 px-4 py-2 text-sm transition-colors ${
-                  item.disabled
-                    ? "opacity-50 cursor-not-allowed"
-                    : item.variant === "destructive"
-                    ? "text-destructive hover:bg-destructive/10"
-                    : "text-foreground hover:bg-accent"
-                }`}
+                className={`w-full flex items-center border border-transparent gap-3 px-4 py-2 text-sm transition-colors ${item.disabled
+                  ? "opacity-50 cursor-not-allowed"
+                  : item.variant === "destructive"
+                    ? "text-status-error hover:border hover:border-border"
+                    : "hover:border-border"
+                  }`}
               >
                 {item.icon && (
                   <span className="flex-shrink-0">{item.icon}</span>

app/_components/GlobalComponents/UIElements/Modal.tsx

@@ -1,16 +1,15 @@
 "use client";
 
 import { useEffect, useRef } from "react";
-import { X } from "lucide-react";
-import { cn } from "@/app/_utils/global-utils";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
+import { XIcon } from "@phosphor-icons/react";
+import { Button } from "./Button";
 
 interface ModalProps {
   isOpen: boolean;
   onClose: () => void;
   title: string;
   children: React.ReactNode;
-  size?: "sm" | "md" | "lg" | "xl";
+  size?: "sm" | "md" | "lg" | "xl" | "2xl" | "3xl";
   showCloseButton?: boolean;
   preventCloseOnClickOutside?: boolean;
   className?: string;
@@ -26,97 +25,51 @@ export const Modal = ({
   preventCloseOnClickOutside = false,
   className = "",
 }: ModalProps) => {
-  const modalRef = useRef<HTMLDivElement>(null);
+  const dialogRef = useRef<HTMLDialogElement>(null);
 
   useEffect(() => {
-    const handleEscape = (e: KeyboardEvent) => {
-      if (e.key === "Escape") {
-        onClose();
-      }
-    };
+    const dialog = dialogRef.current;
+    if (!dialog) return;
 
     if (isOpen) {
-      document.addEventListener("keydown", handleEscape);
+      dialog.showModal();
       document.body.style.overflow = "hidden";
-    }
-
-    return () => {
-      document.removeEventListener("keydown", handleEscape);
+    } else {
+      dialog.close();
       document.body.style.overflow = "unset";
-    };
-  }, [isOpen, onClose]);
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        modalRef.current &&
-        !modalRef.current.contains(event.target as Node) &&
-        !preventCloseOnClickOutside
-      ) {
-        const target = event.target as Element;
-        const isClickingOnModal = target.closest('[data-modal="true"]');
-        const isClickingOnBackdrop =
-          target.classList.contains("modal-backdrop");
-
-        if (isClickingOnBackdrop) {
-          onClose();
-        }
-      }
-    };
-
-    if (isOpen) {
-      document.addEventListener("mousedown", handleClickOutside);
     }
-
-    return () => {
-      document.removeEventListener("mousedown", handleClickOutside);
-    };
-  }, [isOpen, onClose, preventCloseOnClickOutside]);
-
-  if (!isOpen) return null;
+  }, [isOpen]);
 
   const sizeClasses = {
-    sm: "max-w-md",
-    md: "max-w-lg",
-    lg: "max-w-2xl",
-    xl: "max-w-4xl",
+    sm: "w-[600px]",
+    md: "w-[800px]",
+    lg: "w-[1000px]",
+    xl: "w-[1200px]",
+    "2xl": "w-[1400px]",
+    "3xl": "w-[90vw]",
   };
 
   return (
-    <div
-      className="fixed inset-0 z-50 flex items-end justify-center sm:items-center p-0 sm:p-4"
-      data-modal="true"
+    <dialog
+      ref={dialogRef}
+      className={`ascii-border terminal-font bg-background0 mobile-modal ${sizeClasses[size]} max-w-[95vw] ${className}`}
+      onClick={(e) => {
+        if (e.target === dialogRef.current && !preventCloseOnClickOutside) {
+          onClose();
+        }
+      }}
     >
-      <div className="absolute inset-0 bg-black/50 backdrop-blur-sm modal-backdrop" />
-
-      <div
-        ref={modalRef}
-        className={cn(
-          "relative w-full bg-card border border-border shadow-lg",
-          "max-h-[85vh]",
-          "sm:rounded-lg sm:max-h-[90vh] sm:w-full",
-          sizeClasses[size],
-          className
+      <div className="border-border border-b p-4 flex justify-between items-center bg-background0">
+        <h2 className="terminal-font font-bold uppercase">{title}</h2>
+        {showCloseButton && (
+          <Button variant="ghost" size="icon" onClick={onClose}>
+            <XIcon className="h-4 w-4" />
+          </Button>
         )}
-      >
-        <div className="flex items-center justify-between p-4 sm:p-6 border-b border-border sticky top-0 bg-card z-10">
-          <h2 className="text-lg font-semibold text-foreground">{title}</h2>
-          {showCloseButton && (
-            <Button
-              variant="ghost"
-              size="icon"
-              onClick={onClose}
-              className="h-8 w-8"
-            >
-              <X className="h-4 w-4" />
-            </Button>
-          )}
-        </div>
-
-        <div className="p-4 sm:p-6 overflow-y-auto max-h-[calc(80vh-100px)]">
-          {children}
-        </div>
       </div>
-    </div>
+      <div className="p-4 max-h-[70vh] overflow-y-auto tui-scrollbar bg-background0">
+        {children}
+      </div>
+    </dialog>
   );
 };

app/_components/GlobalComponents/UIElements/ProgressBar.tsx

@@ -25,35 +25,29 @@ export const ProgressBar = forwardRef<HTMLDivElement, ProgressBarProps>(
     const percentage = Math.min(Math.max((value / max) * 100, 0), 100);
 
     const getColorClass = (percentage: number) => {
-      if (percentage >= 90) return "bg-destructive";
-      if (percentage >= 80) return "bg-orange-500";
-      if (percentage >= 70) return "bg-yellow-500";
-      return "bg-emerald-500";
+      if (percentage >= 90) return "bg-red-600";
+      if (percentage >= 80) return "bg-yellow-600";
+      if (percentage >= 70) return "bg-yellow-600";
+      return "bg-green-600";
     };
 
     const getGradientClass = (percentage: number) => {
-      if (percentage >= 90)
-        return "bg-gradient-to-r from-destructive to-red-600";
-      if (percentage >= 80)
-        return "bg-gradient-to-r from-orange-500 to-orange-600";
-      if (percentage >= 70)
-        return "bg-gradient-to-r from-yellow-500 to-yellow-600";
-      return "bg-gradient-to-r from-emerald-500 to-emerald-600";
+      return getColorClass(percentage);
     };
 
     return (
-      <div ref={ref} className={cn("w-full", className)} {...props}>
+      <div ref={ref} className={cn("w-full terminal-font", className)} {...props}>
         {showLabel && (
           <div className="flex justify-between items-center mb-1">
-            <span className="text-xs text-muted-foreground">Usage</span>
-            <span className="text-xs font-medium text-foreground">
+            <span className="text-xs">Usage</span>
+            <span className="text-xs font-medium">
               {Math.round(percentage)}%
             </span>
           </div>
         )}
 
         <div
-          className={cn("w-full bg-muted rounded-full overflow-hidden", {
+          className={cn("w-full bg-background2 ascii-border overflow-hidden", {
             "h-1.5": size === "sm",
             "h-2": size === "md",
             "h-3": size === "lg",

app/_components/GlobalComponents/UIElements/Switch.tsx

@@ -1,35 +1,54 @@
 "use client";
 
-import { cn } from "@/app/_utils/global-utils";
-
 interface SwitchProps {
   checked: boolean;
   onCheckedChange: (checked: boolean) => void;
   className?: string;
   disabled?: boolean;
+  id?: string;
 }
 
-export const Switch = ({
-  checked,
-  onCheckedChange,
-  className = "",
-  disabled = false,
-}: SwitchProps) => {
+export const Switch = ({ checked, onCheckedChange, className = "", disabled = false, id }: SwitchProps) => {
+  const handleClick = () => {
+    if (!disabled) {
+      onCheckedChange(!checked);
+    }
+  };
+
   return (
-    <label
-      className={cn(
-        "relative inline-flex items-center cursor-pointer",
-        className
-      )}
+    <div
+      className={`inline-flex items-center ${disabled ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'} ${className}`}
+      onClick={handleClick}
+      role="checkbox"
+      aria-checked={checked}
+      aria-labelledby={id}
+      tabIndex={disabled ? -1 : 0}
+      onKeyDown={(e) => {
+        if (!disabled && (e.key === ' ' || e.key === 'Enter')) {
+          e.preventDefault();
+          handleClick();
+        }
+      }}
     >
-      <input
-        type="checkbox"
-        className="sr-only peer"
-        checked={checked}
-        onChange={(e) => onCheckedChange(e.target.checked)}
-        disabled={disabled}
-      />
-      <div className="w-9 h-5 bg-muted peer-focus:outline-none peer-focus:ring-2 peer-focus:ring-primary/25 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:rounded-full after:h-4 after:w-4 after:transition-all peer-checked:bg-primary peer-disabled:opacity-50 peer-disabled:cursor-not-allowed"></div>
-    </label>
+      <div className="relative w-5 h-5 ascii-border bg-background0 transition-all focus-within:ring-2 focus-within:ring-primary/20 flex items-center justify-center group">
+        {checked && (
+          <svg
+            className="w-3.5 h-3.5 text-primary transition-transform duration-200"
+            viewBox="0 0 12 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M10 3L4.5 8.5L2 6"
+              stroke="currentColor"
+              strokeWidth="2"
+              strokeLinecap="square"
+              strokeLinejoin="miter"
+            />
+          </svg>
+        )}
+        <div className="absolute inset-0 border border-primary/0 group-hover:border-primary/50 transition-colors pointer-events-none" />
+      </div>
+    </div>
   );
 };

app/_components/GlobalComponents/UIElements/Toast.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { X, CheckCircle, AlertCircle, Info, AlertTriangle } from "lucide-react";
+import { XIcon, CheckCircleIcon, WarningCircleIcon, InfoIcon, WarningIcon } from "@phosphor-icons/react";
 import { cn } from "@/app/_utils/global-utils";
 import { ErrorDetailsModal } from "@/app/_components/FeatureComponents/Modals/ErrorDetailsModal";
 
@@ -30,19 +30,17 @@ interface ToastProps {
 }
 
 const toastIcons = {
-  success: CheckCircle,
-  error: AlertCircle,
-  info: Info,
-  warning: AlertTriangle,
+  success: CheckCircleIcon,
+  error: WarningCircleIcon,
+  info: InfoIcon,
+  warning: WarningIcon,
 };
 
 const toastStyles = {
-  success:
-    "border-green-500/20 bg-green-500/10 text-green-700 dark:text-green-400",
-  error: "border-red-500/20 bg-red-500/10 text-red-700 dark:text-red-400",
-  info: "border-blue-500/20 bg-blue-500/10 text-blue-700 dark:text-blue-400",
-  warning:
-    "border-yellow-500/20 bg-yellow-500/10 text-yellow-700 dark:text-yellow-400",
+  success: "ascii-border bg-background0 text-status-success",
+  error: "ascii-border bg-background0 text-status-error",
+  info: "ascii-border bg-background0 text-status-info",
+  warning: "ascii-border bg-background0 text-status-warning",
 };
 
 export const Toast = ({ toast, onRemove, onErrorClick }: ToastProps) => {
@@ -62,7 +60,7 @@ export const Toast = ({ toast, onRemove, onErrorClick }: ToastProps) => {
   return (
     <div
       className={cn(
-        "flex items-start gap-3 p-4 rounded-lg border backdrop-blur-md transition-all duration-300 ease-in-out",
+        "flex items-start gap-3 p-4 terminal-font transition-all duration-300 ease-in-out",
         toastStyles[toast.type],
         isVisible ? "translate-x-0 opacity-100" : "translate-x-full opacity-0"
       )}
@@ -92,7 +90,7 @@ export const Toast = ({ toast, onRemove, onErrorClick }: ToastProps) => {
         }}
         className="flex-shrink-0 p-1 rounded-md hover:bg-black/10 transition-colors"
       >
-        <X className="h-4 w-4" />
+        <XIcon className="h-4 w-4" />
       </button>
     </div>
   );

app/_consts/commands.ts

@@ -1,23 +1,32 @@
-export const WRITE_CRONTAB = (content: string, user: string) => `echo '${content}' | crontab -u ${user} -`;
+export const WRITE_CRONTAB = (content: string, user: string) => {
+  return `crontab -u ${user} - << 'EOF'\n${content}\nEOF`;
+};
 
-export const READ_CRONTAB = (user: string) => `crontab -l -u ${user} 2>/dev/null || echo ""`;
+export const READ_CRONTAB = (user: string) =>
+  `crontab -l -u ${user} 2>/dev/null || echo ""`;
 
-export const READ_CRON_FILE = () => 'crontab -l 2>/dev/null || echo ""'
+export const READ_CRON_FILE = () => 'crontab -l 2>/dev/null || echo ""';
 
-export const WRITE_CRON_FILE = (content: string) => `echo "${content}" | crontab -`;
+export const WRITE_CRON_FILE = (content: string) => {
+  return `crontab - << 'EOF'\n${content}\nEOF`;
+};
 
-export const WRITE_HOST_CRONTAB = (base64Content: string, user: string) => `echo '${base64Content}' | base64 -d | crontab -u ${user} -`;
+export const WRITE_HOST_CRONTAB = (base64Content: string, user: string) => {
+  const escapedContent = base64Content.replace(/'/g, "'\\''");
+  return `echo '${escapedContent}' | base64 -d | crontab -u ${user} -`;
+};
 
 export const ID_U = (username: string) => `id -u ${username}`;
 
 export const ID_G = (username: string) => `id -g ${username}`;
 
-export const MAKE_SCRIPT_EXECUTABLE = (scriptPath: string) => `chmod +x "${scriptPath}"`;
+export const MAKE_SCRIPT_EXECUTABLE = (scriptPath: string) =>
+  `chmod +x "${scriptPath}"`;
 
 export const RUN_SCRIPT = (scriptPath: string) => `bash "${scriptPath}"`;
 
-export const GET_TARGET_USER = `getent passwd | grep ":/home/" | head -1 | cut -d: -f1`
+export const GET_TARGET_USER = `getent passwd | grep ":/home/" | head -1 | cut -d: -f1`;
 
-export const GET_DOCKER_SOCKET_OWNER = 'stat -c "%U" /var/run/docker.sock'
+export const GET_DOCKER_SOCKET_OWNER = 'stat -c "%U" /var/run/docker.sock';
 
-export const READ_CRONTABS_DIRECTORY = `ls /var/spool/cron/crontabs/ 2>/dev/null || echo ''`;
+export const READ_CRONTABS_DIRECTORY = `ls /var/spool/cron/crontabs/ 2>/dev/null || echo ''`;

app/_hooks/usePageVisibility.ts

@@ -2,13 +2,7 @@
 
 import { useEffect, useState } from "react";
 
-/**
- * Hook to detect if the page/tab is currently visible to the user.
- * Returns true when the page is visible, false when hidden (user switched tabs).
- *
- * Use this to pause polling, SSE connections, or other resource-intensive
- * operations when the user is not actively viewing the page.
- */
+
 export function usePageVisibility(): boolean {
   const [isVisible, setIsVisible] = useState<boolean>(
     typeof document !== "undefined" ? !document.hidden : true

app/_providers/ThemeProvider.tsx

@@ -4,7 +4,21 @@ import { ThemeProvider as NextThemesProvider } from 'next-themes';
 import { type ThemeProviderProps } from 'next-themes/dist/types';
 
 export const ThemeProvider = ({ children, ...props }: ThemeProviderProps) => {
-  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
+  return (
+    <NextThemesProvider
+      attribute="data-webtui-theme"
+      defaultTheme="light"
+      themes={['light', 'dark']}
+      value={{
+        light: 'catppuccin-latte',
+        dark: 'catppuccin-mocha',
+      }}
+      disableTransitionOnChange
+      {...props}
+    >
+      {children}
+    </NextThemesProvider>
+  );
 }
 
 

app/_server/actions/scripts/index.ts

@@ -2,7 +2,7 @@
 
 import { revalidatePath } from "next/cache";
 import { writeFile, readFile, unlink, mkdir } from "fs/promises";
-import { join } from "path";
+import path from "path";
 import { existsSync } from "fs";
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -13,10 +13,6 @@ import { isDocker, getHostScriptsPath } from "@/app/_server/actions/global";
 
 const execAsync = promisify(exec);
 
-export const getScriptPath = (filename: string): string => {
-  return join(process.cwd(), SCRIPTS_DIR, filename);
-};
-
 export const getScriptPathForCron = async (
   filename: string
 ): Promise<string> => {
@@ -25,19 +21,19 @@ export const getScriptPathForCron = async (
   if (docker) {
     const hostScriptsPath = await getHostScriptsPath();
     if (hostScriptsPath) {
-      return `bash ${join(hostScriptsPath, filename)}`;
+      return `bash ${path.join(hostScriptsPath, filename)}`;
     }
     console.warn("Could not determine host scripts path, using container path");
   }
 
-  return `bash ${join(process.cwd(), SCRIPTS_DIR, filename)}`;
+  return `bash ${path.join(process.cwd(), SCRIPTS_DIR, filename)}`;
 };
 
-export const getHostScriptPath = (filename: string): string => {
-  return `bash ${join(process.cwd(), SCRIPTS_DIR, filename)}`;
+export const getHostScriptPath = async (filename: string): Promise<string> => {
+  return `bash ${path.join(process.cwd(), SCRIPTS_DIR, filename)}`;
 };
 
-export const normalizeLineEndings = (content: string): string => {
+export const normalizeLineEndings = async (content: string): Promise<string> => {
   return content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
 };
 
@@ -65,14 +61,14 @@ const generateUniqueFilename = async (baseName: string): Promise<string> => {
 };
 
 const ensureScriptsDirectory = async () => {
-  const scriptsDir = join(process.cwd(), SCRIPTS_DIR);
+  const scriptsDir = path.join(process.cwd(), SCRIPTS_DIR);
   if (!existsSync(scriptsDir)) {
     await mkdir(scriptsDir, { recursive: true });
   }
 };
 
 const ensureHostScriptsDirectory = async () => {
-  const hostScriptsDir = join(process.cwd(), SCRIPTS_DIR);
+  const hostScriptsDir = path.join(process.cwd(), SCRIPTS_DIR);
   if (!existsSync(hostScriptsDir)) {
     await mkdir(hostScriptsDir, { recursive: true });
   }
@@ -81,7 +77,7 @@ const ensureHostScriptsDirectory = async () => {
 const saveScriptFile = async (filename: string, content: string) => {
   await ensureScriptsDirectory();
 
-  const scriptPath = getScriptPath(filename);
+  const scriptPath = path.join(process.cwd(), SCRIPTS_DIR, filename);
   await writeFile(scriptPath, content, "utf8");
 
   try {
@@ -92,7 +88,7 @@ const saveScriptFile = async (filename: string, content: string) => {
 };
 
 const deleteScriptFile = async (filename: string) => {
-  const scriptPath = getScriptPath(filename);
+  const scriptPath = path.join(process.cwd(), SCRIPTS_DIR, filename);
   if (existsSync(scriptPath)) {
     await unlink(scriptPath);
   }
@@ -125,7 +121,7 @@ export const createScript = async (
 
 `;
 
-    const normalizedContent = normalizeLineEndings(content);
+    const normalizedContent = await normalizeLineEndings(content);
     const fullContent = metadataHeader + normalizedContent;
 
     await saveScriptFile(filename, fullContent);
@@ -176,7 +172,7 @@ export const updateScript = async (
 
 `;
 
-    const normalizedContent = normalizeLineEndings(content);
+    const normalizedContent = await normalizeLineEndings(content);
     const fullContent = metadataHeader + normalizedContent;
 
     await saveScriptFile(existingScript.filename, fullContent);
@@ -235,7 +231,7 @@ export const cloneScript = async (
 
 `;
 
-    const normalizedContent = normalizeLineEndings(originalContent);
+    const normalizedContent = await normalizeLineEndings(originalContent);
     const fullContent = metadataHeader + normalizedContent;
 
     await saveScriptFile(filename, fullContent);
@@ -262,7 +258,7 @@ export const cloneScript = async (
 
 export const getScriptContent = async (filename: string): Promise<string> => {
   try {
-    const scriptPath = getScriptPath(filename);
+    const scriptPath = path.join(process.cwd(), SCRIPTS_DIR, filename);
 
     if (existsSync(scriptPath)) {
       const content = await readFile(scriptPath, "utf8");
@@ -299,7 +295,7 @@ export const executeScript = async (
 }> => {
   try {
     await ensureHostScriptsDirectory();
-    const hostScriptPath = getHostScriptPath(filename);
+    const hostScriptPath = await getHostScriptPath(filename);
 
     if (!existsSync(hostScriptPath)) {
       return {

app/_server/actions/translations/index.ts

@@ -42,11 +42,7 @@ export const loadTranslationMessages = async (locale: string): Promise<any> => {
 
 type TranslationFunction = (key: string) => string;
 
-/**
- * Get a translation function for a given locale.
- * This function is server-only and should only be called from server components
- * or server actions.
- */
+
 export const getTranslations = async (
   locale: string = process.env.LOCALE || "en"
 ): Promise<TranslationFunction> => {

app/_translations/en.json

@@ -11,7 +11,7 @@
         "close": "Close",
         "refresh": "Refresh",
         "loading": "Loading",
-        "version": "{version}"
+        "version": "Version {version}"
     },
     "cronjobs": {
         "cronJobs": "Cron Jobs",
@@ -87,7 +87,26 @@
         "both": "Both",
         "minimalMode": "Minimal Mode",
         "minimalModeDescription": "Show compact view with icons instead of full text",
-        "applyFilters": "Apply Filters"
+        "applyFilters": "Apply Filters",
+        "nLines": "{count} lines",
+        "liveJobExecution": "Live Job Execution",
+        "running": "Running...",
+        "completed": "Completed (Exit: {exitCode})",
+        "jobFailed": "Failed (Exit: {exitCode})",
+        "showLast": "Show last:",
+        "viewFullLog": "View Full Log ({totalLines} lines)",
+        "viewFullLogNoCount": "View Full Log",
+        "viewingFullLog": "Viewing full log ({totalLines} lines)",
+        "viewingFullLogNoCount": "Viewing full log",
+        "backToWindowedView": "Back to Windowed View",
+        "showingLastOf": "Showing last {lineCount} of {totalLines} lines",
+        "showingLastLines": "Showing last {lineCount} lines",
+        "largeLogFileDetected": "Large log file detected",
+        "tailModeEnabled": "Tail mode enabled, showing last {tailLines} lines",
+        "showAllLines": "Show all lines",
+        "enableTailMode": "Enable tail mode",
+        "waitingForJobToStart": "Waiting for job to start...\n\nLogs will appear here in real-time.",
+        "runIdJobId": "Run ID: {runId} | Job ID: {jobId}"
     },
     "scripts": {
         "scripts": "Scripts",
@@ -109,7 +128,11 @@
         "commandPreview": "Command Preview",
         "scriptContent": "Script Content",
         "selectScriptToPreview": "Select a script to preview",
-        "searchScripts": "Search scripts..."
+        "searchScripts": "Search scripts...",
+        "draft": "Draft",
+        "clearDraft": "Clear Draft",
+        "close": "Close",
+        "draftCleared": "Draft cleared"
     },
     "sidebar": {
         "systemOverview": "System Overview",
@@ -156,6 +179,8 @@
         "signingIn": "Signing in...",
         "signIn": "Sign In",
         "redirecting": "Redirecting...",
+        "redirectingToOIDC": "Redirecting to OIDC provider",
+        "pleaseWait": "Please wait...",
         "orContinueWith": "Or continue with",
         "loginFailed": "Login failed",
         "genericError": "An error occurred. Please try again."
@@ -163,5 +188,21 @@
     "warnings": {
         "wrapperScriptModified": "Wrapper Script Modified",
         "wrapperScriptModifiedDescription": "Your cron-log-wrapper.sh script has been modified from the official version. This may affect logging functionality. Consider reverting to the official version or ensure your changes don't break the required format for log parsing."
+    },
+    "notFound": {
+        "title": "404 - Page Not Found",
+        "subtitle": "ERROR: The requested resource could not be located",
+        "message": "The page you're looking for doesn't exist. Want to play snake instead?",
+        "gameOver": "GAME OVER",
+        "score": "Score",
+        "highScore": "High Score",
+        "pressToStart": "Press SPACE or tap to start",
+        "pressToRestart": "Press SPACE or tap to restart",
+        "controls": "Controls",
+        "useArrowKeys": "Use arrow keys to move",
+        "tapToMove": "Tap screen edges to move",
+        "goHome": "Return to Dashboard",
+        "pauseGame": "Press P to pause",
+        "paused": "PAUSED"
     }
 }

app/_translations/it.json

@@ -10,7 +10,7 @@
         "cancel": "Annulla",
         "refresh": "Aggiorna",
         "close": "Chiudi",
-        "version": "{version}"
+        "version": "Versione {version}"
     },
     "cronjobs": {
         "cronJobs": "Operazioni Cron",
@@ -86,7 +86,23 @@
         "both": "Entrambi",
         "minimalMode": "Modalità Minima",
         "minimalModeDescription": "Mostra vista compatta con icone invece del testo completo",
-        "applyFilters": "Applica Filtri"
+        "applyFilters": "Applica Filtri",
+        "nLines": "{count} linee",
+        "liveJobExecution": "Esecuzione Lavoro Live",
+        "running": "In esecuzione...",
+        "completed": "Completato (Exit: {exitCode})",
+        "jobFailed": "Fallito (Exit: {exitCode})",
+        "showLast": "Mostra ultime:",
+        "viewFullLog": "Visualizza Log Completo ({totalLines} linee)",
+        "viewingFullLog": "Visualizzazione log completo ({totalLines} linee)",
+        "backToWindowedView": "Torna alla Vista Finestrata",
+        "showingLastOf": "Mostrando ultime {lineCount} di {totalLines} linee",
+        "largeLogFileDetected": "Rilevato file di log di grandi dimensioni",
+        "tailModeEnabled": "Modalità tail abilitata, mostrando ultime {tailLines} linee",
+        "showAllLines": "Mostra tutte le linee",
+        "enableTailMode": "Abilita modalità tail",
+        "waitingForJobToStart": "In attesa che il lavoro inizi...\n\nI log appariranno qui in tempo reale.",
+        "runIdJobId": "ID Esecuzione: {runId} | ID Lavoro: {jobId}"
     },
     "scripts": {
         "scripts": "Script",
@@ -108,7 +124,11 @@
         "commandPreview": "Anteprima Comando",
         "scriptContent": "Contenuto Script",
         "selectScriptToPreview": "Seleziona uno script per l'anteprima",
-        "searchScripts": "Cerca script..."
+        "searchScripts": "Cerca script...",
+        "draft": "Bozza",
+        "clearDraft": "Cancella Bozza",
+        "close": "Chiudi",
+        "draftCleared": "Bozza cancellata"
     },
     "sidebar": {
         "systemOverview": "Panoramica del Sistema",
@@ -155,6 +175,8 @@
         "signingIn": "Accesso in corso...",
         "signIn": "Accedi",
         "redirecting": "Reindirizzamento...",
+        "redirectingToOIDC": "Reindirizzamento al provider OIDC",
+        "pleaseWait": "Attendere prego...",
         "orContinueWith": "Oppure continua con",
         "loginFailed": "Accesso fallito",
         "genericError": "Si è verificato un errore. Riprova."
@@ -162,5 +184,22 @@
     "warnings": {
         "wrapperScriptModified": "Script Wrapper Modificato",
         "wrapperScriptModifiedDescription": "Il tuo script cron-log-wrapper.sh è stato modificato dalla versione ufficiale. Questo potrebbe influenzare la funzionalità di logging. Considera di ripristinare la versione ufficiale o assicurati che le tue modifiche non interrompano il formato richiesto per l'analisi dei log."
+    },
+    "notFound": {
+        "title": "404 - Pagina Non Trovata",
+        "subtitle": "ERRORE: La risorsa richiesta non è stata trovata",
+        "message": "La pagina che stai cercando non esiste. Partitella a snake?",
+        "playSnake": "Gioca a Snake mentre sei qui",
+        "gameOver": "GAME OVER",
+        "score": "Punteggio",
+        "highScore": "Punteggio Massimo",
+        "pressToStart": "Premi SPAZIO o tocca per iniziare",
+        "pressToRestart": "Premi SPAZIO o tocca per ricominciare",
+        "controls": "Controlli",
+        "useArrowKeys": "Usa i tasti freccia per muoverti",
+        "tapToMove": "Tocca i bordi dello schermo per muoverti",
+        "goHome": "Torna alla Dashboard",
+        "pauseGame": "Premi P per mettere in pausa",
+        "paused": "IN PAUSA"
     }
 }

app/_utils/api-auth-utils.ts

@@ -56,16 +56,19 @@ export async function requireAuth(
     return null;
   }
 
-  const hasValidApiKey = validateApiKey(request);
-  if (hasValidApiKey) {
-    return null;
+  const apiKey = process.env.API_KEY;
+  if (apiKey) {
+    const hasValidApiKey = validateApiKey(request);
+    if (hasValidApiKey) {
+      return null;
+    }
   }
 
   if (process.env.DEBUGGER) {
     console.log("[API Auth] Unauthorized request:", {
       path: request.nextUrl.pathname,
       hasSession: hasValidSession,
-      hasApiKey: hasValidApiKey,
+      apiKeyConfigured: !!process.env.API_KEY,
       hasAuthHeader: !!request.headers.get("authorization"),
     });
   }

app/_utils/cronjob-utils.ts

@@ -251,7 +251,13 @@ export const deleteCronJob = async (id: string): Promise<boolean> => {
 };
 
 export const updateCronJob = async (
-  jobData: { id: string; schedule: string; command: string; comment?: string; user: string },
+  jobData: {
+    id: string;
+    schedule: string;
+    command: string;
+    comment?: string;
+    user: string;
+  },
   schedule: string,
   command: string,
   comment: string = "",
@@ -275,7 +281,12 @@ export const updateCronJob = async (
 
     if (logsEnabled && !isWrapped) {
       const docker = await isDocker();
-      finalCommand = await wrapCommandWithLogger(jobData.id, command, docker, comment);
+      finalCommand = await wrapCommandWithLogger(
+        jobData.id,
+        command,
+        docker,
+        comment
+      );
     } else if (!logsEnabled && isWrapped) {
       finalCommand = unwrapCommand(command);
     } else if (logsEnabled && isWrapped) {
@@ -390,7 +401,14 @@ export const cleanupCrontab = async (): Promise<boolean> => {
 };
 
 export const findJobIndex = (
-  jobData: { id: string; schedule: string; command: string; comment?: string; user: string; paused?: boolean },
+  jobData: {
+    id: string;
+    schedule: string;
+    command: string;
+    comment?: string;
+    user: string;
+    paused?: boolean;
+  },
   lines: string[],
   user: string
 ): number => {

app/_utils/job-execution-utils.ts

@@ -7,9 +7,11 @@ import {
   saveRunningJob,
   updateRunningJob,
   getRunningJob,
+  removeRunningJob,
 } from "./running-jobs-utils";
 import { sseBroadcaster } from "./sse-broadcaster";
-import { generateLogFolderName } from "./wrapper-utils";
+import { generateLogFolderName, cleanupOldLogFiles } from "./wrapper-utils";
+import { watchForLogFile } from "./log-watcher";
 
 const execAsync = promisify(exec);
 
@@ -83,18 +85,29 @@ export const runJobInBackground = async (
 
   child.unref();
 
+  const jobStartTime = new Date();
+
   saveRunningJob({
     id: runId,
     cronJobId: job.id,
     pid: child.pid!,
-    startTime: new Date().toISOString(),
+    startTime: jobStartTime.toISOString(),
     status: "running",
     logFolderName,
   });
 
+  watchForLogFile(runId, logFolderName, jobStartTime, (logFileName) => {
+    try {
+      updateRunningJob(runId, { logFileName });
+      console.log(`[RunningJob] Cached logFileName for ${runId}: ${logFileName}`);
+    } catch (error) {
+      console.error(`[RunningJob] Failed to cache logFileName for ${runId}:`, error);
+    }
+  });
+
   sseBroadcaster.broadcast({
     type: "job-started",
-    timestamp: new Date().toISOString(),
+    timestamp: jobStartTime.toISOString(),
     data: {
       runId,
       cronJobId: job.id,
@@ -112,9 +125,6 @@ export const runJobInBackground = async (
   };
 };
 
-/**
- * Monitor a running job and update status when complete
- */
 const monitorRunningJob = (runId: string, pid: number): void => {
   const checkInterval = setInterval(async () => {
     try {
@@ -130,6 +140,15 @@ const monitorRunningJob = (runId: string, pid: number): void => {
           exitCode,
         });
 
+        setTimeout(async () => {
+          try {
+            removeRunningJob(runId);
+            await cleanupOldLogFiles(runningJob?.cronJobId || "");
+          } catch (error) {
+            console.error(`Error cleaning up job ${runId}:`, error);
+          }
+        }, 5000);
+
         const runningJob = getRunningJob(runId);
 
         if (runningJob) {

app/_utils/line-manipulation-utils.ts

@@ -1,5 +1,20 @@
 import { CronJob } from "@/app/_utils/cronjob-utils";
 import { generateShortUUID } from "@/app/_utils/uuid-utils";
+import { createHash } from "crypto";
+
+const generateStableJobId = (
+  schedule: string,
+  command: string,
+  user: string,
+  comment?: string,
+  lineIndex?: number
+): string => {
+  const content = `${schedule}|${command}|${user}|${comment || ""}|${
+    lineIndex || 0
+  }`;
+  const hash = createHash("md5").update(content).digest("hex");
+  return hash.substring(0, 8);
+};
 
 export const pauseJobInLines = (
   lines: string[],
@@ -55,7 +70,11 @@ export const pauseJobInLines = (
         if (currentJobIndex === targetJobIndex) {
           const commentText = trimmedLine.substring(1).trim();
           const { comment, logsEnabled } = parseCommentMetadata(commentText);
-          const formattedComment = formatCommentWithMetadata(comment, logsEnabled, uuid);
+          const formattedComment = formatCommentWithMetadata(
+            comment,
+            logsEnabled,
+            uuid
+          );
           const nextLine = lines[i + 1].trim();
           const pausedEntry = `# PAUSED: ${formattedComment}\n# ${nextLine}`;
           newCronEntries.push(pausedEntry);
@@ -128,8 +147,14 @@ export const resumeJobInLines = (
         const { comment, logsEnabled } = parseCommentMetadata(commentText);
         if (i + 1 < lines.length && lines[i + 1].trim().startsWith("# ")) {
           const cronLine = lines[i + 1].trim().substring(2);
-          const formattedComment = formatCommentWithMetadata(comment, logsEnabled, uuid);
-          const resumedEntry = formattedComment ? `# ${formattedComment}\n${cronLine}` : cronLine;
+          const formattedComment = formatCommentWithMetadata(
+            comment,
+            logsEnabled,
+            uuid
+          );
+          const resumedEntry = formattedComment
+            ? `# ${formattedComment}\n${cronLine}`
+            : cronLine;
           newCronEntries.push(resumedEntry);
           i += 2;
         } else {
@@ -175,7 +200,9 @@ export const parseCommentMetadata = (
   let uuid: string | undefined;
 
   if (parts.length > 1) {
-    const firstPartIsMetadata = parts[0].match(/logsEnabled:\s*(true|false)/i) || parts[0].match(/id:\s*([a-z0-9]{4}-[a-z0-9]{4})/i);
+    const firstPartIsMetadata =
+      parts[0].match(/logsEnabled:\s*(true|false)/i) ||
+      parts[0].match(/id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/i);
 
     if (firstPartIsMetadata) {
       comment = "";
@@ -186,9 +213,11 @@ export const parseCommentMetadata = (
         logsEnabled = logsMatch[1].toLowerCase() === "true";
       }
 
-      const uuidMatch = metadata.match(/id:\s*([a-z0-9]{4}-[a-z0-9]{4})/i);
-      if (uuidMatch) {
-        uuid = uuidMatch[1].toLowerCase();
+      const uuidMatches = Array.from(
+        metadata.matchAll(/id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/gi)
+      );
+      if (uuidMatches.length > 0) {
+        uuid = uuidMatches[uuidMatches.length - 1][1].toLowerCase();
       }
     } else {
       comment = parts[0] || "";
@@ -199,14 +228,18 @@ export const parseCommentMetadata = (
         logsEnabled = logsMatch[1].toLowerCase() === "true";
       }
 
-      const uuidMatch = metadata.match(/id:\s*([a-z0-9]{4}-[a-z0-9]{4})/i);
-      if (uuidMatch) {
-        uuid = uuidMatch[1].toLowerCase();
+      const uuidMatches = Array.from(
+        metadata.matchAll(/id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/gi)
+      );
+      if (uuidMatches.length > 0) {
+        uuid = uuidMatches[uuidMatches.length - 1][1].toLowerCase();
       }
     }
   } else {
     const logsMatch = commentText.match(/logsEnabled:\s*(true|false)/i);
-    const uuidMatch = commentText.match(/id:\s*([a-z0-9]{4}-[a-z0-9]{4})/i);
+    const uuidMatch = commentText.match(
+      /id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/i
+    );
 
     if (logsMatch || uuidMatch) {
       if (logsMatch) {
@@ -288,7 +321,8 @@ export const parseJobsFromLines = (
             const schedule = parts.slice(0, 5).join(" ");
             const command = parts.slice(5).join(" ");
 
-            const jobId = uuid || generateShortUUID();
+            const jobId =
+              uuid || generateStableJobId(schedule, command, user, comment, i);
 
             jobs.push({
               id: jobId,
@@ -317,7 +351,8 @@ export const parseJobsFromLines = (
         lines[i + 1].trim()
       ) {
         const commentText = trimmedLine.substring(1).trim();
-        const { comment, logsEnabled, uuid } = parseCommentMetadata(commentText);
+        const { comment, logsEnabled, uuid } =
+          parseCommentMetadata(commentText);
         currentComment = comment;
         currentLogsEnabled = logsEnabled;
         currentUuid = uuid;
@@ -343,7 +378,9 @@ export const parseJobsFromLines = (
     }
 
     if (schedule && command) {
-      const jobId = currentUuid || generateShortUUID();
+      const jobId =
+        currentUuid ||
+        generateStableJobId(schedule, command, user, currentComment, i);
 
       jobs.push({
         id: jobId,
@@ -545,7 +582,11 @@ export const updateJobInLines = (
     }
 
     if (currentJobIndex === targetJobIndex) {
-      const formattedComment = formatCommentWithMetadata(comment, logsEnabled, uuid);
+      const formattedComment = formatCommentWithMetadata(
+        comment,
+        logsEnabled,
+        uuid
+      );
       const newEntry = formattedComment
         ? `# ${formattedComment}\n${schedule} ${command}`
         : `${schedule} ${command}`;

app/_utils/log-watcher.ts

@@ -95,3 +95,62 @@ export const stopLogWatcher = () => {
     watcher = null;
   }
 };
+
+export const watchForLogFile = (
+  runId: string,
+  logFolderName: string,
+  jobStartTime: Date,
+  callback: (logFileName: string) => void
+): NodeJS.Timeout => {
+  const logDir = path.join(LOGS_DIR, logFolderName);
+  const startTime = jobStartTime.getTime();
+  const maxAttempts = 30;
+  let attempts = 0;
+
+  const checkInterval = setInterval(() => {
+    attempts++;
+
+    if (attempts > maxAttempts) {
+      console.warn(`[LogWatcher] Timeout waiting for log file for ${runId}`);
+      clearInterval(checkInterval);
+      return;
+    }
+
+    try {
+      if (!existsSync(logDir)) {
+        return;
+      }
+
+      const files = readdirSync(logDir);
+      const logFiles = files
+        .filter((f) => f.endsWith(".log"))
+        .map((f) => {
+          const filePath = path.join(logDir, f);
+          try {
+            const stats = statSync(filePath);
+            return {
+              name: f,
+              birthtime: stats.birthtime || stats.mtime,
+            };
+          } catch {
+            return null;
+          }
+        })
+        .filter((f): f is { name: string; birthtime: Date } => f !== null);
+
+      const matchingFile = logFiles.find((f) => {
+        const fileTime = f.birthtime.getTime();
+        return fileTime >= startTime - 5000 && fileTime <= startTime + 30000;
+      });
+
+      if (matchingFile) {
+        clearInterval(checkInterval);
+        callback(matchingFile.name);
+      }
+    } catch (error) {
+      console.error(`[LogWatcher] Error watching for log file ${runId}:`, error);
+    }
+  }, 500);
+
+  return checkInterval;
+};

app/_utils/scripts-utils.ts

@@ -86,4 +86,4 @@ export const getScriptById = (
   id: string
 ): Script | undefined => {
   return scripts.find((script) => script.id === id);
-}
+};

app/_utils/wrapper-utils.ts

@@ -100,3 +100,55 @@ export const extractJobIdFromWrappedCommand = (
 
   return null;
 };
+
+export const cleanupOldLogFiles = async (
+  jobId: string,
+  maxFiles: number = 10
+): Promise<void> => {
+  try {
+    const { readdir, stat, unlink } = await import("fs/promises");
+    const logFolderName = generateLogFolderName(jobId);
+    const logDir = path.join(process.cwd(), "data", "logs", logFolderName);
+
+    try {
+      await stat(logDir);
+    } catch {
+      return;
+    }
+
+    const files = await readdir(logDir);
+    const logFiles = files
+      .filter((f) => f.endsWith(".log"))
+      .map((f) => ({
+        name: f,
+        path: path.join(logDir, f),
+        stats: null as any,
+      }));
+
+    for (const file of logFiles) {
+      try {
+        file.stats = await stat(file.path);
+      } catch (error) {
+        console.error(`Error stat-ing log file ${file.path}:`, error);
+      }
+    }
+
+    const validFiles = logFiles
+      .filter((f) => f.stats)
+      .sort((a, b) => b.stats.mtime.getTime() - a.stats.mtime.getTime());
+
+    if (validFiles.length > maxFiles) {
+      const filesToDelete = validFiles.slice(maxFiles);
+      for (const file of filesToDelete) {
+        try {
+          await unlink(file.path);
+          console.log(`Cleaned up old log file: ${file.path}`);
+        } catch (error) {
+          console.error(`Error deleting log file ${file.path}:`, error);
+        }
+      }
+    }
+  } catch (error) {
+    console.error(`Error cleaning up log files for job ${jobId}:`, error);
+  }
+};

app/api/auth/check-session/route.ts

@@ -3,10 +3,6 @@ import { validateSession, getSessionCookieName } from "@/app/_utils/session-util
 
 export const dynamic = "force-dynamic";
 
-/**
- * Validate session for middleware
- * This runs in Node.js runtime so it can access the filesystem
- */
 export async function GET(request: NextRequest) {
   const cookieName = getSessionCookieName();
   const sessionId = request.cookies.get(cookieName)?.value;

app/api/logs/stream/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getRunningJob } from "@/app/_utils/running-jobs-utils";
-import { readFile } from "fs/promises";
+import { readFile, open } from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
 import { requireAuth } from "@/app/_utils/api-auth-utils";
@@ -17,6 +17,11 @@ export const GET = async (request: NextRequest) => {
     const offsetStr = searchParams.get("offset");
     const offset = offsetStr ? parseInt(offsetStr, 10) : 0;
 
+    const maxLinesStr = searchParams.get("maxLines");
+    const maxLines = maxLinesStr
+      ? Math.min(Math.max(parseInt(maxLinesStr, 10), 100), 5000)
+      : 500;
+
     if (!runId) {
       return NextResponse.json(
         { error: "runId parameter is required" },
@@ -68,35 +73,154 @@ export const GET = async (request: NextRequest) => {
     }
 
     const sortedFiles = files.sort().reverse();
-    const latestLogFile = path.join(logDir, sortedFiles[0]);
 
-    const fullContent = await readFile(latestLogFile, "utf-8");
-    const fileSize = Buffer.byteLength(fullContent, "utf-8");
+    let latestLogFile: string | null = null;
+    let latestStats: any = null;
+    const jobStartTime = new Date(job.startTime);
+    const TIME_TOLERANCE_MS = 5000;
 
-    let content = fullContent;
+    if (job.logFileName) {
+      const cachedFilePath = path.join(logDir, job.logFileName);
+      if (existsSync(cachedFilePath)) {
+        try {
+          const { stat } = await import("fs/promises");
+          latestLogFile = cachedFilePath;
+          latestStats = await stat(latestLogFile);
+        } catch (error) {
+          console.error(`Error reading cached log file ${job.logFileName}:`, error);
+        }
+      }
+    }
+
+    if (!latestLogFile) {
+      for (const file of sortedFiles) {
+        const filePath = path.join(logDir, file);
+        try {
+          const { stat } = await import("fs/promises");
+          const stats = await stat(filePath);
+          const fileCreateTime = stats.birthtime || stats.mtime;
+
+          if (fileCreateTime.getTime() >= jobStartTime.getTime() - TIME_TOLERANCE_MS) {
+            latestLogFile = filePath;
+            latestStats = stats;
+            break;
+          }
+        } catch (error) {
+          console.error(`Error checking file ${file}:`, error);
+        }
+      }
+
+      if (!latestLogFile && sortedFiles.length > 0) {
+        try {
+          const { stat } = await import("fs/promises");
+          const fallbackPath = path.join(logDir, sortedFiles[0]);
+          const fallbackStats = await stat(fallbackPath);
+          const now = new Date();
+          const fileAge = now.getTime() - (fallbackStats.birthtime || fallbackStats.mtime).getTime();
+
+          if (fileAge <= TIME_TOLERANCE_MS) {
+            latestLogFile = fallbackPath;
+            latestStats = fallbackStats;
+          }
+        } catch (error) {
+          console.error(`Error stat-ing fallback file:`, error);
+        }
+      }
+    }
+
+    if (!latestLogFile || !latestStats) {
+      return NextResponse.json(
+        {
+          status: job.status,
+          content: "",
+          message: "No log file found for this run",
+        },
+        { status: 200 }
+      );
+    }
+
+    const fileSize = latestStats.size;
+
+    let displayedLines: string[] = [];
+    let truncated = false;
+    let totalLines = 0;
+    let content = "";
     let newContent = "";
 
-    if (offset > 0 && offset < fileSize) {
-      newContent = fullContent.slice(offset);
-      content = newContent;
-    } else if (offset === 0) {
-      content = fullContent;
-      newContent = fullContent;
-    } else if (offset >= fileSize) {
-      content = "";
-      newContent = "";
+    if (offset === 0) {
+      const AVERAGE_LINE_LENGTH = 100;
+      const ESTIMATED_BYTES = maxLines * AVERAGE_LINE_LENGTH * 2;
+      const bytesToRead = Math.min(ESTIMATED_BYTES, fileSize);
+
+      if (bytesToRead < fileSize) {
+        const fileHandle = await open(latestLogFile, "r");
+        const buffer = Buffer.alloc(bytesToRead);
+        await fileHandle.read(buffer, 0, bytesToRead, fileSize - bytesToRead);
+        await fileHandle.close();
+
+        const tailContent = buffer.toString("utf-8");
+        const lines = tailContent.split("\n");
+
+        if (lines[0] && lines[0].length > 0) {
+          lines.shift();
+        }
+
+        if (lines.length > maxLines) {
+          displayedLines = lines.slice(-maxLines);
+          truncated = true;
+        } else {
+          displayedLines = lines;
+          truncated = true;
+        }
+      } else {
+        const fullContent = await readFile(latestLogFile, "utf-8");
+        const allLines = fullContent.split("\n");
+        totalLines = allLines.length;
+
+        if (totalLines > maxLines) {
+          displayedLines = allLines.slice(-maxLines);
+          truncated = true;
+        } else {
+          displayedLines = allLines;
+        }
+      }
+
+      if (truncated) {
+        content = `[LOG TRUNCATED - Showing last ${maxLines} lines (${(fileSize / 1024 / 1024).toFixed(2)}MB total)]\n\n` + displayedLines.join("\n");
+      } else {
+        content = displayedLines.join("\n");
+        totalLines = displayedLines.length;
+      }
+      newContent = content;
+    } else {
+      if (offset < fileSize) {
+        const fileHandle = await open(latestLogFile, "r");
+        const bytesToRead = fileSize - offset;
+        const buffer = Buffer.alloc(bytesToRead);
+        await fileHandle.read(buffer, 0, bytesToRead, offset);
+        await fileHandle.close();
+
+        newContent = buffer.toString("utf-8");
+        const newLines = newContent.split("\n").filter(l => l.length > 0);
+        if (newLines.length > 0) {
+          content = newContent;
+        }
+      }
     }
 
     return NextResponse.json({
       status: job.status,
       content,
       newContent,
-      fullContent: offset === 0 ? fullContent : undefined,
+      fullContent: offset === 0 ? content : undefined,
       logFile: sortedFiles[0],
       isComplete: job.status !== "running",
       exitCode: job.exitCode,
       fileSize,
       offset,
+      totalLines: offset === 0 && !truncated ? totalLines : undefined,
+      displayedLines: displayedLines.length,
+      truncated,
     });
   } catch (error: any) {
     console.error("Error streaming log:", error);

app/api/system-stats/route.ts

@@ -18,6 +18,11 @@ export const dynamic = "force-dynamic";
 export const GET = async (request: NextRequest) => {
   const authError = await requireAuth(request);
   if (authError) return authError;
+
+  if (process.env.DISABLE_SYSTEM_STATS === "true") {
+    return NextResponse.json(null);
+  }
+
   try {
     const t = await getTranslations();
 
@@ -71,8 +76,8 @@ export const GET = async (request: NextRequest) => {
       network: {
         speed:
           mainInterface &&
-          mainInterface.rx_sec != null &&
-          mainInterface.tx_sec != null
+            mainInterface.rx_sec != null &&
+            mainInterface.tx_sec != null
             ? `${Math.round(rxSpeed + txSpeed)} Mbps`
             : t("system.unknown"),
         latency: latency,

app/globals.css

@@ -1,340 +1,263 @@
-/* eslint-disable */
-/* @ts-nocheck */
-
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@300;400;500;600;700&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&display=swap');
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
 @layer base {
-  :root {
-    --font-sans: 'Inter', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-    --font-mono: 'JetBrains Mono', 'Fira Code', 'Consolas', 'Monaco', 'Courier New', monospace;
-    --background: 0 0% 100%;
-    --foreground: 240 10% 3.9%;
-    --card: 0 0% 100%;
-    --card-foreground: 240 10% 3.9%;
-    --popover: 0 0% 100%;
-    --popover-foreground: 240 10% 3.9%;
-    --primary: 280 100% 60%;
-    --primary-foreground: 0 0% 98%;
-    --secondary: 240 4.8% 95.9%;
-    --secondary-foreground: 240 5.9% 10%;
-    --muted: 240 4.8% 95.9%;
-    --muted-foreground: 240 3.8% 46.1%;
-    --accent: 240 4.8% 95.9%;
-    --accent-foreground: 240 5.9% 10%;
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 210 40% 98%;
-    --border: 240 5.9% 90%;
-    --input: 240 5.9% 90%;
-    --ring: 280 100% 60%;
-    --radius: 0.75rem;
-    --chart-1: 280 100% 60%;
-    --chart-2: 160 84% 39%;
-    --chart-3: 30 100% 50%;
-    --chart-4: 340 100% 50%;
-    --chart-5: 200 100% 50%;
+  [data-webtui-theme="catppuccin-latte"] {
+    --box-border-color: #9ca0b0;
+    --table-border-color: #9ca0b0;
+    --separator-color: #9ca0b0;
   }
 
-  .dark {
-    --background: 240 10% 8%;
-    --foreground: 0 0% 98%;
-    --card: 240 10% 12%;
-    --card-foreground: 0 0% 98%;
-    --popover: 240 10% 12%;
-    --popover-foreground: 0 0% 98%;
-    --primary: 280 100% 40%;
-    --primary-foreground: 240 10% 8%;
-    --secondary: 240 3.7% 18%;
-    --secondary-foreground: 0 0% 98%;
-    --muted: 240 3.7% 18%;
-    --muted-foreground: 240 5% 64.9%;
-    --accent: 240 3.7% 18%;
-    --accent-foreground: 0 0% 98%;
-    --destructive: 0 62.8% 30.6%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 240 3.7% 25%;
-    --input: 240 3.7% 18%;
-    --ring: 280 100% 40%;
-    --chart-1: 280 100% 40%;
-    --chart-2: 160 84% 30%;
-    --chart-3: 30 100% 35%;
-    --chart-4: 340 100% 35%;
-    --chart-5: 200 100% 35%;
+  [data-webtui-theme="catppuccin-mocha"] {
+    --box-border-color: #313244;
+    --table-border-color: #313244;
+    --separator-color: #313244;
   }
-}
 
-.hide-scrollbar::-webkit-scrollbar {
-  display: none;
-}
-
-.hide-scrollbar {
-  scrollbar-width: none;
-}
-
-.overflow-y-auto {
-  padding-right: 1em;
-}
-
-.overflow-y-auto::-webkit-scrollbar {
-  width: 4px;
-}
-.overflow-y-auto::-webkit-scrollbar-track {
-  background: transparent;
-}
-.overflow-y-auto::-webkit-scrollbar-thumb {
-  background-color: hsl(var(--primary) / 0.8);
-  border-radius: 3px;
-}
-.overflow-y-auto::-webkit-scrollbar-thumb:hover {
-  background-color: hsl(var(--primary) / 0.1);
-}
-
-@layer base {
   * {
-    @apply border-border;
+    box-sizing: border-box;
   }
+
+  ::-webkit-scrollbar {
+    -webkit-appearance: none;
+  }
+
   body {
-    @apply bg-background text-foreground;
-    position: relative;
+    margin: 0;
+    padding: 0;
     overflow-x: hidden;
-    font-family: var(--font-sans);
-    font-feature-settings: "cv02", "cv03", "cv04", "cv11";
-    font-variation-settings: normal;
-  }
-  
-  /* Terminal-style fonts for code elements */
-  code, pre, .font-mono {
-    font-family: var(--font-mono);
-    font-feature-settings: "liga" 1, "calt" 1;
-  }
-  
-  /* Brand styling */
-  .brand-text {
-    font-family: var(--font-mono);
-    font-weight: 600;
-    letter-spacing: -0.025em;
-  }
-  
-  /* Terminal-style headings */
-  h1, h2, h3, h4, h5, h6 {
-    font-family: var(--font-sans);
-    font-weight: 600;
-  }
-  
-  /* Terminal-style buttons and inputs */
-  button, input, textarea, select {
-    font-family: var(--font-sans);
-  }
-  
-  /* Code blocks and terminal areas */
-  .terminal-text {
-    font-family: var(--font-mono);
-    font-size: 0.875rem;
-    line-height: 1.5;
   }
 }
 
-/* Cyberpunk-inspired gradient background */
-@layer components {
-  .hero-gradient {
-    background: linear-gradient(135deg, 
-      hsl(280 100% 60% / 0.1) 0%, 
-      hsl(160 84% 39% / 0.05) 25%, 
-      hsl(30 100% 50% / 0.05) 50%, 
-      hsl(340 100% 50% / 0.05) 75%, 
-      hsl(200 100% 50% / 0.1) 100%);
-  }
-
-  .hero-gradient::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: 
-      radial-gradient(circle at 20% 80%, hsl(280 100% 60% / 0.15) 0%, transparent 50%),
-      radial-gradient(circle at 80% 20%, hsl(160 84% 39% / 0.15) 0%, transparent 50%),
-      radial-gradient(circle at 40% 40%, hsl(340 100% 50% / 0.1) 0%, transparent 50%);
-    pointer-events: none;
-  }
-
-  .dark .hero-gradient::before {
-    background: 
-      radial-gradient(circle at 20% 80%, hsl(280 100% 50% / 0.08) 0%, transparent 50%),
-      radial-gradient(circle at 80% 20%, hsl(160 84% 35% / 0.08) 0%, transparent 50%),
-      radial-gradient(circle at 40% 40%, hsl(340 100% 45% / 0.06) 0%, transparent 50%);
-  }
-
-  /* Glass morphism cards */
-  .glass-card {
-    @apply backdrop-blur-md bg-card/80 border border-border/50;
-  }
-
-  .dark .glass-card {
-    @apply backdrop-blur-md bg-card/80 border border-border/70;
-  }
-
-  .glass-card-hover {
-    @apply glass-card;
-  }
-
-  /* Vibrant gradient text */
-  .brand-gradient {
-    @apply bg-gradient-to-r from-purple-500 via-pink-500 to-orange-500 bg-clip-text text-transparent;
-  }
-
-  .dark .brand-gradient {
-    @apply bg-gradient-to-r from-purple-600 via-pink-600 to-orange-600 bg-clip-text text-transparent;
-  }
-
-  .brand-gradient-alt {
-    @apply bg-gradient-to-r from-cyan-500 via-blue-500 to-purple-500 bg-clip-text text-transparent;
-  }
-
-  .dark .brand-gradient-alt {
-    @apply bg-gradient-to-r from-cyan-600 via-blue-600 to-purple-600 bg-clip-text text-transparent;
-  }
-
-  /* Neon glow effects */
-  .glow-primary {
-    box-shadow: none;
-  }
-
-  .glow-primary:hover {
-    box-shadow: none;
-  }
-
-  .glow-cyan {
-    box-shadow: none;
-  }
-
-  .glow-orange {
-    box-shadow: none;
-  }
-
-  .glow-pink {
-    box-shadow: none;
-  }
-
-  /* Status indicators */
-  .status-error {
-    @apply bg-red-500/20 text-red-700 dark:text-red-400 border-red-500/30;
-  }
-
-  /* Custom scrollbar */
-  .custom-scrollbar {
-    scrollbar-width: thin;
-    scrollbar-color: hsl(var(--muted-foreground) / 0.3) transparent;
-  }
-
-  .custom-scrollbar::-webkit-scrollbar {
-    width: 6px;
-  }
-
-  .custom-scrollbar::-webkit-scrollbar-track {
-    background: transparent;
-  }
-
-  .custom-scrollbar::-webkit-scrollbar-thumb {
-    background-color: hsl(var(--muted-foreground) / 0.3);
-    border-radius: 3px;
-  }
-
-  .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-    background-color: hsl(var(--muted-foreground) / 0.5);
-  }
-
-  /* Tooltip styles */
-  .tooltip {
-    @apply absolute z-50 px-3 py-2 text-sm text-white bg-gray-900 rounded-lg shadow-lg opacity-0 invisible transition-all duration-200;
-  }
-
-  .tooltip.show {
-    @apply opacity-100 visible;
-  }
-
-  /* Responsive text utilities */
-  .text-responsive {
-    @apply text-sm sm:text-base lg:text-lg;
-  }
-
-  .text-responsive-lg {
-    @apply text-base sm:text-lg lg:text-xl;
-  }
-
-  .text-responsive-xl {
-    @apply text-lg sm:text-xl lg:text-2xl;
-  }
-
-  /* Button variants with new colors */
-  .btn-primary {
-    @apply bg-gradient-to-r from-purple-500 to-pink-500 text-white hover:from-purple-600 hover:to-pink-600 transition-all;
-  }
-
-  .dark .btn-primary {
-    @apply bg-gradient-to-r from-purple-600 to-pink-600 text-white hover:from-purple-700 hover:to-pink-700 transition-all;
-  }
-
-  .btn-secondary {
-    @apply bg-gradient-to-r from-cyan-500 to-blue-500 text-white hover:from-cyan-600 hover:to-blue-600 transition-all;
-  }
-
-  .dark .btn-secondary {
-    @apply bg-gradient-to-r from-cyan-600 to-blue-600 text-white hover:from-cyan-700 hover:to-blue-700 transition-all;
-  }
-
-  .btn-outline {
-    @apply border border-border bg-background hover:bg-accent hover:text-accent-foreground transition-colors;
-  }
-
-  .btn-ghost {
-    @apply hover:bg-accent hover:text-accent-foreground transition-colors;
-  }
-
-  .btn-destructive {
-    @apply bg-gradient-to-r from-red-500 to-pink-500 text-white hover:from-red-600 hover:to-pink-600 transition-all;
-  }
-
-  .dark .btn-destructive {
-    @apply bg-gradient-to-r from-red-600 to-pink-600 text-white hover:from-red-700 hover:to-pink-700 transition-all;
-  }
-
-  /* Neon accent borders */
-  .neon-border {
-    border: 1px solid transparent;
-    background: linear-gradient(white, white) padding-box,
-                linear-gradient(45deg, hsl(280 100% 60%), hsl(160 84% 39%), hsl(30 100% 50%)) border-box;
-  }
-
-  .neon-border-dark {
-    border: 1px solid transparent;
-    background: linear-gradient(hsl(240 10% 3.9%), hsl(240 10% 3.9%)) padding-box,
-                linear-gradient(45deg, hsl(280 100% 70%), hsl(160 84% 45%), hsl(30 100% 60%)) border-box;
-  }
+body {
+  font-family: 'IBM Plex Mono', monospace !important;
+  font-weight: 500 !important;
 }
 
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: 'Azeret Mono Variable', monospace !important;
+}
+
+p,
+span,
+a,
+label,
+input,
+textarea,
+button,
+select,
+option {
+  font-family: 'IBM Plex Mono', monospace !important;
+  font-weight: 500 !important;
+}
+
+pre {
+  scrollbar-width: none !important;
+  -ms-overflow-style: none !important;
+}
+
+pre::-webkit-scrollbar {
+  display: none !important;
+  width: 0 !important;
+  height: 0 !important;
+}
+
+
 @layer utilities {
-  body.sidebar-collapsed main.lg\:ml-80 {
-    margin-left: 4rem !important; /* 64px */
+  .ascii-border {
+    border: 1px solid var(--box-border-color, var(--foreground2));
+    border-radius: 0;
+  }
+
+  .border-border {
+    border-color: var(--box-border-color, var(--foreground2)) !important;
+  }
+
+  .tui-scrollbar {
+    scrollbar-width: auto !important;
+    padding-right: 5px;
+  }
+
+  @media (min-width: 992px) {
+    .tui-scrollbar {
+      padding-right: 15px;
+    }
+  }
+
+  .tui-scrollbar::-webkit-scrollbar {
+    -webkit-appearance: none;
+    width: 7px;
+    height: 10px;
+    background-color: var(--background1) !important;
+  }
+
+  .tui-scrollbar::-webkit-scrollbar-thumb {
+    background-color: var(--background0) !important;
+    border: 1px solid var(--box-border-color, var(--foreground2));
+    visibility: visible !important;
+    opacity: 1 !important;
+    min-height: 40px !important;
+    height: 40px !important;
+  }
+
+  .tui-scrollbar::-webkit-scrollbar-thumb:hover {
+    background-color: var(--primary) !important;
+    box-shadow: 0 0 8px var(--primary);
+  }
+
+  .tui-scrollbar::-webkit-scrollbar-track {
+    background: var(--background1);
+    border-left: 1px solid var(--box-border-color, var(--foreground2));
+  }
+
+  .tui-scrollbar::-webkit-scrollbar-corner {
+    background: var(--background1);
+  }
+
+  .bg-background0 {
+    background-color: var(--background0) !important;
+  }
+
+  .bg-background1 {
+    background-color: var(--background1) !important;
+  }
+
+  .bg-background2 {
+    background-color: var(--background2) !important;
+  }
+
+  .border-foreground1 {
+    border-color: var(--box-border-color, var(--foreground2)) !important;
+  }
+
+  .text-foreground0 {
+    color: var(--foreground0) !important;
+  }
+
+  .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    white-space: nowrap;
+    border-width: 0;
   }
 }
 
-.dropdown-overflow-fix {
-  overflow: visible;
-  position: relative;
+@layer components {
+  .tui-card {
+    background: var(--background0) !important;
+    border: 1px solid var(--box-border-color, var(--foreground2)) !important;
+    box-shadow: 8px 4px 0 var(--box-border-color, var(--foreground2));
+    border-radius: 0 !important;
+  }
+
+  .tui-card-mini {
+    background: var(--background0) !important;
+    border: 1px solid var(--box-border-color, var(--foreground2)) !important;
+    box-shadow: 2px 4px 0 var(--box-border-color, var(--foreground2));
+    border-radius: 0 !important;
+  }
+
+  .terminal-log {
+    background: var(--background0) !important;
+    border: 1px solid var(--box-border-color, var(--foreground2)) !important;
+    font-family: 'JetBrains Mono', monospace;
+    font-size: 0.875rem;
+    line-height: 1.5;
+    padding: 1rem;
+    color: var(--foreground0);
+  }
+
+  .text-status-info {
+    color: var(--mauve);
+  }
+
+  .text-status-warning {
+    color: var(--yellow);
+  }
+
+  .text-status-success {
+    color: var(--green);
+  }
+
+  .text-status-error {
+    color: var(--red);
+  }
+
+  .bg-status-info {
+    background-color: var(--mauve);
+  }
+
+  .bg-status-warning {
+    background-color: var(--yellow);
+  }
+
+  .bg-status-success {
+    background-color: var(--green);
+  }
+
+  .bg-status-error {
+    background-color: var(--red);
+  }
+
+  dialog {
+    background: var(--background0) !important;
+    margin: auto;
+    padding: 0;
+    width: 90vw;
+    max-height: 90vh;
+  }
+
+  dialog::backdrop {
+    background: rgba(0, 0, 0, 0.8) !important;
+  }
+
+  dialog[open] {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .no-sidebar main {
+    margin-left: 0 !important;
+  }
+
+  body:not(.sidebar-collapsed) main {
+    margin-left: 0;
+  }
+
+  @media (min-width: 1024px) {
+    body:not(.sidebar-collapsed) main {
+      margin-left: 320px;
+    }
+
+    body.sidebar-collapsed main {
+      margin-left: 64px;
+    }
+
+    .no-sidebar main {
+      margin-left: 0 !important;
+    }
+  }
 }
 
-.dropdown-overflow-fix > * {
-  position: relative;
-}
-
-.dropdown-overflow-fix .dropdown-container,
-.dropdown-overflow-fix [class*="dropdown"] {
-  overflow: visible !important;
-}
+@media (max-width: 992px) {
+  .mobile-modal {
+    position: fixed;
+    bottom: 0;
+    top: auto;
+    width: 100% !important;
+    max-height: 90vh;
+    max-width: 100%;
+    margin: inherit;
+  }
+}

app/layout.tsx

@@ -1,9 +1,13 @@
 import type { Metadata } from "next";
-import { JetBrains_Mono, Inter } from "next/font/google";
+import { JetBrains_Mono } from "next/font/google";
 import "@/app/globals.css";
 import { ThemeProvider } from "@/app/_providers/ThemeProvider";
 import { ServiceWorkerRegister } from "@/app/_components/FeatureComponents/PWA/ServiceWorkerRegister";
 import { loadTranslationMessages } from "@/app/_server/actions/translations";
+import '@fontsource/ibm-plex-mono/400.css';
+import '@fontsource/ibm-plex-mono/500.css';
+import '@fontsource/ibm-plex-mono/600.css';
+import '@fontsource-variable/azeret-mono';
 
 import { NextIntlClientProvider } from "next-intl";
 
@@ -13,12 +17,6 @@ const jetbrainsMono = JetBrains_Mono({
   display: "swap",
 });
 
-const inter = Inter({
-  subsets: ["latin"],
-  variable: "--font-sans",
-  display: "swap",
-});
-
 export const metadata: Metadata = {
   title: "Cr*nMaster - Cron Management made easy",
   description:
@@ -33,7 +31,7 @@ export const metadata: Metadata = {
     telephone: false,
   },
   icons: {
-    icon: "/logo.png",
+    icon: "/favicon.png",
     shortcut: "/logo.png",
     apple: "/logo.png",
   },
@@ -58,7 +56,7 @@ export default async function RootLayout({
   messages = await loadTranslationMessages(locale);
 
   return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang="en" suppressHydrationWarning data-webtui-theme="catppuccin-latte">
       <head>
         <meta name="application-name" content="Cr*nMaster" />
         <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -66,15 +64,23 @@ export default async function RootLayout({
         <meta name="apple-mobile-web-app-title" content="Cr*nMaster" />
         <meta name="mobile-web-app-capable" content="yes" />
         <link rel="apple-touch-icon" href="/logo.png" />
+        <link rel="stylesheet" href="/webtui/base.css" />
+        <link rel="stylesheet" href="/webtui/theme-catppuccin.css" />
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `
+              (function() {
+                const theme = localStorage.getItem('theme') || 'light';
+                const webtui = theme === 'dark' ? 'catppuccin-mocha' : 'catppuccin-latte';
+                document.documentElement.setAttribute('data-webtui-theme', webtui);
+              })();
+            `,
+          }}
+        />
       </head>
-      <body className={`${inter.variable} ${jetbrainsMono.variable} font-sans`}>
+      <body className={`${jetbrainsMono.variable} terminal-font`}>
         <NextIntlClientProvider locale={locale} messages={messages}>
-          <ThemeProvider
-            attribute="class"
-            defaultTheme="dark"
-            enableSystem
-            disableTransitionOnChange
-          >
+          <ThemeProvider>
             {children}
           </ThemeProvider>
           <ServiceWorkerRegister />

app/login/page.tsx

@@ -7,8 +7,8 @@ import path from "path";
 export default async function LoginPage() {
   const hasPassword = !!process.env.AUTH_PASSWORD;
   const hasOIDC = process.env.SSO_MODE === "oidc";
+  const oidcAutoRedirect = process.env.OIDC_AUTO_REDIRECT === "true";
 
-  // Read package.json to get version
   const packageJsonPath = path.join(process.cwd(), "package.json");
   const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
   const version = packageJson.version;
@@ -20,6 +20,7 @@ export default async function LoginPage() {
         <LoginForm
           hasPassword={hasPassword}
           hasOIDC={hasOIDC}
+          oidcAutoRedirect={oidcAutoRedirect}
           version={version}
         />
       </div>

app/logo/page.tsx

@@ -1,12 +1,24 @@
-import { Asterisk, Terminal } from "lucide-react";
+"use client";
 
-export default async function Logo() {
+import { AsteriskIcon, TerminalIcon } from "@phosphor-icons/react";
+
+export default function Logo() {
   return (
-    <div className="m-auto mt-20 relative w-[600px] h-[600px]">
-      <div className="p-3 bg-gradient-to-br from-purple-500 via-pink-500 to-orange-500 rounded-[200px] w-full h-full">
-        <div className="relative">
-          <Terminal className="h-[350px] w-[350px] text-white relative top-[120px] left-[120px]" />
-          <Asterisk className="h-[200px] w-[200px] text-white absolute top-14 right-[90px]" />
+    <div className="min-h-screen bg-background0 flex items-center justify-center p-8">
+      <div className="relative">
+        <div className="w-[600px] h-[600px] ascii-border bg-background1 p-16 flex items-center justify-center">
+          <div className="absolute w-[600px] h-[600px] bg-gradient-to-br from-primary/20 via-primary/10 to-transparent blur-3xl" />
+
+          <div className="relative z-10 flex items-center justify-center w-full h-full">
+            <TerminalIcon
+              className="h-80 w-80 text-primary drop-shadow-[0_0_40px_rgba(var(--primary-rgb),0.6)]"
+              weight="duotone"
+            />
+            <AsteriskIcon
+              className="h-40 w-40 text-primary absolute -top-4 -right-4 drop-shadow-[0_0_30px_rgba(var(--primary-rgb),0.8)]"
+              weight="bold"
+            />
+          </div>
         </div>
       </div>
     </div>

app/not-found.tsx

@@ -0,0 +1,117 @@
+import Link from "next/link";
+import { getTranslations } from "@/app/_server/actions/translations";
+import { SnakeGame } from "@/app/_components/FeatureComponents/Games/SnakeGame";
+import { Logo } from "@/app/_components/GlobalComponents/Logo/Logo";
+import { SystemInfoCard } from "@/app/_components/FeatureComponents/System/SystemInfo";
+import { ThemeToggle } from "@/app/_components/FeatureComponents/Theme/ThemeToggle";
+import { LogoutButton } from "@/app/_components/FeatureComponents/LoginForm/LogoutButton";
+import { ToastContainer } from "@/app/_components/GlobalComponents/UIElements/Toast";
+import { PWAInstallPrompt } from "@/app/_components/FeatureComponents/PWA/PWAInstallPrompt";
+import { SSEProvider } from "@/app/_contexts/SSEContext";
+import { readFileSync } from "fs";
+import path from "path";
+
+export default async function NotFound() {
+  const t = await getTranslations();
+  const liveUpdatesEnabled =
+    (typeof process.env.LIVE_UPDATES === "boolean" &&
+      process.env.LIVE_UPDATES === true) ||
+    process.env.LIVE_UPDATES !== "false";
+
+  const packageJsonPath = path.join(process.cwd(), "package.json");
+  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+  const version = packageJson.version;
+
+  const initialSystemInfo = {
+    hostname: "Loading...",
+    platform: "Loading...",
+    uptime: "Loading...",
+    memory: {
+      total: "0 B",
+      used: "0 B",
+      free: "0 B",
+      usage: 0,
+      status: "Loading",
+    },
+    cpu: {
+      model: "Loading...",
+      cores: 0,
+      usage: 0,
+      status: "Loading",
+    },
+    gpu: {
+      model: "Loading...",
+      status: "Loading",
+    },
+    disk: {
+      total: "0 B",
+      used: "0 B",
+      free: "0 B",
+      usage: 0,
+      status: "Loading",
+    },
+    systemStatus: {
+      overall: "Loading",
+      details: "Fetching system information...",
+    },
+  };
+
+  const bodyClass = process.env.DISABLE_SYSTEM_STATS === "true" ? "no-sidebar" : "";
+
+  return (
+    <SSEProvider liveUpdatesEnabled={liveUpdatesEnabled}>
+      <div className={`min-h-screen bg-background0 ${bodyClass}`}>
+        <header className="border-border border-b sticky top-0 z-20 bg-background0 lg:h-[90px]">
+          <div className="container mx-auto px-4 py-4">
+            <div className="flex items-center justify-between lg:justify-center">
+              <div className="flex items-center gap-4">
+                <Logo size={48} showGlow={true} />
+                <div>
+                  <h1 className="text-xl sm:text-2xl lg:text-3xl font-bold terminal-font uppercase">
+                    Cr*nMaster
+                  </h1>
+                  <p className="text-xs terminal-font flex items-center gap-2">
+                    {t("common.version").replace("{version}", version)}
+                  </p>
+                </div>
+              </div>
+              {process.env.AUTH_PASSWORD && (
+                <div className="lg:absolute lg:right-10">
+                  <LogoutButton />
+                </div>
+              )}
+            </div>
+          </div>
+        </header>
+
+        {process.env.DISABLE_SYSTEM_STATS !== "true" && (
+          <SystemInfoCard systemInfo={initialSystemInfo} />
+        )}
+
+        <main className="transition-all duration-300">
+          <div className="px-4 py-8 lg:px-8">
+            <div className="text-center mt-6 mb-12">
+              <div className="text-6xl font-bold terminal-font text-status-error mb-2">404</div>
+              <p className="terminal-font text-sm mb-4">{t("notFound.message")}</p>
+              <Link
+                href="/"
+                className="ascii-border bg-background1 hover:bg-background2 px-4 py-2 terminal-font uppercase font-bold transition-colors text-sm inline-block"
+              >
+                {t("notFound.goHome")}
+              </Link>
+            </div>
+
+            <SnakeGame />
+          </div>
+        </main>
+
+        <ToastContainer />
+
+        <div className="flex items-center gap-2 fixed bottom-4 left-4 lg:right-4 lg:left-auto z-10 bg-background0 ascii-border p-1">
+          <ThemeToggle />
+          <PWAInstallPrompt />
+        </div>
+      </div>
+    </SSEProvider>
+  );
+}

app/page.tsx

@@ -9,6 +9,9 @@ import { PWAInstallPrompt } from "@/app/_components/FeatureComponents/PWA/PWAIns
 import { WrapperScriptWarning } from "@/app/_components/FeatureComponents/System/WrapperScriptWarning";
 import { getTranslations } from "@/app/_server/actions/translations";
 import { SSEProvider } from "@/app/_contexts/SSEContext";
+import { Logo } from "@/app/_components/GlobalComponents/Logo/Logo";
+import { readFileSync } from "fs";
+import path from "path";
 
 export const dynamic = "force-dynamic";
 export const maxDuration = 300;
@@ -20,6 +23,10 @@ export default async function Home() {
       process.env.LIVE_UPDATES === true) ||
     process.env.LIVE_UPDATES !== "false";
 
+  const packageJsonPath = path.join(process.cwd(), "package.json");
+  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+  const version = packageJson.version;
+
   const [cronJobs, scripts] = await Promise.all([
     getCronJobs(),
     fetchScripts(),
@@ -59,50 +66,48 @@ export default async function Home() {
     },
   };
 
+  const bodyClass = process.env.DISABLE_SYSTEM_STATS === "true" ? "no-sidebar" : "";
+
   return (
     <SSEProvider liveUpdatesEnabled={liveUpdatesEnabled}>
-      <div className="min-h-screen relative">
-        <div className="hero-gradient absolute inset-0 -z-10"></div>
-        <div className="relative z-10">
-          <header className="border-b border-border/50 bg-background/80 backdrop-blur-md sticky top-0 z-20 shadow-sm lg:h-[90px]">
-            <div className="container mx-auto px-4 py-4">
-              <div className="flex items-center justify-between lg:justify-center">
-                <div className="flex items-center gap-4">
-                  <div className="relative">
-                    <img src="/logo.png" alt="logo" className="w-14 h-14" />
-                    <div className="absolute top-0 right-0 w-3 h-3 bg-emerald-500 rounded-full animate-pulse"></div>
-                  </div>
-                  <div>
-                    <h1 className="text-xl sm:text-2xl lg:text-3xl font-bold brand-gradient brand-text">
-                      Cr*nMaster
-                    </h1>
-                    <p className="text-xs text-muted-foreground font-mono tracking-wide">
-                      {t("common.cronManagementMadeEasy")}
-                    </p>
-                  </div>
+      <div className={`min-h-screen bg-background0 ${bodyClass}`}>
+        <header className="border-border border-b sticky top-0 z-20 bg-background0 lg:h-[90px]">
+          <div className="container mx-auto px-4 py-4">
+            <div className="flex items-center justify-between lg:justify-center">
+              <div className="flex items-center gap-4">
+                <Logo size={48} showGlow={true} />
+                <div>
+                  <h1 className="text-xl sm:text-2xl lg:text-3xl font-bold terminal-font uppercase">
+                    Cr<span className="text-status-error">*</span>nMaster
+                  </h1>
+                  <p className="text-xs terminal-font flex items-center gap-2">
+                    {t("common.version").replace("{version}", version)}
+                  </p>
                 </div>
-                {process.env.AUTH_PASSWORD && (
-                  <div className="lg:absolute lg:right-10">
-                    <LogoutButton />
-                  </div>
-                )}
               </div>
+              {process.env.AUTH_PASSWORD && (
+                <div className="lg:absolute lg:right-10">
+                  <LogoutButton />
+                </div>
+              )}
             </div>
-          </header>
+          </div>
+        </header>
 
+        {process.env.DISABLE_SYSTEM_STATS !== "true" && (
           <SystemInfoCard systemInfo={initialSystemInfo} />
+        )}
 
-          <main className="lg:ml-80 transition-all duration-300 ml-0 sidebar-collapsed:lg:ml-16">
-            <div className="container mx-auto px-4 py-8 lg:px-8">
-              <WrapperScriptWarning />
-              <TabbedInterface cronJobs={cronJobs} scripts={scripts} />
-            </div>
-          </main>
-        </div>
+        <main className="transition-all duration-300">
+          <div className="px-4 py-8 lg:px-8">
+            <WrapperScriptWarning />
+            <TabbedInterface cronJobs={cronJobs} scripts={scripts} />
+          </div>
+        </main>
 
         <ToastContainer />
 
-        <div className="flex items-center gap-2 fixed bottom-4 left-4 lg:right-4 lg:left-auto z-10 bg-background/80 backdrop-blur-md border border-border/50 rounded-lg p-1">
+        <div className="flex items-center gap-2 fixed bottom-4 left-4 lg:right-4 lg:left-auto z-10 bg-background0 ascii-border p-1">
           <ThemeToggle />
           <PWAInstallPrompt />
         </div>

howto/API.md

@@ -106,6 +106,104 @@ curl -H "Authorization: Bearer YOUR_API_KEY" \
 
 ---
 
+### PATCH /api/cronjobs/:id
+
+Update a cron job.
+
+**Parameters:**
+
+- `id` (string) - Cron job ID
+
+**Request:**
+
+```json
+{
+  "schedule": "0 3 * * *",
+  "command": "/usr/bin/echo updated",
+  "comment": "Updated job",
+  "logsEnabled": true
+}
+```
+
+**Response:**
+
+```json
+{
+  "success": true,
+  "message": "Cron job updated successfully"
+}
+```
+
+**Example:**
+
+```bash
+curl -X PATCH \
+  -H "Authorization: Bearer YOUR_API_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{"schedule":"0 3 * * *","command":"/usr/bin/echo updated"}' \
+  https://your-cronmaster-url.com/api/cronjobs/fccview-0
+```
+
+---
+
+### DELETE /api/cronjobs/:id
+
+Delete a cron job.
+
+**Parameters:**
+
+- `id` (string) - Cron job ID
+
+**Response:**
+
+```json
+{
+  "success": true,
+  "message": "Cron job deleted successfully"
+}
+```
+
+**Example:**
+
+```bash
+curl -X DELETE \
+  -H "Authorization: Bearer YOUR_API_KEY" \
+  https://your-cronmaster-url.com/api/cronjobs/fccview-0
+```
+
+---
+
+### GET /api/cronjobs/:id/execute
+
+Manually execute a cron job.
+
+**Parameters:**
+
+- `id` (string) - Cron job ID
+
+**Query Parameters:**
+
+- `runInBackground` (boolean, optional) - Whether to run the job in background. Defaults to `true`.
+
+**Response:**
+
+```json
+{
+  "success": true,
+  "runId": "run-123",
+  "message": "Job execution started"
+}
+```
+
+**Example:**
+
+```bash
+curl -H "Authorization: Bearer YOUR_API_KEY" \
+  https://your-cronmaster-url.com/api/cronjobs/fccview-0/execute?runInBackground=true
+```
+
+---
+
 ### GET /api/scripts
 
 List all scripts.
@@ -196,6 +294,127 @@ curl -H "Authorization: Bearer YOUR_API_KEY" \
 
 ---
 
+### GET /api/logs/stream
+
+Stream job execution logs.
+
+**Query Parameters:**
+
+- `runId` (string, required) - The run ID of the job execution
+- `offset` (number, optional) - Byte offset for streaming new content. Defaults to `0`.
+- `maxLines` (number, optional) - Maximum lines to return. Defaults to `500`, min `100`, max `5000`.
+
+**Note:** When `offset=0`, the endpoint only reads the last `maxLines` from the file for performance. This means `totalLines` is only returned when the file is small enough to read entirely (not truncated).
+
+**Response:**
+
+```json
+{
+  "status": "running",
+  "content": "[log content]",
+  "newContent": "[new log content since offset]",
+  "logFile": "2025-11-10_14-30-00.log",
+  "isComplete": false,
+  "exitCode": null,
+  "fileSize": 1024,
+  "offset": 0,
+  "totalLines": 50,
+  "displayedLines": 50,
+  "truncated": false
+}
+```
+
+**Response Fields:**
+
+- `status` (string) - Job status: "running", "completed", or "failed"
+- `content` (string) - The log content to display
+- `newContent` (string) - New content since the last offset (for streaming)
+- `logFile` (string) - Name of the log file
+- `isComplete` (boolean) - Whether the job has completed
+- `exitCode` (number | null) - Exit code of the job (null if still running)
+- `fileSize` (number) - Total size of the log file in bytes
+- `offset` (number) - Current byte offset
+- `totalLines` (number | undefined) - Total number of lines in the file (only returned when file is small enough to read entirely)
+- `displayedLines` (number) - Number of lines being displayed
+- `truncated` (boolean) - Whether the content is truncated due to maxLines limit
+
+**Example:**
+
+```bash
+curl -H "Authorization: Bearer YOUR_API_KEY" \
+  "https://your-cronmaster-url.com/api/logs/stream?runId=run-123&offset=0&maxLines=500"
+```
+
+---
+
+### GET /api/system/wrapper-check
+
+Check if the log wrapper script has been modified from the default.
+
+**Response:**
+
+```json
+{
+  "modified": false
+}
+```
+
+**Example:**
+
+```bash
+curl -H "Authorization: Bearer YOUR_API_KEY" \
+  https://your-cronmaster-url.com/api/system/wrapper-check
+```
+
+---
+
+### GET /api/oidc/login
+
+Initiate OIDC (SSO) login flow. Redirects to the OIDC provider's authorization endpoint.
+
+**Note:** This endpoint is only available when `SSO_MODE=oidc` is configured.
+
+**Response:** HTTP 302 redirect to OIDC provider
+
+**Example:**
+
+```bash
+curl -L https://your-cronmaster-url.com/api/oidc/login
+```
+
+---
+
+### GET /api/oidc/callback
+
+OIDC callback endpoint. Handles the authorization code from the OIDC provider and creates a session.
+
+**Note:** This endpoint is typically called by the OIDC provider after authentication, not directly by clients.
+
+**Query Parameters:**
+
+- `code` (string) - Authorization code from OIDC provider
+- `state` (string) - State parameter for CSRF protection
+
+**Response:** HTTP 302 redirect to application root
+
+---
+
+### GET /api/oidc/logout
+
+Initiate OIDC logout flow. Redirects to the OIDC provider's logout endpoint.
+
+**Note:** This endpoint is only available when `SSO_MODE=oidc` is configured.
+
+**Response:** HTTP 302 redirect to OIDC provider logout endpoint
+
+**Example:**
+
+```bash
+curl -L https://your-cronmaster-url.com/api/oidc/logout
+```
+
+---
+
 ### POST /api/auth/login
 
 Login with password (alternative to API key).
@@ -264,11 +483,3 @@ Logout and clear session (requires login first).
   "message": "Authentication required. Use session cookie or API key (Bearer token)."
 }
 ```
-
-## Testing
-
-For local testing I have made a node script that checks all available endpoints:
-
-```bash
-AUTH_PASSWORD=your-password node test-api.js https://your-cronmaster-url.com
-```

howto/DOCKER.md

@@ -35,14 +35,12 @@ ports:
 ```yaml
 environment:
   - NODE_ENV=production
-  - DOCKER=true
   - NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL=30000
   - AUTH_PASSWORD=very_strong_password
   - HOST_CRONTAB_USER=root
 ```
 
 - **NODE_ENV**: Set to `production` for production deployments
-- **DOCKER**: Must be `true` when running in Docker
 - **NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL**: Clock update interval in milliseconds (default: 30000)
 - **AUTH_PASSWORD**: Strong password for authentication
 - **HOST_CRONTAB_USER**: User whose crontab to read (default: root, can be comma-separated for multiple users)
@@ -155,7 +153,6 @@ services:
       - "40123:3000"
     environment:
       - NODE_ENV=production
-      - DOCKER=true
       - NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL=30000
 
       # Localization

howto/ENV_VARIABLES.md

@@ -56,6 +56,7 @@ Translation loading priority:
 | ----------------------------------- | ------- | -------------------------------------------------- |
 | `NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL` | `30000` | Clock update interval in milliseconds (30 seconds) |
 | `LIVE_UPDATES`                      | `true`  | Enable/disable Server-Sent Events for live updates |
+| `DISABLE_SYSTEM_STATS`              | `false` | Set to `true` to completely disable system stats (stops polling and hides sidebar) |
 
 ## Logging Configuration
 
@@ -84,6 +85,7 @@ Translation loading priority:
 | `OIDC_CLIENT_SECRET` | `N/A`                   | OIDC client secret (optional, for confidential clients)                                                     |
 | `OIDC_LOGOUT_URL`    | `N/A`                   | Custom logout URL for OIDC provider                                                                         |
 | `OIDC_GROUPS_SCOPE`  | `groups`                | Scope for requesting user groups                                                                            |
+| `OIDC_AUTO_REDIRECT` | `false`                 | Automatically redirect to OIDC provider when it's the only authentication method (no password set)          |
 | `INTERNAL_API_URL`   | `http://localhost:3000` | Internal API URL override for specific nginx configurations with SSO                                        |
 
 ### API Authentication
@@ -134,7 +136,7 @@ services:
       - AUTH_PASSWORD=your_secure_password
       - HOST_CRONTAB_USER=root
       - APP_URL=https://cron.yourdomain.com
-      - LOCALE=en # Can be any locale code, including custom ones
+      - LOCALE=en 
       - NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL=30000
       - LIVE_UPDATES=true
       - MAX_LOG_AGE_DAYS=30
@@ -144,6 +146,7 @@ services:
       - OIDC_CLIENT_ID=your_client_id
       - OIDC_CLIENT_SECRET=your_client_secret
       - OIDC_LOGOUT_URL=https://auth.yourdomain.com/logout
+      - OIDC_AUTO_REDIRECT=true 
       - API_KEY=your_api_key
 ```
 

howto/LOGS.md

@@ -0,0 +1,93 @@
+# Job Execution Logging
+
+CronMaster includes an optional logging feature that captures detailed execution information for your cronjobs.
+
+## How It Works
+
+When you enable logging for a cronjob, CronMaster automatically wraps your command with a log wrapper script. This wrapper:
+
+- Captures **stdout** and **stderr** output
+- Records the **exit code** of your command
+- Timestamps the **start and end** of execution
+- Calculates **execution duration**
+- Stores all this information in organized log files
+
+## Enabling Logs
+
+1. When creating or editing a cronjob, check the "Enable Logging" checkbox
+2. The wrapper is automatically added to your crontab entry
+3. Jobs run independently - they continue to work even if CronMaster is offline
+
+## Log Storage
+
+Logs are stored in the `./data/logs/` directory with descriptive folder names:
+
+- If a job has a **description/comment**: `{sanitized-description}_{jobId}/`
+- If a job has **no description**: `{jobId}/`
+
+Example structure:
+
+```
+./data/logs/
+├── backup-database_root-0/
+│   ├── 2025-11-10_14-30-00.log
+│   ├── 2025-11-10_15-30-00.log
+│   └── 2025-11-10_16-30-00.log
+├── daily-cleanup_root-1/
+│   └── 2025-11-10_14-35-00.log
+├── root-2/  (no description provided)
+│   └── 2025-11-10_14-40-00.log
+```
+
+**Note**: Folder names are sanitized to be filesystem-safe (lowercase, alphanumeric with hyphens, max 50 chars for the description part).
+
+## Log Format
+
+Each log file includes:
+
+```
+--- [ JOB START ] ----------------------------------------------------
+Command   : bash /app/scripts/backup.sh
+Timestamp : 2025-11-10 14:30:00
+Host      : hostname
+User      : root
+--- [ JOB OUTPUT ] ---------------------------------------------------
+
+[command output here]
+
+--- [ JOB SUMMARY ] --------------------------------------------------
+Timestamp : 2025-11-10 14:30:45
+Duration  : 45s
+Exit Code : 0
+Status    : SUCCESS
+--- [ JOB END ] ------------------------------------------------------
+```
+
+## Automatic Cleanup
+
+Logs are automatically cleaned up to prevent disk space issues:
+
+- **Maximum logs per job**: 50 log files
+- **Maximum age**: 30 days
+- **Cleanup trigger**: When viewing logs or after manual execution
+- **Method**: Oldest logs are deleted first when limits are exceeded
+
+## Docker Considerations
+
+- Mount the `./data` directory to persist logs on the host
+- The wrapper script location: `./data/cron-log-wrapper.sh`. This will be generated automatically the first time you enable logging.
+
+## Non-Docker Considerations
+
+- Logs are stored at `./data/logs/` relative to the project directory
+- The codebase wrapper script location: `./app/_scripts/cron-log-wrapper.sh`
+- The running wrapper script location: `./data/cron-log-wrapper.sh`
+
+## Important Notes
+
+- Logging is **optional** and disabled by default
+- Jobs with logging enabled are marked with a blue "Logged" badge in the UI
+- Logs are captured for both scheduled runs and manual executions
+- Commands with file redirections (>, >>) may conflict with logging
+- The crontab stores the **wrapped command**, so jobs run independently of CronMaster
+

howto/TRANSLATIONS.md

@@ -2,7 +2,7 @@
 
 CronMaster supports internationalization (i18n) with both **unofficial custom translations** and **official translations** that can be contributed to the project.
 
-## Table of Contents
+## Quick links
 
 - [Custom User Translations (Unofficial)](#custom-user-translations-unofficial)
 - [Official Translations via Pull Request](#official-translations-via-pull-request)

next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

next.config.js

@@ -1,49 +1,55 @@
-const withNextIntl = require('next-intl/plugin')('./app/i18n.ts');
-
 const withPWA = require('next-pwa')({
-    dest: 'public',
-    register: true,
-    skipWaiting: true,
-    disable: process.env.NODE_ENV === 'development',
-    buildExcludes: [/middleware-manifest\.json$/]
+  dest: 'public',
+  register: true,
+  skipWaiting: true,
+  disable: process.env.NODE_ENV === 'development',
+  buildExcludes: [/middleware-manifest\.json$/]
 })
 
-/** @type {import('next').NextConfig} */
+const withNextIntl = require('next-intl/plugin')('./app/i18n.ts')
+
 const nextConfig = {
-    webpack: (config, { dev, isServer }) => {
-        config.resolve.alias = {
-            ...config.resolve.alias,
-            'osx-temperature-sensor': false,
-        };
+  output: 'standalone',
+  experimental: {
+    serverComponentsExternalPackages: [],
+    webpackBuildWorker: true
+  },
+  swcMinify: true,
+  images: {
+    unoptimized: true
+  },
+  webpack: (config, { dev, isServer }) => {
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      'osx-temperature-sensor': false,
+    };
 
-        if (dev && !isServer) {
-            config.watchOptions = {
-                ...config.watchOptions,
-                ignored: /node_modules/,
-            };
-        }
+    if (dev && !isServer) {
+      config.watchOptions = {
+        ...config.watchOptions,
+        ignored: /node_modules/,
+      };
+    }
 
-        return config;
-    },
-    async headers() {
-        return [
-            {
-                source: '/manifest.json',
-                headers: [
-                    { key: 'Content-Type', value: 'application/manifest+json' },
-                ],
-            },
-            {
-                source: '/sw.js',
-                headers: [
-                    { key: 'Service-Worker-Allowed', value: '/' },
-                    { key: 'Cache-Control', value: 'no-cache' },
-                ],
-            },
-        ]
-    },
+    return config;
+  },
+  async headers() {
+    return [
+      {
+        source: '/manifest.json',
+        headers: [
+          { key: 'Content-Type', value: 'application/manifest+json' },
+        ],
+      },
+      {
+        source: '/sw.js',
+        headers: [
+          { key: 'Service-Worker-Allowed', value: '/' },
+          { key: 'Cache-Control', value: 'no-cache' },
+        ],
+      },
+    ]
+  },
 }
 
-module.exports = withNextIntl({
-    ...withPWA(nextConfig)
-});
+module.exports = withPWA(withNextIntl(nextConfig))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronjob-manager",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -13,15 +13,21 @@
     "@codemirror/commands": "^6.8.1",
     "@codemirror/lang-javascript": "^6.2.4",
     "@codemirror/language": "^6.11.3",
+    "@codemirror/legacy-modes": "^6.5.2",
     "@codemirror/lint": "^6.8.5",
     "@codemirror/search": "^6.5.11",
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "^6.38.1",
+    "@fontsource-variable/azeret-mono": "^5.2.11",
+    "@fontsource/ibm-plex-mono": "^5.2.7",
+    "@phosphor-icons/react": "^2.1.10",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@types/react-syntax-highlighter": "^15.5.13",
+    "@webtui/css": "^0.1.5",
+    "@webtui/theme-catppuccin": "^0.0.3",
     "autoprefixer": "^10.0.1",
     "bcryptjs": "^2.4.3",
     "clsx": "^2.0.0",
@@ -29,9 +35,8 @@
     "cron-parser": "^5.3.0",
     "cronstrue": "^3.2.0",
     "jose": "^6.1.1",
-    "lucide-react": "^0.294.0",
     "minimatch": "^10.0.3",
-    "next": "14.0.4",
+    "next": "14.2.35",
     "next-intl": "^4.4.0",
     "next-pwa": "^5.6.0",
     "next-themes": "^0.2.1",
@@ -49,6 +54,7 @@
     "@types/bcryptjs": "^2.4.6",
     "@types/minimatch": "^6.0.0",
     "eslint": "^8",
-    "eslint-config-next": "14.0.4"
+    "eslint-config-next": "14.0.4",
+    "postcss-import": "^16.1.1"
   }
 }

postcss.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   plugins: {
+    'postcss-import': {},
     tailwindcss: {},
     autoprefixer: {},
   },

public/webtui/base.css

@@ -0,0 +1 @@
+@layer base{:root{--background0: #fff;--background1: #ddd;--background2: #bbb;--background3: #999;--foreground0: #000;--foreground1: #444;--foreground2: #888;--font-size: 16px;--line-height: 1.3;--font-weight-bold: 700;--font-weight-normal: 400;--font-family: monospace;--box-border-color: var(--foreground0);--table-border-color: var(--box-border-color);--separator-color: var(--box-border-color);--separator-background: transparent}[data-webtui-theme=dark]{--background0: #000;--background1: #222;--background2: #444;--background3: #666;--foreground0: #fff;--foreground1: #ccc;--foreground2: #999}body,html{background-color:var(--background0);color:var(--foreground0);font-family:var(--font-family);font-size:var(--font-size);font-weight:var(--font-weight-normal);line-height:var(--line-height, 1.5);font-variant-ligatures:common-ligatures}*{box-sizing:border-box;margin:0;padding:0;outline:none}}